Module Name: src
Committed By: mrg
Date: Sun Dec 13 09:31:47 UTC 2009
Modified Files:
src/libexec/ld.elf_so: Makefile
src/libexec/ld.elf_so/arch/i386: Makefile.inc
src/libexec/ld.elf_so/arch/sparc: Makefile.inc
Removed Files:
src/libexec/ld.elf_so/arch/i386: Makefile.ld32
src/libexec/ld.elf_so/arch/sparc: Makefile.ld32
Log Message:
simplify the logic for compat ld.elf_so and move it here. we now can
find the libc objdir for multiple compat ld.elf_so's, too.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.13 -r1.14 src/libexec/ld.elf_so/arch/i386/Makefile.inc
cvs rdiff -u -r1.1 -r0 src/libexec/ld.elf_so/arch/i386/Makefile.ld32
cvs rdiff -u -r1.13 -r1.14 src/libexec/ld.elf_so/arch/sparc/Makefile.inc
cvs rdiff -u -r1.1 -r0 src/libexec/ld.elf_so/arch/sparc/Makefile.ld32
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.92 src/libexec/ld.elf_so/Makefile:1.93
--- src/libexec/ld.elf_so/Makefile:1.92 Sun Dec 13 09:01:45 2009
+++ src/libexec/ld.elf_so/Makefile Sun Dec 13 09:31:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2009/12/13 09:01:45 mrg Exp $
+# $NetBSD: Makefile,v 1.93 2009/12/13 09:31:47 mrg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -38,8 +38,6 @@
(${MACHINE_ARCH} == "vax")) && \
${OBJECT_FMT} == "ELF" && ${MKPIC} != "no"
-PROG?= ld.elf_so
-
LDFLAGS+= -shared -symbolic -nostartfiles
LDFLAGS+= -Wl,-static
@@ -49,13 +47,16 @@
.include "$M/Makefile.inc"
.endif
-# Support src/compat/libexec/ld.elf_so.
+# Support compat ld.elf_so.
.if defined(MLIBDIR)
-CLIBOBJ!= cd ${NETBSDSRCDIR}/compat/lib/libc && ${PRINTOBJDIR}
+PROG= ld.elf_so-${MLIBDIR}
+CPPFLAGS+= -DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\"
.else
-CLIBOBJ!= cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR}
+PROG= ld.elf_so
.endif
+CLIBOBJ!= cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR}
+
SRCS+= rtld.c reloc.c symbol.c xmalloc.c xprintf.c debug.c \
map_object.c load.c search.c headers.c paths.c expand.c
Index: src/libexec/ld.elf_so/arch/i386/Makefile.inc
diff -u src/libexec/ld.elf_so/arch/i386/Makefile.inc:1.13 src/libexec/ld.elf_so/arch/i386/Makefile.inc:1.14
--- src/libexec/ld.elf_so/arch/i386/Makefile.inc:1.13 Sun Dec 13 08:25:20 2009
+++ src/libexec/ld.elf_so/arch/i386/Makefile.inc Sun Dec 13 09:31:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.14 2009/12/13 09:31:47 mrg Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -8,7 +8,3 @@
CPPFLAGS+= -DELFSIZE=32
LDFLAGS+= -Wl,-e,.rtld_start
-
-.if defined(MLIBDIR)
-.include "Makefile.ld32"
-.endif
Index: src/libexec/ld.elf_so/arch/sparc/Makefile.inc
diff -u src/libexec/ld.elf_so/arch/sparc/Makefile.inc:1.13 src/libexec/ld.elf_so/arch/sparc/Makefile.inc:1.14
--- src/libexec/ld.elf_so/arch/sparc/Makefile.inc:1.13 Sun Dec 13 08:25:20 2009
+++ src/libexec/ld.elf_so/arch/sparc/Makefile.inc Sun Dec 13 09:31:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.14 2009/12/13 09:31:47 mrg Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -8,7 +8,3 @@
CPPFLAGS+= -DELFSIZE=32
LDFLAGS+= -Wl,-e,_rtld_start
-
-.if defined(MLIBDIR)
-.include "Makefile.ld32"
-.endif
