[git commit ldso-future] ldso/libdl: include elfinterp_common.c in ldso.c and libdl.c

Peter S. Mazinger ps.m at gmx.net
Wed Mar 30 11:53:36 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=3a99477f0c8ed45bf25949795e6bc3fe7f722880
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/ldso-future

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 ldso/ldso/arm/elfinterp.c     |    2 --
 ldso/ldso/avr32/elfinterp.c   |    2 --
 ldso/ldso/bfin/elfinterp.c    |    2 --
 ldso/ldso/cris/elfinterp.c    |    2 --
 ldso/ldso/frv/elfinterp.c     |    2 --
 ldso/ldso/i386/elfinterp.c    |    2 --
 ldso/ldso/ldso.c              |    1 +
 ldso/ldso/m68k/elfinterp.c    |    2 --
 ldso/ldso/mips/elfinterp.c    |    2 --
 ldso/ldso/powerpc/elfinterp.c |    2 --
 ldso/ldso/sh/elfinterp.c      |    2 --
 ldso/ldso/sh64/elfinterp.c    |    2 --
 ldso/ldso/sparc/elfinterp.c   |    2 --
 ldso/ldso/x86_64/elfinterp.c  |    2 --
 ldso/ldso/xtensa/elfinterp.c  |    2 --
 ldso/libdl/libdl.c            |    1 +
 16 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index dcb3700..630ecbe 100644
--- a/ldso/ldso/arm/elfinterp.c
+++ b/ldso/ldso/arm/elfinterp.c
@@ -208,5 +208,3 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/avr32/elfinterp.c b/ldso/ldso/avr32/elfinterp.c
index 9265c8d..9fc1ce0 100644
--- a/ldso/ldso/avr32/elfinterp.c
+++ b/ldso/ldso/avr32/elfinterp.c
@@ -144,5 +144,3 @@ static int _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/bfin/elfinterp.c b/ldso/ldso/bfin/elfinterp.c
index bf1b8b3..9772d9a 100644
--- a/ldso/ldso/bfin/elfinterp.c
+++ b/ldso/ldso/bfin/elfinterp.c
@@ -161,8 +161,6 @@ _dl_do_reloc(struct elf_resolve *tpnt,struct dyn_elf *scope,
 	return 0;
 }
 
-#include "elfinterp_common.c"
-
 #ifdef IS_IN_rtld
 # include "../../libc/sysdeps/linux/bfin/crtreloc.c"
 #endif
diff --git a/ldso/ldso/cris/elfinterp.c b/ldso/ldso/cris/elfinterp.c
index ca79f79..a616273 100644
--- a/ldso/ldso/cris/elfinterp.c
+++ b/ldso/ldso/cris/elfinterp.c
@@ -133,5 +133,3 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/frv/elfinterp.c b/ldso/ldso/frv/elfinterp.c
index 700238a..36efaac 100644
--- a/ldso/ldso/frv/elfinterp.c
+++ b/ldso/ldso/frv/elfinterp.c
@@ -148,8 +148,6 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
 	return 0;
 }
 
-#include "elfinterp_common.c"
-
 #ifdef IS_IN_rtld
 # include "../../libc/sysdeps/linux/frv/crtreloc.c"
 #endif
diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c
index bd52d08..b1667f1 100644
--- a/ldso/ldso/i386/elfinterp.c
+++ b/ldso/ldso/i386/elfinterp.c
@@ -161,5 +161,3 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index f67c042..5c9d0f5 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -45,6 +45,7 @@
 
 /* Pull in the value of _dl_progname */
 #include LDSO_ELFINTERP
+#include "elfinterp_common.c"
 
 /* Global variables used within the shared library loader */
 char *_dl_library_path         = NULL;	/* Where we look for libraries */
diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c
index d98be7d..3295fd0 100644
--- a/ldso/ldso/m68k/elfinterp.c
+++ b/ldso/ldso/m68k/elfinterp.c
@@ -157,5 +157,3 @@ static int _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c
index e255d51..10e752d 100644
--- a/ldso/ldso/mips/elfinterp.c
+++ b/ldso/ldso/mips/elfinterp.c
@@ -321,5 +321,3 @@ void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy)
 		}
 	}
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c
index 45c0fbb..21b5869 100644
--- a/ldso/ldso/powerpc/elfinterp.c
+++ b/ldso/ldso/powerpc/elfinterp.c
@@ -410,5 +410,3 @@ void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
 	PPC_ICBI (plt + rel_offset_words - 1);
 	PPC_ISYNC;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c
index ba5e63e..0c57bde 100644
--- a/ldso/ldso/sh/elfinterp.c
+++ b/ldso/ldso/sh/elfinterp.c
@@ -154,5 +154,3 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/sh64/elfinterp.c b/ldso/ldso/sh64/elfinterp.c
index 762df35..fe7b3c4 100644
--- a/ldso/ldso/sh64/elfinterp.c
+++ b/ldso/ldso/sh64/elfinterp.c
@@ -225,5 +225,3 @@ static int _dl_do_lazy_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope att
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/sparc/elfinterp.c b/ldso/ldso/sparc/elfinterp.c
index ef0ee26..2c7eb87 100644
--- a/ldso/ldso/sparc/elfinterp.c
+++ b/ldso/ldso/sparc/elfinterp.c
@@ -185,5 +185,3 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/x86_64/elfinterp.c b/ldso/ldso/x86_64/elfinterp.c
index ca0af92..13357bb 100644
--- a/ldso/ldso/x86_64/elfinterp.c
+++ b/ldso/ldso/x86_64/elfinterp.c
@@ -164,5 +164,3 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/ldso/xtensa/elfinterp.c b/ldso/ldso/xtensa/elfinterp.c
index c9cc71d..27b259c 100644
--- a/ldso/ldso/xtensa/elfinterp.c
+++ b/ldso/ldso/xtensa/elfinterp.c
@@ -124,5 +124,3 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 
 	return 0;
 }
-
-#include "elfinterp_common.c"
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index e3a1a86..325119b 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -110,6 +110,7 @@ struct r_debug *_dl_debug_addr = NULL;
 size_t _dl_tls_static_size = 2048;
 # endif
 #include LDSO_ELFINTERP
+#include "../ldso/elfinterp_common.c"
 #include "../ldso/dl-hash.c"
 #define _dl_trace_loaded_objects    0
 #include "../ldso/dl-elf.c"
-- 
1.7.3.4



More information about the uClibc-cvs mailing list