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 /libexec | |
parent | c0290b3de8567b608afd45c42e5617da53ecb396 (diff) | |
download | src-24faccc2411c6784d1d1c557cd389db0abd06e68.tar.gz src-24faccc2411c6784d1d1c557cd389db0abd06e68.zip |
[PowerPC64LE] Use a shared LIBC_ARCH for powerpc64le.
Given that we have converted to ELFv2 for BE already, endianness is the only
difference between the two ARCHs.
As such, there is no need to differentiate LIBC_ARCH between the two.
Combining them like this lets us avoid needing to have two copies of several
bits for no good reason.
Sponsored by: Tag1 Consulting, Inc.
Notes
Notes:
svn path=/head/; revision=366039
Diffstat (limited to 'libexec')
-rw-r--r-- | libexec/rtld-elf/Makefile | 4 | ||||
-rw-r--r-- | libexec/rtld-elf/rtld-libc/Makefile.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 2309e0c17dd1..cda56390ebe7 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -32,8 +32,8 @@ MAN?= rtld.1 ACFLAGS+= -DLOCORE CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -ffreestanding CFLAGS+= -I${SRCTOP}/lib/csu/common -.if exists(${RTLD_ELF_DIR}/${MACHINE_ARCH}) -RTLD_ARCH= ${MACHINE_ARCH} +.if exists(${RTLD_ELF_DIR}/${MACHINE_ARCH:S/powerpc64le/powerpc64/}) +RTLD_ARCH= ${MACHINE_ARCH:S/powerpc64le/powerpc64/} .else RTLD_ARCH= ${MACHINE_CPUARCH} .endif diff --git a/libexec/rtld-elf/rtld-libc/Makefile.inc b/libexec/rtld-elf/rtld-libc/Makefile.inc index e5759b5dcf91..74ac3668f1ad 100644 --- a/libexec/rtld-elf/rtld-libc/Makefile.inc +++ b/libexec/rtld-elf/rtld-libc/Makefile.inc @@ -5,8 +5,8 @@ .include <bsd.compiler.mk> LIBC_SRCTOP=${SRCTOP}/lib/libc -.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 |