fix Conceptronic profile
[openwrt/openwrt.git] / toolchain / uClibc / patches / 160-move_stack_end.patch
1 diff -urN uClibc.old/libc/Makefile uClibc.dev/libc/Makefile
2 --- uClibc.old/libc/Makefile 2005-08-18 00:49:48.000000000 +0200
3 +++ uClibc.dev/libc/Makefile 2007-01-22 01:21:40.000000000 +0100
4 @@ -70,7 +70,6 @@
5 $(AR) $(ARFLAGS) $(LIBNAME) $$objs || exit 1 ; \
6 done
7 cp $(LIBNAME) shared_$(LIBNAME)
8 - $(AR) $(ARFLAGS) $(LIBNAME) misc/internals/static.o
9 $(RANLIB) $(LIBNAME)
10
11 $(LIBNAME_TARGET): $(LIBNAME)
12 diff -urN uClibc.old/libc/misc/internals/Makefile uClibc.dev/libc/misc/internals/Makefile
13 --- uClibc.old/libc/misc/internals/Makefile 2005-08-18 00:49:48.000000000 +0200
14 +++ uClibc.dev/libc/misc/internals/Makefile 2007-01-22 01:11:46.000000000 +0100
15 @@ -31,7 +31,7 @@
16
17 OBJ_LIST=../../obj.misc.internals
18
19 -all: $(OBJ_LIST) interp.o static.o
20 +all: $(OBJ_LIST) interp.o
21
22 $(OBJ_LIST): $(OBJS)
23 echo $(patsubst %, misc/internals/%, $(OBJS)) > $(OBJ_LIST)
24 @@ -44,7 +44,7 @@
25 "(\".interp\"))) =\""$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)"\";" >> interp.c
26 echo "#endif" >> interp.c
27
28 -$(COBJS) interp.o static.o: %.o : %.c
29 +$(COBJS) interp.o: %.o : %.c
30 $(CC) $(CFLAGS) -c $< -o $@
31 $(STRIPTOOL) -x -R .note -R .comment $*.o
32
33 diff -urN uClibc.old/libc/misc/internals/static.c uClibc.dev/libc/misc/internals/static.c
34 --- uClibc.old/libc/misc/internals/static.c 2005-08-18 00:49:48.000000000 +0200
35 +++ uClibc.dev/libc/misc/internals/static.c 1970-01-01 01:00:00.000000000 +0100
36 @@ -1,4 +0,0 @@
37 -#include <stddef.h>
38 -
39 -/* Force static libraries to know about ... */
40 -void *__libc_stack_end=NULL;
41 diff -urN uClibc.old/libc/misc/internals/__uClibc_main.c uClibc.dev/libc/misc/internals/__uClibc_main.c
42 --- uClibc.old/libc/misc/internals/__uClibc_main.c 2005-08-18 00:49:48.000000000 +0200
43 +++ uClibc.dev/libc/misc/internals/__uClibc_main.c 2007-01-22 01:20:23.000000000 +0100
44 @@ -32,7 +32,7 @@
45 /*
46 * Prototypes.
47 */
48 -extern void *__libc_stack_end;
49 +void *__libc_stack_end;
50 extern void weak_function _stdio_init(void);
51 extern int *weak_const_function __errno_location(void);
52 extern int *weak_const_function __h_errno_location(void);