summaryrefslogtreecommitdiffstats
path: root/lib/libc/string
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-08-24 20:54:43 +0000
committerimp <imp@FreeBSD.org>2010-08-24 20:54:43 +0000
commita34c7e01875a6937a85f5aeab3c3c4a9abad4989 (patch)
treebb0f841155cd39dbde2a783d763631c8becd298c /lib/libc/string
parentd3a20dc0b93297e94a5351435c958bdaa7379f25 (diff)
downloadFreeBSD-src-a34c7e01875a6937a85f5aeab3c3c4a9abad4989.zip
FreeBSD-src-a34c7e01875a6937a85f5aeab3c3c4a9abad4989.tar.gz
Powerpc is special here. powerpc and powerpc64 use different ABIs, so
their implementations aren't in the same files. Introduce LIBC_ARCH and use that in preference to MACHINE_CPUARCH. Tested by amd64 and powerpc64 builds (thanks nathanw@)
Diffstat (limited to 'lib/libc/string')
-rw-r--r--lib/libc/string/Makefile.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 96759d5..3673a41 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,7 +1,7 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.PATH: ${.CURDIR}/${MACHINE_CPUARCH}/string ${.CURDIR}/string
+.PATH: ${.CURDIR}/${LIBC_ARCH}/string ${.CURDIR}/string
CFLAGS+= -I${.CURDIR}/locale
@@ -26,9 +26,7 @@ SYM_MAPS+= ${.CURDIR}/string/Symbol.map
# machine-dependent string sources
-.if exists(${.CURDIR}/${MACHINE_CPUARCH}/string/Makefile.inc)
-.include "${.CURDIR}/${MACHINE_CPUARCH}/string/Makefile.inc"
-.endif
+.sinclude "${.CURDIR}/${LIBC_ARCH}/string/Makefile.inc"
MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 strcasecmp.3 strcat.3 \
OpenPOWER on IntegriCloud