diff options
| author | Brandon Bergren <bdragon@FreeBSD.org> | 2020-09-23 00:21:51 +0000 |
|---|---|---|
| committer | Brandon Bergren <bdragon@FreeBSD.org> | 2020-09-23 00:21:51 +0000 |
| commit | 24faccc2411c6784d1d1c557cd389db0abd06e68 (patch) | |
| tree | 751edfa3cc89ba8c877d60e90398e19202da0d1b /lib | |
| parent | c0290b3de8567b608afd45c42e5617da53ecb396 (diff) | |
Notes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/csu/Makefile | 4 | ||||
| -rw-r--r-- | lib/libc/Makefile | 4 | ||||
| -rw-r--r-- | lib/libc/powerpc64/string/Makefile.inc | 11 |
3 files changed, 12 insertions, 7 deletions
diff --git a/lib/csu/Makefile b/lib/csu/Makefile index 9b7d1beb76d69..3f45c5eb3afcb 100644 --- a/lib/csu/Makefile +++ b/lib/csu/Makefile @@ -2,8 +2,8 @@ .include <src.opts.mk> -.if exists(${.CURDIR}/${MACHINE_ARCH}) -SUBDIR+= ${MACHINE_ARCH} +.if exists(${.CURDIR}/${MACHINE_ARCH:S/powerpc64le/powerpc64/}) +SUBDIR+= ${MACHINE_ARCH:S/powerpc64le/powerpc64/} .else SUBDIR+= ${MACHINE_CPUARCH} .endif diff --git a/lib/libc/Makefile b/lib/libc/Makefile index d5cfe7e500138..d930915307210 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -15,8 +15,8 @@ LIBC_SRCTOP?= ${.CURDIR} # named MACHINE_CPUARCH, but some ABIs are different enough to require # their own libc, so allow a directory named MACHINE_ARCH to override this. -.if exists(${LIBC_SRCTOP}/${MACHINE_ARCH}) -LIBC_ARCH=${MACHINE_ARCH} +.if exists(${LIBC_SRCTOP}/${MACHINE_ARCH:S/powerpc64le/powerpc64/}) +LIBC_ARCH=${MACHINE_ARCH:S/powerpc64le/powerpc64/} .else LIBC_ARCH=${MACHINE_CPUARCH} .endif diff --git a/lib/libc/powerpc64/string/Makefile.inc b/lib/libc/powerpc64/string/Makefile.inc index 7cedf0dc3d631..14f0845595c96 100644 --- a/lib/libc/powerpc64/string/Makefile.inc +++ b/lib/libc/powerpc64/string/Makefile.inc @@ -10,9 +10,14 @@ MDSRCS+= \ memmove.S \ memmove_vsx.S \ memmove_resolver.c \ - strcpy_arch_2_05.S \ - strcpy.c \ - strcpy_resolver.c \ strncpy_arch_2_05.S \ strncpy.c \ strncpy_resolver.c + +# XXX Port strcpy to LE. +.if ${MACHINE_ARCH} == "powerpc64" +MDSRCS+= \ + strcpy_arch_2_05.S \ + strcpy.c \ + strcpy_resolver.c +.endif |