From 42c1ad48fa946f00d67d0b023f50e5d6d8fc293f Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Fri, 10 Mar 2006 16:20:23 +0000
Subject: Remove all non-constant libc_hidden_data_def(), it is too unreliable,
 sorry, most of global data relocations are back

---
 libc/stdlib/_atexit.c                  | 2 --
 libc/stdlib/_strtod.c                  | 3 ---
 libc/stdlib/getenv.c                   | 1 -
 libc/stdlib/malloc-standard/mallinfo.c | 1 -
 libc/stdlib/malloc-standard/malloc.c   | 1 -
 libc/stdlib/malloc-standard/malloc.h   | 1 -
 libc/stdlib/malloc/malloc.h            | 1 -
 libc/stdlib/setenv.c                   | 1 -
 libc/stdlib/stdlib.c                   | 3 ---
 9 files changed, 14 deletions(-)

(limited to 'libc/stdlib')

diff --git a/libc/stdlib/_atexit.c b/libc/stdlib/_atexit.c
index bf35ab2d6..236156001 100644
--- a/libc/stdlib/_atexit.c
+++ b/libc/stdlib/_atexit.c
@@ -49,7 +49,6 @@ libc_hidden_proto(_exit)
 #ifdef __UCLIBC_HAS_THREADS__
 # include <pthread.h>
 extern pthread_mutex_t mylock;
-libc_hidden_proto(mylock)
 #endif
 #define LOCK	__pthread_mutex_lock(&mylock)
 #define UNLOCK	__pthread_mutex_unlock(&mylock)
@@ -315,7 +314,6 @@ extern void weak_function _stdio_term(void) attribute_hidden;
 attribute_hidden void (*__exit_cleanup) (int) = 0;
 #ifdef __UCLIBC_HAS_THREADS__
 pthread_mutex_t mylock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-libc_hidden_data_def(mylock)
 #endif
 
 extern void __uClibc_fini(void);
diff --git a/libc/stdlib/_strtod.c b/libc/stdlib/_strtod.c
index c4447d9ea..f2cd5e86b 100644
--- a/libc/stdlib/_strtod.c
+++ b/libc/stdlib/_strtod.c
@@ -178,9 +178,6 @@ extern void __fp_range_check(__fpmax_t y, __fpmax_t x) attribute_hidden;
 #ifdef __UCLIBC_HAS_XLOCALE__
 libc_hidden_proto(__ctype_b_loc)
 #else
-#ifdef __UCLIBC_HAS_LOCALE__
-libc_hidden_proto(__global_locale)
-#endif
 libc_hidden_proto(__ctype_b)
 libc_hidden_proto(__ctype_tolower)
 #endif
diff --git a/libc/stdlib/getenv.c b/libc/stdlib/getenv.c
index 4f4c4f1f8..c7940f398 100644
--- a/libc/stdlib/getenv.c
+++ b/libc/stdlib/getenv.c
@@ -11,7 +11,6 @@
 libc_hidden_proto(getenv)
 libc_hidden_proto(memcmp)
 libc_hidden_proto(strlen)
-libc_hidden_proto(__environ)
 
 /* IEEE Std 1003.1-2001 says getenv need not be thread safe, so 
  * don't bother locking access to __environ */
diff --git a/libc/stdlib/malloc-standard/mallinfo.c b/libc/stdlib/malloc-standard/mallinfo.c
index 89c9a6e7e..4f274ed32 100644
--- a/libc/stdlib/malloc-standard/mallinfo.c
+++ b/libc/stdlib/malloc-standard/mallinfo.c
@@ -17,7 +17,6 @@
 #include "malloc.h"
 
 libc_hidden_proto(fprintf)
-libc_hidden_proto(stderr)
 
 /* ------------------------------ mallinfo ------------------------------ */
 libc_hidden_proto(mallinfo)
diff --git a/libc/stdlib/malloc-standard/malloc.c b/libc/stdlib/malloc-standard/malloc.c
index 10d421330..b4b1216ed 100644
--- a/libc/stdlib/malloc-standard/malloc.c
+++ b/libc/stdlib/malloc-standard/malloc.c
@@ -19,7 +19,6 @@
 
 #ifdef __UCLIBC_HAS_THREADS__
 pthread_mutex_t __malloc_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-libc_hidden_data_def(__malloc_lock)
 #endif
 
 /*
diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h
index a3fabb0c4..453d69736 100644
--- a/libc/stdlib/malloc-standard/malloc.h
+++ b/libc/stdlib/malloc-standard/malloc.h
@@ -31,7 +31,6 @@ libc_hidden_proto(abort)
 #ifdef __UCLIBC_HAS_THREADS__
 # include <pthread.h>
 extern pthread_mutex_t __malloc_lock;
-libc_hidden_proto(__malloc_lock)
 #endif
 #define LOCK	__pthread_mutex_lock(&__malloc_lock)
 #define UNLOCK	__pthread_mutex_unlock(&__malloc_lock)
diff --git a/libc/stdlib/malloc/malloc.h b/libc/stdlib/malloc/malloc.h
index 753205443..e722bc86a 100644
--- a/libc/stdlib/malloc/malloc.h
+++ b/libc/stdlib/malloc/malloc.h
@@ -16,7 +16,6 @@
 
 /* The system pagesize... */
 extern size_t __pagesize;
-libc_hidden_proto(__pagesize)
 #define MALLOC_PAGE_SIZE	__pagesize
 
 /* The minimum size of block we request from the the system to extend the
diff --git a/libc/stdlib/setenv.c b/libc/stdlib/setenv.c
index e7dc26053..fa61675fb 100644
--- a/libc/stdlib/setenv.c
+++ b/libc/stdlib/setenv.c
@@ -31,7 +31,6 @@ libc_hidden_proto(strlen)
 libc_hidden_proto(strncmp)
 libc_hidden_proto(strndup)
 libc_hidden_proto(unsetenv)
-libc_hidden_proto(__environ)
 
 #ifdef __UCLIBC_HAS_THREADS__
 # include <pthread.h>
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c
index f9ec75555..61a6da01c 100644
--- a/libc/stdlib/stdlib.c
+++ b/libc/stdlib/stdlib.c
@@ -102,9 +102,6 @@
 #ifdef __UCLIBC_HAS_XLOCALE__
 #include <xlocale.h>
 #endif /* __UCLIBC_HAS_XLOCALE__ */
-#ifdef __UCLIBC_HAS_LOCALE__
-libc_hidden_proto(__global_locale)
-#endif
 
 /* TODO: clean up the following... */
 
-- 
cgit v1.2.3