summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2005-04-27 21:35:24 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2005-04-27 21:35:24 +0000
commit40648f65b2238d640ba81da83e9b3b385be69b1d (patch)
treec986fafd52ea4cf2b8f47ab39315f5ef7ed701a3
parentf93b91420d04e610d87adb6aa2db2b256fedf0c7 (diff)
Get rid of extern references to ldso variables.
-rw-r--r--ldso/include/ldso.h2
-rw-r--r--ldso/ldso/ldso.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
index 2b803f2fe..ba28baa3e 100644
--- 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 58498ed01..54da613aa 100644
--- 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 */