Get rid of extern references to ldso variables.

diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
index 2b803f2..ba28baa 100644 (file)
--- a/ldso/include/ldso.h
+++ b/ldso/include/ldso.h
@@ -42,8 +42,6 @@ extern char *_dl_library_path;         /* Where we look for libraries */
 extern char *_dl_preload;              /* Things to be loaded before the libs */
 extern char *_dl_ldsopath;             /* Where the shared lib loader was found */
 extern const char *_dl_progname;       /* The name of the executable being run */
-extern unsigned char *_dl_malloc_addr; /* Lets _dl_malloc use the already allocated memory page */
-extern unsigned char *_dl_mmap_zero;   /* Also used by _dl_malloc */
 extern int _dl_secure;                 /* Are we dealing with setuid stuff? */
 extern size_t _dl_pagesize;            /* Store the page size for use later */
 extern const char *_dl_progname;       /* The name of the shared library loader */

diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 58498ed..54da613 100644 (file)
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -75,8 +75,8 @@ void _dl_debug_state(void)
 {
 }
 
-unsigned char *_dl_malloc_addr = 0;    /* Lets _dl_malloc use the already allocated memory page */
-unsigned char *_dl_mmap_zero   = 0;    /* Also used by _dl_malloc */
+static unsigned char *_dl_malloc_addr = 0;     /* Lets _dl_malloc use the already allocated memory page */
+static unsigned char *_dl_mmap_zero   = 0;     /* Also used by _dl_malloc */
 
 static struct elf_resolve **init_fini_list;
 static int nlist; /* # items in init_fini_list */