Module Name: src
Committed By: mrg
Date: Tue Apr 13 07:53:59 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server.old: Makefile.serverlib
Makefile.servermod
Log Message:
apply -fcommon here as well.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib \
src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.2 src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3
--- src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.2 Mon Apr 12 03:57:06 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib Tue Apr 13 07:53:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.2 2021/04/12 03:57:06 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.3 2021/04/13 07:53:59 mrg Exp $
.include <bsd.own.mk> # for NETBSDSRCDIR and mk.conf processing
@@ -27,3 +27,6 @@ CPPFLAGS+= -D__GLX_ALIGN64
# IOPortBase is particularly annoying to fix
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
+
+# IOPortBase is particularly annoying to fix
+COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.2 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3
--- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.2 Mon Apr 12 03:57:06 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Tue Apr 13 07:53:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.2 2021/04/12 03:57:06 mrg Exp $
+# $NetBSD: Makefile.servermod,v 1.3 2021/04/13 07:53:59 mrg Exp $
.include <bsd.own.mk> # For /etc/mk.conf processing
@@ -25,4 +25,7 @@ CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
# IOPortBase is particularly annoying to fix
+
+# IOPortBase is particularly annoying to fix
+COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
