mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-15 06:42:51 +01:00
[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.
This commit is contained in:
parent
c0290b3de8
commit
24faccc241
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=366039
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user