[src/trunk]: src use -fcommon where necessary.

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

details:   https://anonhg.NetBSD.org/src/rev/e473938692c5
branches:  trunk
changeset: 961559:e473938692c5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Apr 12 03:57:06 2021 +0000

description:
use -fcommon where necessary.

diffstat:

 external/ibm-public/postfix/Makefile.inc                    |  5 ++++-
 external/mit/ctwm/bin/ctwm/Makefile                         |  4 +++-
 external/mit/xorg/lib/libmesa.mk                            |  4 ++--
 external/mit/xorg/server/drivers/Makefile.xf86-driver       |  5 ++++-
 external/mit/xorg/server/xorg-server.old/Makefile.serverlib |  5 ++++-
 external/mit/xorg/server/xorg-server.old/Makefile.servermod |  5 ++++-
 external/mit/xorg/server/xorg-server/Makefile.serverlib     |  5 ++++-
 external/mit/xorg/server/xorg-server/Makefile.servermod     |  5 ++++-
 lib/libc/gen/Makefile.inc                                   |  3 ++-
 9 files changed, 31 insertions(+), 10 deletions(-)

diffs (148 lines):

diff -r b30e13feaced -r e473938692c5 external/ibm-public/postfix/Makefile.inc
--- a/external/ibm-public/postfix/Makefile.inc  Mon Apr 12 03:55:40 2021 +0000
+++ b/external/ibm-public/postfix/Makefile.inc  Mon Apr 12 03:57:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.26 2020/11/12 17:53:43 nia Exp $
+#      $NetBSD: Makefile.inc,v 1.27 2021/04/12 03:57:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,6 +9,9 @@
 
 PFIX_DISTDIR=  ${NETBSDSRCDIR}/external/ibm-public/postfix/dist
 
+# Many issues need to be resolved.
+COPTS+=        -fcommon
+
 CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \
        -I${DIST} \
        -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
diff -r b30e13feaced -r e473938692c5 external/mit/ctwm/bin/ctwm/Makefile
--- a/external/mit/ctwm/bin/ctwm/Makefile       Mon Apr 12 03:55:40 2021 +0000
+++ b/external/mit/ctwm/bin/ctwm/Makefile       Mon Apr 12 03:57:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2021/04/11 10:52:16 nia Exp $
+#      $NetBSD: Makefile,v 1.11 2021/04/12 03:57:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -65,3 +65,5 @@
 .include <bsd.files.mk>
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
+
+COPTS+=                        ${${ACTIVE_CC} == "gcc":? -fcommon :}
diff -r b30e13feaced -r e473938692c5 external/mit/xorg/lib/libmesa.mk
--- a/external/mit/xorg/lib/libmesa.mk  Mon Apr 12 03:55:40 2021 +0000
+++ b/external/mit/xorg/lib/libmesa.mk  Mon Apr 12 03:57:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: libmesa.mk,v 1.13 2020/10/31 13:28:22 nia Exp $
+#      $NetBSD: libmesa.mk,v 1.14 2021/04/12 03:57:06 mrg Exp $
 #
 # Consumer of this Makefile should set MESA_SRC_MODULES.
 
@@ -548,6 +548,6 @@
 CPPFLAGS+=     \
        -DYYTEXT_POINTER=1
 
-CFLAGS+=       -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp
+CFLAGS+=       -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp -fcommon
 
 .include "libGL/mesa-ver.mk"
diff -r b30e13feaced -r e473938692c5 external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver     Mon Apr 12 03:55:40 2021 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver     Mon Apr 12 03:57:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xf86-driver,v 1.26 2019/01/03 23:25:52 mrg Exp $
+#      $NetBSD: Makefile.xf86-driver,v 1.27 2021/04/12 03:57:06 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   ${PACKAGE_MAJOR}
@@ -49,6 +49,9 @@
 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 b30e13feaced -r e473938692c5 external/mit/xorg/server/xorg-server.old/Makefile.serverlib
--- a/external/mit/xorg/server/xorg-server.old/Makefile.serverlib       Mon Apr 12 03:55:40 2021 +0000
+++ b/external/mit/xorg/server/xorg-server.old/Makefile.serverlib       Mon Apr 12 03:57:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.serverlib,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+#      $NetBSD: Makefile.serverlib,v 1.2 2021/04/12 03:57:06 mrg Exp $
 
 .include <bsd.own.mk>          # for NETBSDSRCDIR and mk.conf processing
 
@@ -24,3 +24,6 @@
 .if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
 CPPFLAGS+=     -D__GLX_ALIGN64
 .endif
+
+# IOPortBase is particularly annoying to fix
+COPTS+=         ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
diff -r b30e13feaced -r e473938692c5 external/mit/xorg/server/xorg-server.old/Makefile.servermod
--- a/external/mit/xorg/server/xorg-server.old/Makefile.servermod       Mon Apr 12 03:55:40 2021 +0000
+++ b/external/mit/xorg/server/xorg-server.old/Makefile.servermod       Mon Apr 12 03:57:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.servermod,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+#      $NetBSD: Makefile.servermod,v 1.2 2021/04/12 03:57:06 mrg Exp $
 
 .include <bsd.own.mk>  # For /etc/mk.conf processing
 
@@ -23,3 +23,6 @@
 .if defined(XMODULEDIR)
 CPPFLAGS+=     ${X11FLAGS.LOADABLE}
 .endif
+
+# IOPortBase is particularly annoying to fix
+COPTS+=         ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
diff -r b30e13feaced -r e473938692c5 external/mit/xorg/server/xorg-server/Makefile.serverlib
--- a/external/mit/xorg/server/xorg-server/Makefile.serverlib   Mon Apr 12 03:55:40 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.serverlib   Mon Apr 12 03:57:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.serverlib,v 1.12 2016/08/19 03:59:30 mrg Exp $
+#      $NetBSD: Makefile.serverlib,v 1.13 2021/04/12 03:57:06 mrg Exp $
 
 .include <bsd.own.mk>          # for NETBSDSRCDIR and mk.conf processing
 
@@ -28,3 +28,6 @@
 .if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
 CPPFLAGS+=     -D__GLX_ALIGN64
 .endif
+
+# IOPortBase is particularly annoying to fix
+COPTS+=         ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
diff -r b30e13feaced -r e473938692c5 external/mit/xorg/server/xorg-server/Makefile.servermod
--- a/external/mit/xorg/server/xorg-server/Makefile.servermod   Mon Apr 12 03:55:40 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.servermod   Mon Apr 12 03:57:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.servermod,v 1.5 2018/12/31 11:14:03 mrg Exp $
+#      $NetBSD: Makefile.servermod,v 1.6 2021/04/12 03:57:06 mrg Exp $
 
 .include <bsd.own.mk>  # For /etc/mk.conf processing
 
@@ -25,3 +25,6 @@
 .endif
 
 CPPFLAGS+=     ${X11FLAGS.DIX}
+
+# IOPortBase is particularly annoying to fix
+COPTS+=         ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
diff -r b30e13feaced -r e473938692c5 lib/libc/gen/Makefile.inc
--- a/lib/libc/gen/Makefile.inc Mon Apr 12 03:55:40 2021 +0000
+++ b/lib/libc/gen/Makefile.inc Mon Apr 12 03:57:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.210 2021/03/10 13:30:34 simonb Exp $
+#      $NetBSD: Makefile.inc,v 1.211 2021/04/12 03:57:07 mrg Exp $
 #      from: @(#)Makefile.inc  8.6 (Berkeley) 5/4/95
 
 # gen sources
@@ -211,3 +211,4 @@
 # Ownership of globals from crt0.o is shared with libc for historic reasons.
 # __progname is also necessary as global here for the nbcompat case.
 COPTS.getprogname.c+=  -fcommon
+COPTS.setproctitle.c+= -fcommon