diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-16 17:27:23 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-16 17:27:23 +0200 |
| commit | 71e1837bead950f0dfe2507dbefe897121fbd295 (patch) | |
| tree | 98315dfe84ecfef947d5b14aa04b859d5912611c /toolchain | |
| parent | cc25a98b2c59070ab70ffdda4780cd238e665f5d (diff) | |
| parent | 81c4c7c2cf2c5ff27a6c02e41bf484a53ea942c2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/patches/no-lib64.patch | 12 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/microperl.patch | 24 | ||||
| -rw-r--r-- | toolchain/uClibc/patches/nold64.patch | 17 |
3 files changed, 24 insertions, 29 deletions
diff --git a/toolchain/gcc/patches/no-lib64.patch b/toolchain/gcc/patches/no-lib64.patch index 29b0025b4..25ada0e4e 100644 --- a/toolchain/gcc/patches/no-lib64.patch +++ b/toolchain/gcc/patches/no-lib64.patch @@ -22,18 +22,6 @@ diff -Nur gcc-4.4.1.orig/gcc/config/i386/t-linux64 gcc-4.4.1/gcc/config/i386/t-l LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib -diff -Nur gcc-4.4.1.orig/gcc/config/linux.h gcc-4.4.1/gcc/config/linux.h ---- gcc-4.4.1.orig/gcc/config/linux.h 2009-04-10 01:23:07.000000000 +0200 -+++ gcc-4.4.1/gcc/config/linux.h 2009-08-21 18:34:13.000000000 +0200 -@@ -119,7 +119,7 @@ - supporting both 32-bit and 64-bit compilation. */ - #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" --#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" -+#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld-uClibc.so.0" - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - #define LINUX_DYNAMIC_LINKER32 \ diff -Nur gcc-4.4.1.orig/gcc/config/mips/linux64.h gcc-4.4.1/gcc/config/mips/linux64.h --- gcc-4.4.1.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100 +++ gcc-4.4.1/gcc/config/mips/linux64.h 2009-08-21 18:37:19.000000000 +0200 diff --git a/toolchain/kernel-headers/patches/microperl.patch b/toolchain/kernel-headers/patches/microperl.patch new file mode 100644 index 000000000..2955b7421 --- /dev/null +++ b/toolchain/kernel-headers/patches/microperl.patch @@ -0,0 +1,24 @@ +diff -Nur linux-2.6.30.5.orig/scripts/headers_check.pl linux-2.6.30.5/scripts/headers_check.pl +--- linux-2.6.30.5.orig/scripts/headers_check.pl 2009-08-16 23:19:38.000000000 +0200 ++++ linux-2.6.30.5/scripts/headers_check.pl 2009-09-14 21:16:21.000000000 +0200 +@@ -18,7 +18,7 @@ + # + # 3) Check for leaked CONFIG_ symbols + +-use strict; ++#use strict; + + my ($dir, $arch, @files) = @ARGV; + +diff -Nur linux-2.6.30.5.orig/scripts/headers_install.pl linux-2.6.30.5/scripts/headers_install.pl +--- linux-2.6.30.5.orig/scripts/headers_install.pl 2009-08-16 23:19:38.000000000 +0200 ++++ linux-2.6.30.5/scripts/headers_install.pl 2009-09-14 21:16:11.000000000 +0200 +@@ -16,7 +16,7 @@ + # 2) Drop include of compiler.h + # 3) Drop all sections defined out by __KERNEL__ (using unifdef) + +-use strict; ++#use strict; + + my ($readdir, $installdir, $arch, @files) = @ARGV; + diff --git a/toolchain/uClibc/patches/nold64.patch b/toolchain/uClibc/patches/nold64.patch deleted file mode 100644 index 237cb9f4d..000000000 --- a/toolchain/uClibc/patches/nold64.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur uClibc-0.9.30.1.orig/Rules.mak uClibc-0.9.30.1/Rules.mak ---- uClibc-0.9.30.1.orig/Rules.mak 2009-03-02 22:10:04.000000000 +0100 -+++ uClibc-0.9.30.1/Rules.mak 2009-06-18 20:11:42.336906659 +0200 -@@ -97,12 +97,11 @@ - LIBC := libc - SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION) - ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) --UCLIBC_LDSO_NAME := ld64-uClibc - ARCH_NATIVE_BIT := 64 - else --UCLIBC_LDSO_NAME := ld-uClibc - ARCH_NATIVE_BIT := 32 - endif -+UCLIBC_LDSO_NAME := ld-uClibc - UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION) - NONSHARED_LIBNAME := uclibc_nonshared.a - libc := $(top_builddir)lib/$(SHARED_MAJORNAME) |