Do not create any files (dl-progname.h) in ldso anymore

4 files changed, 8 insertions, 16 deletions

diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index 98de4c9d5..aa126b9d1 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -10,7 +10,7 @@ CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS) -D_GNU_SOURCE
 # This stuff will not work with -fomit-frame-pointer
 CFLAGS-ldso += -fno-omit-frame-pointer
 
-CFLAGS-ldso += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_builddir)ldso/ldso
+CFLAGS-ldso += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_srcdir)ldso/ldso
 CFLAGS-ldso += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\"
 
 ifeq ($(SUPPORT_LD_DEBUG),y)
@@ -30,6 +30,8 @@ endif
 
 CFLAGS-ldso/ldso/$(TARGET_ARCH)/ := $(CFLAGS-ldso)
 
+CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\"
+
 ifneq ($(SUPPORT_LD_DEBUG),y)
 LDFLAGS-ld-uClibc.so := $(LDFLAGS)
 else
@@ -52,13 +54,9 @@ ld-uClibc_OBJS := $(ld-uClibc_COBJ) $(ld-uClibc_SOBJ)
 
 ld-uClibc-so-y := $(ld-uClibc_OBJS:.o=.os)
 
-HEADERS         := $(top_builddir)ldso/ldso/dl-progname.h
-
 #lib-so-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO))
 ld-uClibc-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO))
 objclean-y += ld-uClibc_clean
-headers-$(HAVE_SHARED) += ldso_headers
-headers_clean-y += ldso_headers_clean
 
 $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)): $(ld-uClibc_OUT)/ld-uClibc_so.a $(top_builddir)include/headers_done
 	$(call link.so,$(ldso_FULL_NAME),$(MAJOR_VERSION))
@@ -68,13 +66,5 @@ $(ld-uClibc_OUT)/ld-uClibc_so.a: $(ld-uClibc-so-y)
 	$(do_strip)
 	$(do_ar)
 
-ldso_headers: $(HEADERS)
-
-$(top_builddir)ldso/ldso/dl-progname.h:
-	echo '#include "$(TARGET_ARCH)/elfinterp.c"' > $@
-
-ldso_headers_clean:
-	$(RM) $(HEADERS)
-
 ld-uClibc_clean:
 	$(RM) $(ld-uClibc_OUT)/*.{o,os,a} $(ld-uClibc_OUT)/*/*.{o,os}
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index fac66ba9d..65295a2f1 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -39,7 +39,7 @@
 #define ALLOW_ZERO_PLTGOT
 
 /* Pull in the value of _dl_progname */
-#include "dl-progname.h"
+#include LDSO_ELFINTERP
 
 /* Global variables used within the shared library loader */
 char *_dl_library_path         = 0;	/* Where we look for libraries */
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"