From 8d3f61bd00ce138ddbeb27be7f4037ffd5366e83 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Mon, 21 Nov 2005 15:26:56 +0000 Subject: Do not create any files (dl-progname.h) in ldso anymore --- ldso/libdl/Makefile.in | 4 +++- ldso/libdl/libdl.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'ldso/libdl') diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in index 836e68607..56ddb0e1a 100644 --- a/ldso/libdl/Makefile.in +++ b/ldso/libdl/Makefile.in @@ -8,7 +8,7 @@ CFLAGS-libdl := -DNOT_IN_libc -DIS_IN_libdl $(SSP_ALL_CFLAGS) -CFLAGS-libdl += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_builddir)ldso/ldso +CFLAGS-libdl += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_srcdir)ldso/ldso CFLAGS-libdl += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" @@ -16,6 +16,8 @@ ifeq ($(SUPPORT_LD_DEBUG),y) CFLAGS-libdl += -D__SUPPORT_LD_DEBUG__ endif +CFLAGS-libdl.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\" + LDFLAGS-libdl.so := $(LDFLAGS) -fini dl_cleanup LIBS-libdl.so := $(LIBS) $(top_builddir)lib/$(UCLIBC_LDSO) diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 5efe36155..2a5674a6c 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -81,7 +81,7 @@ size_t _dl_pagesize = PAGE_SIZE; /* Store the page size for use later struct r_debug *_dl_debug_addr = NULL; #define _dl_malloc malloc #include "../ldso/dl-debug.c" -#include "dl-progname.h" +#include LDSO_ELFINTERP #include "../ldso/dl-hash.c" #define _dl_trace_loaded_objects 0 #include "../ldso/dl-elf.c" -- cgit v1.2.3