svn commit: r360072 - in head/sys: conf modules/linux modules/linux64 modules/vmm

[Alex Richardson]

Author: arichardson
Date: Sat Apr 18 12:54:40 2020
New Revision: 360072
URL: https://svnweb.freebsd.org/changeset/base/360072

Log:
  More fixes to build the kernel with a compiler that defaults to -fno-common
  
  Using the same approach as the last commit for the files used by genassym.sh.
  
  Obtained from:	CheriBSD

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/modules/linux/Makefile
  head/sys/modules/linux64/Makefile
  head/sys/modules/vmm/Makefile

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Sat Apr 18 12:54:35 2020	(r360071)
+++ head/sys/conf/files.amd64	Sat Apr 18 12:54:40 2020	(r360072)
@@ -38,7 +38,7 @@ cloudabi64_vdso_blob.o		optional	compat_cloudabi64	\
 #
 linux32_genassym.o		optional	compat_linux32		\
 	dependency 	"$S/amd64/linux32/linux32_genassym.c offset.inc"		\
-	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -c ${.IMPSRC}" \
+	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -fcommon -c ${.IMPSRC}" \
 	no-obj no-implicit-rule						\
 	clean		"linux32_genassym.o"
 #
@@ -62,7 +62,7 @@ linux32_vdso.so		optional	compat_linux32			\
 #
 ia32_genassym.o			standard				\
 	dependency 	"$S/compat/ia32/ia32_genassym.c offset.inc"		\
-	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -c ${.IMPSRC}" \
+	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -fcommon -c ${.IMPSRC}" \
 	no-obj no-implicit-rule						\
 	clean		"ia32_genassym.o"
 #

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Sat Apr 18 12:54:35 2020	(r360071)
+++ head/sys/conf/files.i386	Sat Apr 18 12:54:40 2020	(r360072)
@@ -25,7 +25,7 @@ cloudabi32_vdso_blob.o		optional	compat_cloudabi32	\
 #
 linux_genassym.o		optional	compat_linux		\
 	dependency 	"$S/i386/linux/linux_genassym.c offset.inc"		\
-	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -c ${.IMPSRC}" \
+	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -fcommon -c ${.IMPSRC}" \
 	no-obj no-implicit-rule						\
 	clean		"linux_genassym.o"
 #

Modified: head/sys/modules/linux/Makefile
==============================================================================
--- head/sys/modules/linux/Makefile	Sat Apr 18 12:54:35 2020	(r360071)
+++ head/sys/modules/linux/Makefile	Sat Apr 18 12:54:40 2020	(r360072)
@@ -78,7 +78,7 @@ ${VDSO}.so: linux${SFX}_locore.o
 .endif
 
 linux${SFX}_genassym.o: offset.inc
-	${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
+	${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)
 .warning Building Linuxulator outside of a kernel does not make sense

Modified: head/sys/modules/linux64/Makefile
==============================================================================
--- head/sys/modules/linux64/Makefile	Sat Apr 18 12:54:35 2020	(r360071)
+++ head/sys/modules/linux64/Makefile	Sat Apr 18 12:54:40 2020	(r360072)
@@ -53,7 +53,7 @@ linux_support.o: assym.inc linux_assym.h
 	    ${.IMPSRC} -o ${.TARGET}
 
 linux_genassym.o: offset.inc
-	${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
+	${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)
 .warning Building Linuxulator outside of a kernel does not make sense

Modified: head/sys/modules/vmm/Makefile
==============================================================================
--- head/sys/modules/vmm/Makefile	Sat Apr 18 12:54:35 2020	(r360071)
+++ head/sys/modules/vmm/Makefile	Sat Apr 18 12:54:40 2020	(r360072)
@@ -75,9 +75,9 @@ svm_support.o:
 	    ${.IMPSRC} -o ${.TARGET}
 
 vmx_genassym.o: offset.inc
-	${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
+	${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC}
 
 svm_genassym.o: offset.inc
-	${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
+	${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC}
 
 .include <bsd.kmod.mk>