diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2015-04-11 10:36:48 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2015-04-11 10:36:48 +0000 |
| commit | cc0ab6997e0a86789a18bb22d2a82f196a64c349 (patch) | |
| tree | a3635993bfefa7d31693d46e72670400a958fa13 /sys | |
| parent | d4926f83a80d1345587a2477931fbddf56b3e2ca (diff) | |
| download | src-cc0ab6997e0a86789a18bb22d2a82f196a64c349.tar.gz src-cc0ab6997e0a86789a18bb22d2a82f196a64c349.zip | |
Only add -fPIC to CFLAGS and -Wl,-znocombreloc to LDFLAGS on x86, they
shouldn't be used on arm.
Notes
Notes:
svn path=/head/; revision=281434
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 3 | ||||
| -rw-r--r-- | sys/boot/efi/loader/arch/amd64/Makefile.inc | 3 | ||||
| -rw-r--r-- | sys/boot/efi/loader/arch/i386/Makefile.inc | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index da92c4363941..db5d3faff070 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -29,7 +29,6 @@ SRCS= autoload.c \ .PATH: ${.CURDIR}/../../i386/libi386 .include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" -CFLAGS+= -fPIC CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/arch/${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/../include @@ -72,7 +71,7 @@ FILES= loader.efi FILESMODE_loader.efi= ${BINMODE} LDSCRIPT= ${.CURDIR}/arch/${MACHINE_CPUARCH}/ldscript.${MACHINE_CPUARCH} -LDFLAGS= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared -Wl,-znocombreloc +LDFLAGS+= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared CLEANFILES= vers.c loader.efi diff --git a/sys/boot/efi/loader/arch/amd64/Makefile.inc b/sys/boot/efi/loader/arch/amd64/Makefile.inc index 006606d07f5a..fee959b283d3 100644 --- a/sys/boot/efi/loader/arch/amd64/Makefile.inc +++ b/sys/boot/efi/loader/arch/amd64/Makefile.inc @@ -8,3 +8,6 @@ SRCS+= amd64_tramp.S \ .PATH: ${.CURDIR}/../../i386/libi386 SRCS+= nullconsole.c \ comconsole.c + +CFLAGS+= -fPIC +LDFLAGS+= -Wl,-znocombreloc diff --git a/sys/boot/efi/loader/arch/i386/Makefile.inc b/sys/boot/efi/loader/arch/i386/Makefile.inc index 2fce488b88f9..4e08c5376336 100644 --- a/sys/boot/efi/loader/arch/i386/Makefile.inc +++ b/sys/boot/efi/loader/arch/i386/Makefile.inc @@ -8,3 +8,6 @@ SRCS+= start.S \ .PATH: ${.CURDIR}/../../i386/libi386 SRCS+= nullconsole.c \ comconsole.c + +CFLAGS+= -fPIC +LDFLAGS+= -Wl,-znocombreloc |