Date: Thu, 6 Feb 2014 21:57:27 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261568 - head/lib/libstand Message-ID: <201402062157.s16LvRV6048296@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Thu Feb 6 21:57:27 2014 New Revision: 261568 URL: http://svnweb.freebsd.org/changeset/base/261568 Log: 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 Modified: head/lib/libstand/Makefile head/lib/libstand/libstand.3 Modified: head/lib/libstand/Makefile ============================================================================== --- head/lib/libstand/Makefile Thu Feb 6 21:54:21 2014 (r261567) +++ head/lib/libstand/Makefile Thu Feb 6 21:57:27 2014 (r261568) @@ -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 Modified: head/lib/libstand/libstand.3 ============================================================================== --- head/lib/libstand/libstand.3 Thu Feb 6 21:54:21 2014 (r261567) +++ head/lib/libstand/libstand.3 Thu Feb 6 21:57:27 2014 (r261568) @@ -675,6 +675,6 @@ the environment functions and this manpa .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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402062157.s16LvRV6048296>