aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2007-02-28 21:23:09 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2007-02-28 21:23:09 +0000
commit7415a33fd1c8325bb4350c83ccddde72cae5d65d (patch)
tree3ef4804850312668cdc9761bbf6d7a66e945ab5c
parentd252f9b126c321e21424fbd584347c06137c3fa3 (diff)
downloaduClibc-7415a33fd1c8325bb4350c83ccddde72cae5d65d.tar.gz
uClibc-7415a33fd1c8325bb4350c83ccddde72cae5d65d.tar.bz2
export libc_stack_end in dynamically linked binaries as well,
fixes uclibc++ compile on powerpc
-rw-r--r--libc/Makefile1
-rw-r--r--libc/misc/internals/Makefile4
-rw-r--r--libc/misc/internals/__uClibc_main.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/libc/Makefile b/libc/Makefile
index 31e4bab17..d845658eb 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -70,7 +70,6 @@ $(LIBNAME) shared_$(LIBNAME) ar-target: subdirs
$(AR) $(ARFLAGS) $(LIBNAME) $$objs || exit 1 ; \
done
cp $(LIBNAME) shared_$(LIBNAME)
- $(AR) $(ARFLAGS) $(LIBNAME) misc/internals/static.o
$(RANLIB) $(LIBNAME)
$(LIBNAME_TARGET): $(LIBNAME)
diff --git a/libc/misc/internals/Makefile b/libc/misc/internals/Makefile
index 803181a8f..dea94f96d 100644
--- a/libc/misc/internals/Makefile
+++ b/libc/misc/internals/Makefile
@@ -31,7 +31,7 @@ OBJS=$(COBJS)
OBJ_LIST=../../obj.misc.internals
-all: $(OBJ_LIST) interp.o static.o
+all: $(OBJ_LIST) interp.o
$(OBJ_LIST): $(OBJS)
echo $(patsubst %, misc/internals/%, $(OBJS)) > $(OBJ_LIST)
@@ -44,7 +44,7 @@ interp.c: Makefile
"(\".interp\"))) =\""$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)"\";" >> interp.c
echo "#endif" >> interp.c
-$(COBJS) interp.o static.o: %.o : %.c
+$(COBJS) interp.o: %.o : %.c
$(CC) $(CFLAGS) -c $< -o $@
$(STRIPTOOL) -x -R .note -R .comment $*.o
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index afea3c6e6..71591a7ca 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -32,7 +32,7 @@ extern void __guard_setup(void);
/*
* Prototypes.
*/
-extern void *__libc_stack_end;
+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);