svn commit: r296057 - in head/sys/modules: linux linux64

[Ed Maste]

Author: emaste
Date: Thu Feb 25 19:26:14 2016
New Revision: 296057
URL: https://svnweb.freebsd.org/changeset/base/296057

Log:
  pass -fPIC to the assembler, not linker
  
  -fPIC has no effect on linking although it seems to be ignored by
  GNU ld.bfd.  However, it causes ld.lld to terminate with an invalid
  argument error.
  
  Reviewed by:	dchagin, kib
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation
  Differential Revision: https://reviews.freebsd.org/D5444

Modified:
  head/sys/modules/linux/Makefile
  head/sys/modules/linux64/Makefile

Modified: head/sys/modules/linux/Makefile
==============================================================================
--- head/sys/modules/linux/Makefile	Thu Feb 25 19:21:46 2016	(r296056)
+++ head/sys/modules/linux/Makefile	Thu Feb 25 19:26:14 2016	(r296057)
@@ -51,9 +51,9 @@ linux${SFX}_assym.h: linux${SFX}_genassy
 linux${SFX}_locore.o: linux${SFX}_assym.h assym.s
 	${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s			\
 	-pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -nostdinc -nostdlib	\
-	-fno-omit-frame-pointer							\
+	-fno-omit-frame-pointer -fPIC						\
 	-Wl,-T${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX}/${VDSO}.lds.s	\
-	-Wl,-soname=${VDSO}.so.1,--eh-frame-hdr,-fPIC,-warn-common		\
+	-Wl,-soname=${VDSO}.so.1,--eh-frame-hdr,-warn-common		\
 	    ${.IMPSRC} -o ${.TARGET}
 
 linux${SFX}_support.o: linux${SFX}_assym.h assym.s

Modified: head/sys/modules/linux64/Makefile
==============================================================================
--- head/sys/modules/linux64/Makefile	Thu Feb 25 19:21:46 2016	(r296056)
+++ head/sys/modules/linux64/Makefile	Thu Feb 25 19:26:14 2016	(r296057)
@@ -27,9 +27,9 @@ linux_assym.h: linux_genassym.o
 
 linux_locore.o: linux_locore.s linux_assym.h
 	${CC} -x assembler-with-cpp -DLOCORE -shared -mcmodel=small	\
-	-pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -nostdinc 	\
+	-pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -fPIC -nostdinc	\
 	-Wl,-T${.CURDIR}/../../${MACHINE_CPUARCH}/linux/${VDSO}.lds.s	\
-	-Wl,-soname=${VDSO}.so.1,-fPIC,-warn-common -nostdlib		\
+	-Wl,-soname=${VDSO}.so.1,-warn-common -nostdlib			\
 	    ${.IMPSRC} -o ${.TARGET}
 
 ${VDSO}.so: linux_locore.o