diff options
| author | emaste <emaste@FreeBSD.org> | 2014-02-06 21:57:27 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-02-06 21:57:27 +0000 |
| commit | 087fcb444d6787b38dfce3f8fc0becb203705ab9 (patch) | |
| tree | f6606ccc5c670189e4f96c0b614c4ffb3c0aad7b /lib/libstand | |
| parent | b04698fc3076121aa9d8b3d459b1142ed13d32d9 (diff) | |
| download | FreeBSD-src-087fcb444d6787b38dfce3f8fc0becb203705ab9.zip FreeBSD-src-087fcb444d6787b38dfce3f8fc0becb203705ab9.tar.gz | |
Build libstand as a 64-bit library on amd64
The 32-bit bootloaders now link against libstand.a in sys/boot/libstand32,
so there is no need to force /usr/lib/libstand.a to be 32-bit.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'lib/libstand')
| -rw-r--r-- | lib/libstand/Makefile | 22 | ||||
| -rw-r--r-- | lib/libstand/libstand.3 | 2 |
2 files changed, 9 insertions, 15 deletions
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 997616e..597dcc1 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -21,16 +21,21 @@ CFLAGS+= -ffreestanding -Wformat CFLAGS+= -I${.CURDIR} .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -CFLAGS.gcc+= -mpreferred-stack-boundary=2 CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float .endif +.if ${MACHINE_CPUARCH} == "i386" +CFLAGS.gcc+= -mpreferred-stack-boundary=2 +.endif +.if ${MACHINE_CPUARCH} == "amd64" +CFLAGS+= -fPIC +.endif .if ${MACHINE} == "pc98" CFLAGS+= -Os .endif .if ${MACHINE_CPUARCH} == "powerpc" CFLAGS+= -msoft-float -D_STANDALONE -DNETIF_DEBUG .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" +.if ${MACHINE_ARCH} == "powerpc64" CFLAGS+= -m32 -I. .endif .if ${MACHINE_CPUARCH} == "arm" @@ -103,9 +108,7 @@ SRCS+= syncicache.c SRCS+= uuid_equal.c uuid_is_nil.c # _setjmp/_longjmp -.if ${MACHINE_CPUARCH} == "amd64" -.PATH: ${.CURDIR}/i386 -.elif ${MACHINE_ARCH} == "powerpc64" +.if ${MACHINE_ARCH} == "powerpc64" .PATH: ${.CURDIR}/powerpc .else .PATH: ${.CURDIR}/${MACHINE_CPUARCH} @@ -179,12 +182,3 @@ SRCS+= nandfs.c .include <bsd.lib.mk> -.if ${MACHINE_CPUARCH} == "amd64" -beforedepend ${OBJS}: machine -cleandepend: cleanmachine -cleanmachine: - rm -f machine - -machine: - ln -s ${.CURDIR}/../../sys/i386/include machine -.endif diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3 index 2b28d72..d808be7 100644 --- a/lib/libstand/libstand.3 +++ b/lib/libstand/libstand.3 @@ -675,6 +675,6 @@ the environment functions and this manpage were written by .Sh BUGS The lack of detailed memory usage data is unhelpful. .Pp -On the amd64 and powerpc64 architectures +On the powerpc64 architecture .Nm is a 32-bit library. |
