---- uClibc-0.9.21/libc/sysdeps/linux/common/syscalls.c.orig 2003-09-09 09:42:40.000000000 +0000
-+++ uClibc-0.9.21/libc/sysdeps/linux/common/syscalls.c 2003-11-23 15:19:07.000000000 +0000
-@@ -2075,6 +2075,7 @@
- // See getdents64.c
-
- //#define __NR_fcntl64 221
-+#ifndef __alpha__
- #ifdef L___syscall_fcntl64
- #include <stdarg.h>
- #include <fcntl.h>
-@@ -2097,6 +2098,7 @@
- }
- weak_alias(__libc_fcntl64, fcntl64)
- #endif
-+#endif
-
- //#define __NR_security 223 /* syscall for security modules */
- //#define __NR_gettid 224
--- uClibc-0.9.21/libc/sysdeps/linux/alpha/bits/mman.h.orig 1970-01-01 00:00:00.000000000 +0000
+++ uClibc-0.9.21/libc/sysdeps/linux/alpha/bits/mman.h 2003-11-10 22:42:47.000000000 +0000
@@ -0,0 +1,108 @@
---- uClibc-0.9.20/libc/sysdeps/linux/common/Makefile.orig Wed Mar 5 11:28:53 2003
-+++ uClibc-0.9.20/libc/sysdeps/linux/common/Makefile Thu Jul 24 17:07:17 2003
-@@ -39,6 +39,7 @@
-
- CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o
- SAFECFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) -fno-builtin
-+SAFEASMFLAGS=$(XWARNINGS) $(XARCH_CFLAGS) $(CPU_CFLAGS) -fno-builtin
- #
- # on SH4 addition of -g kills the initfini stuff, removed here for all
- # platforms as I suspect no one want initfini compiled -g :-) - davidm
-@@ -76,14 +77,14 @@
- $(AWK) -f $(TOPDIR)extra/scripts/initfini.awk initfini.S
+--- uClibc-0.9.26/libc/sysdeps/linux/i386/Makefile.orig 2004-01-03 00:34:13.000000000 +0100
++++ uClibc-0.9.26/libc/sysdeps/linux/i386/Makefile 2004-01-31 17:40:43.180052512 +0100
+@@ -18,7 +18,8 @@
+ TOPDIR=../../../../
+ include $(TOPDIR)Rules.mak
+-ASFLAGS=$(CFLAGS)
++# no OPTIMIZATION here - -march=i686 breaks __i686.get_pc_thunk.bx
++ASFLAGS=$(XWARNINGS) $(XARGS_CFLAGS) $(CPU_CFLAGS) -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
+
+ CRT0_SRC = crt0.S
+ CRT0_OBJ = crt0.o crt1.o gcrt1.o
+@@ -56,11 +57,11 @@
+ endif
+
+ $(CRT0_OBJ): $(CRT0_SRC)
+- $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
++ $(CC) $(ASFLAGS) -DL_$* $< -c -o $*.o
+ $(STRIPTOOL) -x -R .note -R .comment $*.o
+
+ $(SOBJS): %.o : %.S
+- $(CC) $(CFLAGS) -c $< -o $@
++ $(CC) $(ASFLAGS) -c $< -o $@
+ $(STRIPTOOL) -x -R .note -R .comment $*.o
+
+ $(COBJS): %.o : %.c
+@@ -75,14 +76,14 @@
+
+ ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
crti.o: crti.S
-- $(CC) $(SAFECFLAGS) -c crti.S -o crti.o
-+ $(CC) $(SAFEASMFLAGS) -c crti.S -o crti.o
+- $(CC) $(CFLAGS) -c crti.S -o crti.o
++ $(CC) $(ASFLAGS) -c crti.S -o crti.o
$(TOPDIR)lib/crti.o: crti.o
- mkdir -p $(TOPDIR)lib/
+ $(INSTALL) -d $(TOPDIR)lib/
cp crti.o $(TOPDIR)lib/
crtn.o: crtn.S
-- $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o
-+ $(CC) $(SAFEASMFLAGS) -c crtn.S -o crtn.o
+- $(CC) $(CFLAGS) -c crtn.S -o crtn.o
++ $(CC) $(ASFLAGS) -c crtn.S -o crtn.o
$(TOPDIR)lib/crtn.o: crtn.o
- mkdir -p $(TOPDIR)lib/
---- uClibc-0.9.20/libc/sysdeps/linux/i386/Makefile.orig Fri Jun 27 10:23:23 2003
-+++ uClibc-0.9.20/libc/sysdeps/linux/i386/Makefile Thu Jul 24 17:15:50 2003
-@@ -46,7 +46,7 @@
- cp $(CRT0_OBJ) $(TOPDIR)lib/
-
- $(CRT0_OBJ): $(CRT0_SRC)
-- $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-+ $(CC) -DL_$* $< -c -o $*.o
- $(STRIPTOOL) -x -R .note -R .comment $*.o
-
- $(SOBJS): %.o : %.S
+ $(INSTALL) -d $(TOPDIR)lib/
-diff -urN uClibc-0.9.20.org/libpthread/Makefile uClibc-0.9.20/libpthread/Makefile
---- uClibc-0.9.20.org/libpthread/Makefile 2003-08-06 20:43:16.000000000 +0200
-+++ uClibc-0.9.20/libpthread/Makefile 2003-08-06 20:50:55.000000000 +0200
+diff -urN uClibc-0.9.26.org/libpthread/Makefile uClibc-0.9.26/libpthread/Makefile
+--- uClibc-0.9.26.org/libpthread/Makefile 2004-01-25 15:20:49.547594064 +0100
++++ uClibc-0.9.26/libpthread/Makefile 2004-01-25 15:33:34.026392026 +0100
@@ -21,7 +21,8 @@
#Adjust the soname version to avoid namespace collisions with glibc's libpthread
LIBPTHREAD=libpthread.a
-LIBPTHREAD_SHARED=libpthread.so
-+LIBPTHREAD_SHARED_ORG=libpthread.so
+LIBPTHREAD_SHARED=libpthread-uclibc.so
++LIBPTHREAD_SHARED_ORG=libpthread.so
LIBPTHREAD_SHARED_FULLNAME=libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
LIBTHREAD_DB=libthread_db.a
@@ -90,6 +91,8 @@
- $(LIBPTHREAD_SHARED)); \
- (cd $(TOPDIR)lib && ln -sf $(LIBPTHREAD_SHARED_FULLNAME) \
- $(LIBPTHREAD_SHARED).$(MAJOR_VERSION)); \
-+ (cd $(TOPDIR)lib && ln -sf $(LIBPTHREAD_SHARED_FULLNAME) \
-+ $(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION)); \
+ $(TOPDIR)lib/$(LIBPTHREAD_SHARED); \
+ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
+ $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \
++ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
++ $(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION); \
fi;
if [ -f $(LIBTHREAD_DB) ] ; then \
set -e; \
-@@ -105,6 +108,8 @@
- $(LIBTHREAD_DB_SHARED)); \
- (cd $(TOPDIR)lib && ln -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
- $(LIBTHREAD_DB_SHARED).1); \
-+ (cd $(TOPDIR)lib && ln -sf $(LIBPTHREAD_SHARED_FULLNAME) \
-+ $(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION)); \
- fi;
-
- tags:
---- uClibc-0.9.19/Makefile.orig Mon Mar 3 07:47:56 2003
-+++ uClibc-0.9.19/Makefile Wed Apr 2 23:44:51 2003
-@@ -257,21 +257,21 @@
- ifeq ($(strip $(HAVE_SHARED)),y)
- install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin;
- install -m 755 ldso/util/ldd \
-- $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd
-- ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd \
-+ $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldd
-+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldd \
- $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldd
- # For now, don't bother with readelf since surely the host
- # system has binutils, or we couldn't have gotten this far...
- #install -m 755 ldso/util/readelf \
-- # $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf
-- #ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf \
-+ # $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-readelf
-+ #ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-readelf \
- # $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/readelf
- @if [ -x ldso/util/ldconfig ] ; then \
- set -x -e; \
- install -d $(PREFIX)$(DEVEL_PREFIX)/etc; \
- install -m 755 ldso/util/ldconfig \
-- $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig; \
-- ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig \
-+ $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldconfig; \
-+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldconfig \
- $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldconfig; \
- fi;
- endif
---- uClibc-0.9.19/extra/Configs/Config.in.orig Wed Feb 5 08:45:34 2003
-+++ uClibc-0.9.19/extra/Configs/Config.in Wed Apr 2 23:46:51 2003
-@@ -299,7 +299,7 @@
+--- uClibc-0.9.26/extra/Configs/Config.in.orig 2004-01-03 00:34:12.000000000 +0100
++++ uClibc-0.9.26/extra/Configs/Config.in 2004-01-31 17:48:09.355223576 +0100
+@@ -1018,7 +1018,7 @@
+
+ config RUNTIME_PREFIX
+ string "uClibc runtime library directory"
+- default "/usr/$(TARGET_ARCH)-linux-uclibc/"
++ default "/usr/$(TARGET_CPU)-linux-uclibc/"
+ help
+ RUNTIME_PREFIX is the directory into which the uClibc runtime
+ libraries will be installed. The result will look something
+@@ -1036,7 +1036,7 @@
config DEVEL_PREFIX
string "uClibc development environment directory"
-- default "/usr/$(TARGET_ARCH)-linux-uclibc"
-+ default "/usr/$(TARGET_CPU)-linux-uclibc"
+- default "/usr/$(TARGET_ARCH)-linux-uclibc/usr/"
++ default "/usr/$(TARGET_CPU)-linux-uclibc/usr/"
help
DEVEL_PREFIX is the directory into which the uClibc development
environment will be installed. The result will look something
---- uClibc-0.9.19/extra/Configs/Config.i386.default.orig Thu Jan 16 08:15:18 2003
-+++ uClibc-0.9.19/extra/Configs/Config.i386.default Wed Apr 2 23:47:11 2003
-@@ -60,7 +60,7 @@
- # Library Installation Options
- #
- SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib"
--DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"
-+DEVEL_PREFIX="/usr/$(TARGET_CPU)-linux-uclibc"
- SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)"
- DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr"
-
---- uClibc-0.9.19/ldso/util/Makefile.orig Sat Mar 1 12:02:43 2003
-+++ uClibc-0.9.19/ldso/util/Makefile Wed Apr 2 23:42:31 2003
-@@ -22,7 +22,7 @@
-
- TOPDIR=../../
- include $(TOPDIR)Rules.mak
--TARGET_CC = $(TOPDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc
-+TARGET_CC = $(TOPDIR)extra/gcc-uClibc/$(TARGET_CPU)-uclibc-gcc
-
- TARGETS = elf_header ldd
- ifeq ($(OSTYPE),linux)
---- uClibc-0.9.19/test/Rules.mak.orig Thu Feb 27 18:04:22 2003
-+++ uClibc-0.9.19/test/Rules.mak Wed Apr 2 23:49:34 2003
-@@ -41,7 +41,7 @@
- # make CROSS=mipsel-linux-
- # will build uClibc for 'mipsel'.
-
--CROSS=../$(TESTDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-
-+CROSS=../$(TESTDIR)extra/gcc-uClibc/$(TARGET_CPU)-uclibc-
- CC= $(CROSS)gcc
- STRIPTOOL=strip
- LDD=../$(TESTDIR)ldso/util/ldd
---- uClibc-0.9.21/extra/gcc-uClibc/Makefile.orig 2003-09-01 21:25:55.000000000 +0200
-+++ uClibc-0.9.21/extra/gcc-uClibc/Makefile 2003-09-13 06:40:32.000000000 +0200
-@@ -51,36 +51,36 @@
+--- uClibc-0.9.26/extra/gcc-uClibc/Makefile.orig 2004-01-31 17:41:23.190969928 +0100
++++ uClibc-0.9.26/extra/gcc-uClibc/Makefile 2004-01-31 17:51:11.132589216 +0100
+@@ -51,38 +51,38 @@
endif
gcc-uClibc: gcc-uClibc.h gcc-uClibc.c
- $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
+ $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_CPU)-uclibc-gcc
+ touch gcc-uClibc
ld-uClibc:
- @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
- chmod a+x $(TARGET_ARCH)-uclibc-ld
+ "-L$(UCLIBC_DIR)" >> $(TARGET_CPU)-uclibc-ld
+ chmod a+x $(TARGET_CPU)-uclibc-ld
+ touch ld-uClibc
install: all
- install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin;
- install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin;
-- install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
-- install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
-- ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc
-- ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/gcc
-- ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/cc
-- ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ld
-+ install -m 755 $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
-+ install -m 755 $(TARGET_CPU)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
-+ ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-cc
-+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/gcc
-+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/cc
-+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ld $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ld
+ install -d $(PREFIX)$(DEVEL_PREFIX)/bin;
+ install -d $(PREFIX)$(RUNTIME_PREFIX)/bin;
+- install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/
+- install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/
+- ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc
+- ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc
+- ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc
+- ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld
++ install -m 755 $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/
++ install -m 755 $(TARGET_CPU)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/
++ ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-cc
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld
ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
-- ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++
-- ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++
-- ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/c++
-- ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/g++
-+ ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-g++
-+ ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-c++
-+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/c++
-+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/g++
+- ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++
+- ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++
+- ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++
+- ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++
++ ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-g++
++ ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-c++
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++
++ ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++
endif
for app in addr2line ar as cpp gasp nm objcopy \
objdump ranlib size strings strip; do \
APPNAME=`which $(CROSS)$${app}`; \
if [ -x "$$APPNAME" ] ; then \
- ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/$${app}; \
-- ln -fs "$$APPNAME" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \
-+ ln -fs "$$APPNAME" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-$${app}; \
+ ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_PREFIX)/bin/$${app}; \
+- ln -fs "$$APPNAME" $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \
++ ln -fs "$$APPNAME" $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-$${app}; \
fi; \
done
-diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/.cvsignore uClibc-0.9.26/extra/gcc-uClibc/.cvsignore
---- uClibc-0.9.26.org/extra/gcc-uClibc/.cvsignore 1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.26/extra/gcc-uClibc/.cvsignore 2002-01-29 10:02:51.000000000 +0100
-@@ -0,0 +1,2 @@
-+gcc-uClibc.h
-+*-uclibc-*
diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c
--- uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c 1970-01-01 01:00:00.000000000 +0100
+++ uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c 2003-08-28 07:51:04.000000000 +0200
diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/Makefile uClibc-0.9.26/extra/gcc-uClibc/Makefile
--- uClibc-0.9.26.org/extra/gcc-uClibc/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ uClibc-0.9.26/extra/gcc-uClibc/Makefile 2004-01-25 16:06:22.372828491 +0100
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,92 @@
+# Makefile for building a fake gcc/binutils toolchain
+# that simply spoofs the location of the C library
+#
+ @echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h
+ @echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> gcc-uClibc.h
+ @echo "#define TARGET_ARCH " \"$(TARGET_ARCH)\" >> gcc-uClibc.h
-+ @echo "#define DYNAMIC_LINKER " \"$(DYNAMIC_LINKER)\" >> gcc-uClibc.h
++ @echo "#define DYNAMIC_LINKER " \"$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h
+ @echo "#define BUILD_DYNAMIC_LINKER " \"$(UCLIBC_DIR)/lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h
+ifeq ($(strip $(HAVE_SHARED)),y)
+ @echo "#define __UCLIBC_HAS_SHARED__ 1" >> gcc-uClibc.h
+
+gcc-uClibc: gcc-uClibc.h gcc-uClibc.c
+ $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
++ touch gcc-uClibc
+
+ld-uClibc:
+ @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
+ @echo "$(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/usr/lib -L$(DEVEL_PREFIX)/lib "\
+ "-L$(UCLIBC_DIR)" >> $(TARGET_ARCH)-uclibc-ld
+ chmod a+x $(TARGET_ARCH)-uclibc-ld
++ touch ld-uClibc
+
+install: all
+ install -d $(PREFIX)$(DEVEL_PREFIX)/bin;
-diff -urN uClibc-0.9.21.org/extra/scripts/fix_includes.sh uClibc-0.9.21/extra/scripts/fix_includes.sh
---- uClibc-0.9.21.org/extra/scripts/fix_includes.sh 2003-09-25 11:01:41.000000000 +0200
-+++ uClibc-0.9.21/extra/scripts/fix_includes.sh 2003-09-25 11:05:33.000000000 +0200
-@@ -111,47 +111,18 @@
+diff -urN uClibc-0.9.26.org/extra/scripts/fix_includes.sh uClibc-0.9.26/extra/scripts/fix_includes.sh
+--- uClibc-0.9.26.org/extra/scripts/fix_includes.sh 2004-01-25 15:20:35.130596892 +0100
++++ uClibc-0.9.26/extra/scripts/fix_includes.sh 2004-01-25 15:24:26.860333672 +0100
+@@ -59,16 +59,6 @@
+ esac;
+ done;
+
+-if [ ! -f "$KERNEL_SOURCE/Makefile" ]; then
+- echo "";
+- echo "";
+- echo "The file $KERNEL_SOURCE/Makefile is missing!";
+- echo "Perhaps your kernel source is broken?"
+- echo "";
+- echo "";
+- exit 1;
+-fi;
+-
+ if [ ! -d "$KERNEL_SOURCE" ]; then
+ echo "";
+ echo "";
+@@ -78,23 +68,6 @@
+ exit 1;
+ fi;
+
+-# set current VERSION, PATCHLEVEL, SUBLEVEL, EXTERVERSION
+-eval `sed -n -e 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' -e 's/^\([A-Z]*\) = \(-[-a-z0-9]*\)$/\1=\2/p' $KERNEL_SOURCE/Makefile`
+-if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ]
+-then
+- echo "Unable to determine version for kernel headers"
+- echo -e "\tprovided in directory $KERNEL_SOURCE"
+- exit 1
+-fi
+-
+-echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION}"
+-
+-
+-echo -e "\n"
+-echo "Using kernel headers from $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION} for architecture '$TARGET_ARCH'"
+-echo -e "\tprovided in directory $KERNEL_SOURCE"
+-echo -e "\n"
+-
+ # Create a symlink to include/asm
+
+ rm -f include/asm*
+@@ -111,43 +84,17 @@
echo "";
sleep 1;
- if [ "$TARGET_ARCH" = "powerpc" ];then
- set -x;
- ln -fs $KERNEL_SOURCE/include/asm-ppc include/asm;
-- unset -x;
+- set +x;
- elif [ "$TARGET_ARCH" = "mips" ];then
- set -x;
- ln -fs $KERNEL_SOURCE/include/asm-mips include/asm;
-- unset -x;
+- set +x;
- elif [ "$TARGET_ARCH" = "arm" ];then
- set -x;
- ln -fs $KERNEL_SOURCE/include/asm-arm include/asm;
-- unset -x;
-- if [ ! -L $KERNEL_SOURCE/include/asm-arm/proc ] ; then
+- set +x;
+- if [ ! -L $KERNEL_SOURCE/include/asm-arm/proc ] ; then
+ set -x;
+ ln -fs $KERNEL_SOURCE/include/asm include/asm;
+ unset -x;
-+
+ if [ "$TARGET_ARCH" = "arm" ];then
-+ if [ ! -L $KERNEL_SOURCE/include/asm/proc ] ; then
++ if [ ! -L $KERNEL_SOURCE/include/asm/proc ] ; then
if [ ! -L proc ] ; then
(cd include/asm;
ln -fs proc-armv proc;
ln -fs arch-ebsa285 arch);
fi
fi;
-- elif [ "$TARGET_ARCH" = "mipsel" ];then
-- set -x;
-- ln -fs $KERNEL_SOURCE/include/asm-mips include/asm;
-- unset -x;
-- elif [ "$TARGET_ARCH)" = "cris" ]; then
+- elif [ "$TARGET_ARCH" = "cris" ]; then
- set -x;
- ln -fs $KERNEL_SOURCE/include/asm-cris include/asm;
-- unset -x;
+- set +x;
- elif [ "$HAS_MMU" != "y" ]; then
- if [ -d $KERNEL_SOURCE/include/asm-${TARGET_ARCH}nommu ] ; then
- set -x;
- ln -fs $KERNEL_SOURCE/include/asm-${TARGET_ARCH}nommu include/asm;
-- unset -x;
+- set +x;
- else
- set -x;
- ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm;
-- unset -x;
+- set +x;
- fi;
- else
- set -x;
- ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm;
-- unset -x;
+- set +x;
fi;
else
# No guessing required.....
+@@ -155,12 +102,6 @@
+ fi;
+
+
+-# Annoyingly, 2.6.x kernel headers also need an include/asm-generic/ directory
+-if [ $VERSION -eq 2 ] && [ $PATCHLEVEL -ge 6 ] ; then
+- ln -fs $KERNEL_SOURCE/include/asm-generic include/asm-generic
+-fi;
+-
+-
+ # Create the include/linux and include/scsi symlinks.
+ rm -f include/linux
+ ln -fs $KERNEL_SOURCE/include/linux include/linux
projects / packages / uClibc.git / commitdiff