[git commit ldso-future] ldso/libdl: include ldso.h only in ldso.c and libdl.c
Peter S. Mazinger
ps.m at gmx.net
Mon Apr 11 11:27:03 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=4e6699981c75b58297216cbfad65843f1f0daa3f
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/ldso-future
Replace ldso.h everywhere else with ldsodefs.h
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
ldso/include/ldso.h | 9 +--------
ldso/include/ldsodefs.h | 1 +
ldso/ldso/arm/elfinterp.c | 2 +-
ldso/ldso/cris/elfinterp.c | 2 +-
ldso/ldso/dl-debug.c | 3 ++-
ldso/ldso/dl-elf.c | 2 +-
ldso/ldso/dl-hash.c | 2 +-
ldso/ldso/dl-startup.c | 2 +-
ldso/ldso/dl-tls.c | 2 +-
ldso/ldso/elfinterp_common.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/x86_64/elfinterp.c | 2 +-
ldso/ldso/xtensa/elfinterp.c | 2 +-
ldso/libdl/libdl.c | 4 ++--
20 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
index 201db68..077ca2d 100644
--- a/ldso/include/ldso.h
+++ b/ldso/include/ldso.h
@@ -21,18 +21,16 @@
/* Pull in the arch specific page size */
#include <bits/uClibc_page.h>
-#include <ldsodefs.h>
-
#ifndef __ARCH_HAS_NO_SHARED__
#include <dlfcn.h>
+#include <ldsodefs.h>
#include <dl-string.h>
#include <dl-elf.h>
#include <dl-hash.h>
#include <dl-syscall.h>
#ifdef __UCLIBC_HAS_TLS__
# include <tls.h>
-# include <dl-tls.h>
#endif
/* common align masks, if not specified by dl-sysdep.h */
@@ -59,7 +57,6 @@ extern void ** __attribute__ ((const)) _dl_initial_error_catch_tsd (void);
#endif
#ifdef __SUPPORT_LD_DEBUG__
-extern char *_dl_debug;
# define __dl_debug_dprint(fmt, args...) \
_dl_dprintf(_dl_debug_file, "%s:%i: " fmt, __FUNCTION__, __LINE__, ## args);
# define _dl_if_debug_dprint(fmt, args...) \
@@ -98,10 +95,6 @@ extern char *_dl_debug;
# define _dl_debug_early(fmt, args...) do {} while (0)
#endif /* __SUPPORT_LD_DEBUG_EARLY__ */
-#ifndef NULL
-#define NULL ((void *) 0)
-#endif
-
#ifdef IS_IN_rtld
extern void *_dl_malloc(size_t size);
extern void *_dl_calloc(size_t __nmemb, size_t __size);
diff --git a/ldso/include/ldsodefs.h b/ldso/include/ldsodefs.h
index 6454dd4..e2b517c 100644
--- a/ldso/include/ldsodefs.h
+++ b/ldso/include/ldsodefs.h
@@ -186,6 +186,7 @@ extern void *__libc_stack_end attribute_relro;
#ifdef SHARED
extern unsigned long _dl_error_number;
+extern char *_dl_debug;
extern struct r_debug *_dl_debug_addr;
extern void *(*_dl_malloc_function)(size_t);
extern void (*_dl_free_function) (void *p);
diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index 630ecbe..9d04798 100644
--- a/ldso/ldso/arm/elfinterp.c
+++ b/ldso/ldso/arm/elfinterp.c
@@ -38,7 +38,7 @@
a more than adequate job of explaining everything required to get this
working. */
-#include <ldso.h>
+#include <ldsodefs.h>
#if 0
static unsigned long
diff --git a/ldso/ldso/cris/elfinterp.c b/ldso/ldso/cris/elfinterp.c
index a616273..3b87cb2 100644
--- a/ldso/ldso/cris/elfinterp.c
+++ b/ldso/ldso/cris/elfinterp.c
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
-#include <ldso.h>
+#include <ldsodefs.h>
static int
_dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
diff --git a/ldso/ldso/dl-debug.c b/ldso/ldso/dl-debug.c
index 19f3eef..95ab90e 100644
--- a/ldso/ldso/dl-debug.c
+++ b/ldso/ldso/dl-debug.c
@@ -37,10 +37,11 @@
* SUCH DAMAGE.
*/
-#include <ldso.h>
+#include <features.h>
#ifdef __SUPPORT_LD_DEBUG__
+#include <ldsodefs.h>
/* include the arch-specific _dl_reltypes_tab */
#include <dl-debug.h>
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 8c0a954..c48632d 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
-#include <ldso.h>
+#include <ldsodefs.h>
static struct elf_resolve * _dl_load_elf_shared_library(int secure,
struct dyn_elf **rpnt, char *libname);
diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c
index a86bd63..8a31eb8 100644
--- a/ldso/ldso/dl-hash.c
+++ b/ldso/ldso/dl-hash.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
-#include <ldso.h>
+#include <ldsodefs.h>
/* Various symbol table handling functions, including symbol lookup */
/*
diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c
index 17629b5..d012716 100644
--- a/ldso/ldso/dl-startup.c
+++ b/ldso/ldso/dl-startup.c
@@ -89,7 +89,7 @@
* the user's application.
*/
-#include <ldso.h>
+#include <ldsodefs.h>
/* Needed for standalone execution */
static __attribute_used__ unsigned long _dl_skip_args = 0;
diff --git a/ldso/ldso/dl-tls.c b/ldso/ldso/dl-tls.c
index b4a466d..2917702 100644
--- a/ldso/ldso/dl-tls.c
+++ b/ldso/ldso/dl-tls.c
@@ -28,7 +28,7 @@
#include <tls.h>
#include <dl-tls.h>
-#include <ldso.h>
+#include <ldsodefs.h>
void *(*_dl_calloc_function) (size_t __nmemb, size_t __size) = NULL;
void *(*_dl_realloc_function) (void *__ptr, size_t __size) = NULL;
diff --git a/ldso/ldso/elfinterp_common.c b/ldso/ldso/elfinterp_common.c
index a9f4092..5720a90 100644
--- a/ldso/ldso/elfinterp_common.c
+++ b/ldso/ldso/elfinterp_common.c
@@ -1,7 +1,7 @@
/* vi: set sw=4 ts=4: */
/* Licensed under the LGPL v2.1, see the file LICENSE in this tarball. */
-#include <ldso.h>
+#include <ldsodefs.h>
/*
* dynamic_info is of type ElfW(Word)
diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c
index b1667f1..1e73707 100644
--- a/ldso/ldso/i386/elfinterp.c
+++ b/ldso/ldso/i386/elfinterp.c
@@ -40,7 +40,7 @@
a more than adequate job of explaining everything required to get this
working. */
-#include <ldso.h>
+#include <ldsodefs.h>
static int
_dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 823e529..6a6e78a 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -30,6 +30,7 @@
* SUCH DAMAGE.
*/
+#include <ldsodefs.h>
#include <ldso.h>
#include <unsecvars.h>
diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c
index 3295fd0..42b04ff 100644
--- a/ldso/ldso/m68k/elfinterp.c
+++ b/ldso/ldso/m68k/elfinterp.c
@@ -40,7 +40,7 @@
a more than adequate job of explaining everything required to get this
working. */
-#include <ldso.h>
+#include <ldsodefs.h>
static int _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
ELF_RELOC *rpnt, const ElfW(Sym) *const symtab, const char *strtab)
diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c
index fd41c44..3459703 100644
--- a/ldso/ldso/mips/elfinterp.c
+++ b/ldso/ldso/mips/elfinterp.c
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
-#include <ldso.h>
+#include <ldsodefs.h>
#define OFFSET_GP_GOT 0x7ff0
diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c
index b96ce36..05258b3 100644
--- a/ldso/ldso/powerpc/elfinterp.c
+++ b/ldso/ldso/powerpc/elfinterp.c
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
-#include <ldso.h>
+#include <ldsodefs.h>
#define TLS_DTV_OFFSET 0x8000
#define TLS_TP_OFFSET 0x7000
diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c
index 0c57bde..d7ee12b 100644
--- a/ldso/ldso/sh/elfinterp.c
+++ b/ldso/ldso/sh/elfinterp.c
@@ -39,7 +39,7 @@
a more than adequate job of explaining everything required to get this
working. */
-#include <ldso.h>
+#include <ldsodefs.h>
static int
_dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
diff --git a/ldso/ldso/sh64/elfinterp.c b/ldso/ldso/sh64/elfinterp.c
index fe7b3c4..d3c475c 100644
--- a/ldso/ldso/sh64/elfinterp.c
+++ b/ldso/ldso/sh64/elfinterp.c
@@ -41,7 +41,7 @@
a more than adequate job of explaining everything required to get this
working. */
-#include <ldso.h>
+#include <ldsodefs.h>
static int _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
ELF_RELOC *rpnt, const ElfW(Sym) *const symtab, const char *strtab)
diff --git a/ldso/ldso/x86_64/elfinterp.c b/ldso/ldso/x86_64/elfinterp.c
index 13357bb..c95c6f6 100644
--- a/ldso/ldso/x86_64/elfinterp.c
+++ b/ldso/ldso/x86_64/elfinterp.c
@@ -40,7 +40,7 @@
a more than adequate job of explaining everything required to get this
working. */
-#include <ldso.h>
+#include <ldsodefs.h>
static int
_dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
diff --git a/ldso/ldso/xtensa/elfinterp.c b/ldso/ldso/xtensa/elfinterp.c
index 27b259c..d3183ee 100644
--- a/ldso/ldso/xtensa/elfinterp.c
+++ b/ldso/ldso/xtensa/elfinterp.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
-#include <ldso.h>
+#include <ldsodefs.h>
static int
_dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index 6a58ce8..d7a969a 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -29,11 +29,11 @@
* SUCH DAMAGE.
*/
-
-#include <ldso.h>
#include <stdio.h>
#include <string.h>
#include <stdbool.h>
+#include <ldsodefs.h>
+#include <ldso.h>
#ifndef SHARED
#include <unistd.h>
--
1.7.3.4
More information about the uClibc-cvs
mailing list