svn commit: trunk/uClibc/libc/misc/internals
psm at uclibc.org
psm at uclibc.org
Sat Oct 29 10:18:44 UTC 2005
Author: psm
Date: 2005-10-29 03:18:42 -0700 (Sat, 29 Oct 2005)
New Revision: 11984
Log:
Hopefully correct undefined __libc_stack_end issue
Removed:
trunk/uClibc/libc/misc/internals/static.c
Modified:
trunk/uClibc/libc/misc/internals/Makefile.in
trunk/uClibc/libc/misc/internals/__uClibc_main.c
Changeset:
Modified: trunk/uClibc/libc/misc/internals/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/internals/Makefile.in 2005-10-29 10:16:07 UTC (rev 11983)
+++ trunk/uClibc/libc/misc/internals/Makefile.in 2005-10-29 10:18:42 UTC (rev 11984)
@@ -16,7 +16,7 @@
MISC_INTERNALS_SRC:=$(patsubst %.c,$(MISC_INTERNALS_DIR)/%.c,$(CSRC))
MISC_INTERNALS_OBJ:=$(patsubst %.c,$(MISC_INTERNALS_OUT)/%.o,$(CSRC))
-STATIC_SRC:=__uClibc_main.c static.c
+STATIC_SRC:=__uClibc_main.c
$(MISC_INTERNALS_OUT)/interp.c: $(MISC_INTERNALS_DIR)/Makefile.in
echo "/* Force shared libraries to know about the correct library loader */" > $@
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c 2005-10-29 10:16:07 UTC (rev 11983)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c 2005-10-29 10:18:42 UTC (rev 11984)
@@ -25,8 +25,12 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
+
#ifndef SHARED
+void *__libc_stack_end=NULL;
+
/* probably all the weak_*function stuff below should be in here */
+
#ifdef __UCLIBC_HAS_SSP__
#include <dl-osinfo.h>
#ifndef THREAD_SET_STACK_GUARD
@@ -39,12 +43,12 @@
strong_alias(__stack_chk_guard,__guard)
#endif
#endif
-#endif
+#endif /* !SHARED */
+
/*
* Prototypes.
*/
-extern void *__libc_stack_end;
extern void weak_function _stdio_init(void);
extern int *weak_const_function __errno_location(void);
extern int *weak_const_function __h_errno_location(void);
@@ -191,7 +195,10 @@
unsigned long *aux_dat;
ElfW(auxv_t) auxvt[AT_EGID + 1];
#endif
+
+#ifndef SHARED
__libc_stack_end = stack_end;
+#endif
__rtld_fini = rtld_fini;
Deleted: trunk/uClibc/libc/misc/internals/static.c
===================================================================
--- trunk/uClibc/libc/misc/internals/static.c 2005-10-29 10:16:07 UTC (rev 11983)
+++ trunk/uClibc/libc/misc/internals/static.c 2005-10-29 10:18:42 UTC (rev 11984)
@@ -1,4 +0,0 @@
-#include <stddef.h>
-
-/* Force static libraries to know about ... */
-void *__libc_stack_end=NULL;
More information about the uClibc-cvs
mailing list