svn commit: r211785 - head/libexec/rtld-elf

Nathan Whitehorn nwhitehorn at
Tue Aug 24 23:19:14 UTC 2010

Author: nwhitehorn
Date: Tue Aug 24 23:19:14 2010
New Revision: 211785

  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


Modified: head/libexec/rtld-elf/Makefile
--- head/libexec/rtld-elf/Makefile	Tue Aug 24 23:17:30 2010	(r211784)
+++ head/libexec/rtld-elf/Makefile	Tue Aug 24 23:19:14 2010	(r211785)
@@ -10,7 +10,12 @@ SRCS=		rtld_start.S \
 MAN=		rtld.1
 CSTD?=		gnu99
+.if exists(${.CURDIR}/${MACHINE_ARCH})
 .if ${MACHINE_ARCH} == "powerpc64"
 LDFLAGS+=	-nostdlib -e _rtld_start
@@ -39,15 +44,13 @@ LDFLAGS+=	-Wl,--version-script=${VERSION
-.if exists(${.CURDIR}/${MACHINE_CPUARCH}/
+.if exists(${.CURDIR}/${RTLD_ARCH}/
-.if exists(${.CURDIR}/${MACHINE_CPUARCH}/
-.include "${.CURDIR}/${MACHINE_CPUARCH}/"
+.sinclude "${.CURDIR}/${RTLD_ARCH}/"
 # 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}
 .include <>
 .include <>

More information about the svn-src-all mailing list