Make RTLD work on powerpc64 again. If there is a sub-directory named
MACHINE_ARCH, use that specific one, otherwise use MACHINE_CPUARCH. Reviewed by: imp
This commit is contained in:
parent
025f9d5b15
commit
789e85458b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=211785
@ -10,7 +10,12 @@ SRCS= rtld_start.S \
|
||||
MAN= rtld.1
|
||||
CSTD?= gnu99
|
||||
CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD
|
||||
CFLAGS+= -I${.CURDIR}/${MACHINE_CPUARCH} -I${.CURDIR}
|
||||
.if exists(${.CURDIR}/${MACHINE_ARCH})
|
||||
RTLD_ARCH= ${MACHINE_ARCH}
|
||||
.else
|
||||
RTLD_ARCH= ${MACHINE_CPUARCH}
|
||||
.endif
|
||||
CFLAGS+= -I${.CURDIR}/${RTLD_ARCH} -I${.CURDIR}
|
||||
.if ${MACHINE_ARCH} == "powerpc64"
|
||||
LDFLAGS+= -nostdlib -e _rtld_start
|
||||
.else
|
||||
@ -39,15 +44,13 @@ LDFLAGS+= -Wl,--version-script=${VERSION_MAP}
|
||||
|
||||
${PROG}: ${VERSION_MAP}
|
||||
|
||||
.if exists(${.CURDIR}/${MACHINE_CPUARCH}/Symbol.map)
|
||||
SYMBOL_MAPS+= ${.CURDIR}/${MACHINE_CPUARCH}/Symbol.map
|
||||
.if exists(${.CURDIR}/${RTLD_ARCH}/Symbol.map)
|
||||
SYMBOL_MAPS+= ${.CURDIR}/${RTLD_ARCH}/Symbol.map
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if exists(${.CURDIR}/${MACHINE_CPUARCH}/Makefile.inc)
|
||||
.include "${.CURDIR}/${MACHINE_CPUARCH}/Makefile.inc"
|
||||
.endif
|
||||
.sinclude "${.CURDIR}/${RTLD_ARCH}/Makefile.inc"
|
||||
|
||||
# Since moving rtld-elf to /libexec, we need to create a symlink.
|
||||
# Fixup the existing binary that's there so we can symlink over it.
|
||||
@ -56,7 +59,7 @@ beforeinstall:
|
||||
-chflags noschg ${DESTDIR}/usr/libexec/${PROG}
|
||||
.endif
|
||||
|
||||
.PATH: ${.CURDIR}/${MACHINE_CPUARCH}
|
||||
.PATH: ${.CURDIR}/${RTLD_ARCH}
|
||||
|
||||
.include <bsd.symver.mk>
|
||||
.include <bsd.prog.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user