- merged from DEVEL

Changed files:
    uClibc-targetcpu.patch -> 1.6
    uClibc-toolchain-wrapper.patch -> 1.6

diff --git a/uClibc-targetcpu.patch b/uClibc-targetcpu.patch
index 0d93f58b239249ecbcb9d61bbf9d4e0a049b601c..d5080f254e28a809292628a69f51caf9b9fc483f 100644 (file)
--- a/uClibc-targetcpu.patch
+++ b/uClibc-targetcpu.patch
@@ -33,10 +33,9 @@
 -      @echo "# This file was autogenerated by make" >> $(TARGET_ARCH)-uclibc-ld
 +      @echo "#!/bin/sh" > $(TARGET_CPU)-uclibc-ld
 +      @echo "# This file was autogenerated by make" >> $(TARGET_CPU)-uclibc-ld
-       @echo "$(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/usr/lib -L$(DEVEL_PREFIX)/lib "\
--              "-L$(UCLIBC_DIR)" >> $(TARGET_ARCH)-uclibc-ld
+-      @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >> $(TARGET_ARCH)-uclibc-ld
++      @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >> $(TARGET_CPU)-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
  

diff --git a/uClibc-toolchain-wrapper.patch b/uClibc-toolchain-wrapper.patch
index 2be3a9342c159c26ccae6b1b1934042f995357a6..350614ca7d681abdada577f9a926b87fc5b86adb 100644 (file)
--- a/uClibc-toolchain-wrapper.patch
+++ b/uClibc-toolchain-wrapper.patch
@@ -681,6 +681,7 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/Makefile uClibc-0.9.26/extra/gcc-uC
 +
 +TOPDIR = ../../
 +include $(TOPDIR)Rules.mak
++include $(TOPDIR)/.config
 +
 +UCLIBC_DIR = $(shell (cd ../.. ; /bin/pwd))
 +GCC_BIN = $(shell which $(CC))
@@ -698,7 +699,7 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/Makefile uClibc-0.9.26/extra/gcc-uC
 +      @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 " \"$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO)\" >> 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
@@ -733,8 +734,7 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/Makefile uClibc-0.9.26/extra/gcc-uC
 +ld-uClibc:
 +      @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
 +      @echo "# This file was autogenerated by make" >> $(TARGET_ARCH)-uclibc-ld
-+      @echo "$(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/usr/lib -L$(DEVEL_PREFIX)/lib "\
-+              "-L$(UCLIBC_DIR)" >> $(TARGET_ARCH)-uclibc-ld
++      @echo "exec $(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/lib" >> $(TARGET_ARCH)-uclibc-ld
 +      chmod a+x $(TARGET_ARCH)-uclibc-ld
 +      touch ld-uClibc
 +
@@ -766,45 +766,37 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/Makefile uClibc-0.9.26/extra/gcc-uC
 +      rm -f gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
 +
 +
-diff -urN uClibc-0.9.26.org/extra/Makefile uClibc-0.9.26/extra/Makefile
---- uClibc-0.9.26.org/extra/Makefile   2004-01-25 15:20:33.050030242 +0100
-+++ uClibc-0.9.26/extra/Makefile       2004-01-25 16:02:02.133944484 +0100
-@@ -26,7 +26,7 @@
- LIBC=$(TOPDIR)libc.a
+diff -ur uClibc/Makefile.in uClibc.toolchain/Makefile.in
+--- uClibc/Makefile.in 2006-01-03 09:12:11.000000000 +0100
++++ uClibc.toolchain/Makefile.in       2006-01-04 18:44:00.000000000 +0100
+@@ -16,7 +16,7 @@
  
+ ifeq ($(HAVE_DOT_CONFIG),y)
  
--DIRS = 
-+DIRS = gcc-uClibc
- EXTRA_DIRS_TO_CLEAN = config
+-all: pregen libs
++all: pregen libs toolchain
  
- all: subdirs
---- uClibc-0.9.27/Makefile.orig        2005-01-12 08:59:21.000000000 +0100
-+++ uClibc-0.9.27/Makefile     2005-01-15 20:49:24.817701160 +0100
-@@ -28,7 +28,7 @@
- TOPDIR=./
- include Rules.mak
+ # In this section, we need .config
+ -include .config.cmd
+@@ -99,7 +99,7 @@
  
--DIRS = ldso libc libcrypt libresolv libnsl libutil libm libpthread librt
-+DIRS = extra ldso libc libcrypt libresolv libnsl libutil libm libpthread librt
- ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
-       DIRS += libintl
- endif
-@@ -137,7 +137,7 @@
- tags:
-       ctags -R
+ pregen: headers
  
--install: install_runtime install_dev finished2
-+install: install_runtime install_dev install_toolchain finished2
+-install: install_runtime install_dev
++install: install_runtime install_dev install_toolchain
  
  
- RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
-@@ -257,6 +257,9 @@
- #     $(INSTALL) -m 755 libc/misc/wchar/iconv.target $(PREFIX)$(RUNTIME_PREFIX)/usr/bin/iconv
- #endif
+ RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
+@@ -236,6 +236,12 @@
+       fi
+ endif
  
-+install_toolchain:
-+      $(MAKE) -C extra/gcc-uClibc install
++toolchain:
++      $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C extra/gcc-uClibc
 +
- finished2:
-       @echo
-       @echo Finished installing...
++install_toolchain: toolchain
++      $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C extra/gcc-uClibc install
++
+ utils:
+       $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
+