[src/trunk]: src/external/mit/xorg/server/drivers Stop using -fcommon, xsrc s...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6a4e33fa2f7d
branches:  trunk
changeset: 983652:6a4e33fa2f7d
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon May 31 21:45:41 2021 +0000

description:
Stop using -fcommon, xsrc should be fixed.

diffstat:

 external/mit/xorg/server/drivers/Makefile.xf86-driver       |  5 +----
 external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile |  3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r 687f72864a3a -r 6a4e33fa2f7d external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver     Mon May 31 21:31:33 2021 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver     Mon May 31 21:45:41 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xf86-driver,v 1.27 2021/04/12 03:57:06 mrg Exp $
+#      $NetBSD: Makefile.xf86-driver,v 1.28 2021/05/31 21:45:41 joerg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   ${PACKAGE_MAJOR}
@@ -49,9 +49,6 @@
 CPPFLAGS+=     -DPACKAGE_VERSION_PATCHLEVEL=${PACKAGE_PATCH}
 CPPFLAGS+=     -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
-# IOPortBase is particularly annoying to fix
-COPTS+=         ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
-
 .PATH: ${X11SRCDIR.${DRIVER}}/src
 .PATH: ${X11SRCDIR.${DRIVER}}/man
 .PATH: ${X11SRCDIR.${DRIVER}}
diff -r 687f72864a3a -r 6a4e33fa2f7d external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile       Mon May 31 21:31:33 2021 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile       Mon May 31 21:45:41 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2021/05/30 22:24:35 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2021/05/31 21:45:41 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -26,6 +26,5 @@
 
 # XXX
 COPTS+=                -Wno-error
-COPTS+=                -fcommon
 
 .include "../Makefile.xf86-driver"