diff options
| author | mrg <mrg@NetBSD.org> | 2009-12-13 09:31:47 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2009-12-13 09:31:47 +0000 |
| commit | 750ad3d59dc24cc936d96f10fe8f74dc6fbdbdf2 (patch) | |
| tree | c70a22acf077596eabfb62d914cdffb59e86df75 /libexec | |
| parent | c6b4bc4a8180d2b658735539c00dbab612bf3ab9 (diff) | |
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.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.elf_so/Makefile | 13 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/i386/Makefile.inc | 6 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/i386/Makefile.ld32 | 3 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/sparc/Makefile.inc | 6 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/sparc/Makefile.ld32 | 3 |
5 files changed, 9 insertions, 22 deletions
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile index ec21b90cd86..0958d64422e 100644 --- a/libexec/ld.elf_so/Makefile +++ b/libexec/ld.elf_so/Makefile @@ -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 @@ M= ${.CURDIR}/arch/${ARCHSUBDIR} (${MACHINE_ARCH} == "vax")) && \ ${OBJECT_FMT} == "ELF" && ${MKPIC} != "no" -PROG?= ld.elf_so - LDFLAGS+= -shared -symbolic -nostartfiles LDFLAGS+= -Wl,-static @@ -49,13 +47,16 @@ LDFLAGS+= -Wl,-static .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 diff --git a/libexec/ld.elf_so/arch/i386/Makefile.inc b/libexec/ld.elf_so/arch/i386/Makefile.inc index 36eeb6c7ee7..14cbaedf556 100644 --- a/libexec/ld.elf_so/arch/i386/Makefile.inc +++ b/libexec/ld.elf_so/arch/i386/Makefile.inc @@ -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+= -fpic CPPFLAGS+= -DELFSIZE=32 LDFLAGS+= -Wl,-e,.rtld_start - -.if defined(MLIBDIR) -.include "Makefile.ld32" -.endif diff --git a/libexec/ld.elf_so/arch/i386/Makefile.ld32 b/libexec/ld.elf_so/arch/i386/Makefile.ld32 deleted file mode 100644 index bde63a903bc..00000000000 --- a/libexec/ld.elf_so/arch/i386/Makefile.ld32 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.ld32,v 1.1 2009/01/06 02:15:06 mrg Exp $ - -CPPFLAGS+= -DRTLD_ARCH_SUBDIR=\"i386\" diff --git a/libexec/ld.elf_so/arch/sparc/Makefile.inc b/libexec/ld.elf_so/arch/sparc/Makefile.inc index a5041cb8fed..e13e6e0c64e 100644 --- a/libexec/ld.elf_so/arch/sparc/Makefile.inc +++ b/libexec/ld.elf_so/arch/sparc/Makefile.inc @@ -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+= -fpic CPPFLAGS+= -DELFSIZE=32 LDFLAGS+= -Wl,-e,_rtld_start - -.if defined(MLIBDIR) -.include "Makefile.ld32" -.endif diff --git a/libexec/ld.elf_so/arch/sparc/Makefile.ld32 b/libexec/ld.elf_so/arch/sparc/Makefile.ld32 deleted file mode 100644 index 6b42f42267d..00000000000 --- a/libexec/ld.elf_so/arch/sparc/Makefile.ld32 +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile.ld32,v 1.1 2009/01/06 02:15:06 mrg Exp $ - -CPPFLAGS+= -DRTLD_ARCH_SUBDIR=\"sparc\" |
