diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-16 07:27:47 +0100 |
---|---|---|
committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-16 07:27:47 +0100 |
commit | 4e41871d718048a3ef18dfe10607745cc94b7fc4 (patch) | |
tree | 083e6c77ff9d9ce05b4555601a3841eea1cd96bf /toolchain | |
parent | a238192abad686137d611f6d78bdba8d0b6672ba (diff) |
good bye cris, hardware is eol, latest toolchain is broken, qemu emulator support is bad, kernel needs patches for serial and network
Diffstat (limited to 'toolchain')
-rw-r--r-- | toolchain/gcc/Makefile | 4 | ||||
-rw-r--r-- | toolchain/gcc/patches/4.5.3/cflags.patch | 253 | ||||
-rw-r--r-- | toolchain/gcc/patches/4.5.3/mirbsd-compat.patch | 12 | ||||
-rw-r--r-- | toolchain/gcc/patches/4.5.3/no-lib64.patch | 100 | ||||
-rw-r--r-- | toolchain/gcc/patches/4.7.3/musl-cris.patch | 11 | ||||
-rw-r--r-- | toolchain/kernel-headers/Makefile | 7 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.11.10/cris-header.patch | 65 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.12.6/cris-header.patch | 65 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.71/cleankernel.patch | 11 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.71/etrax-header.patch | 95 | ||||
-rw-r--r-- | toolchain/uClibc/Makefile | 4 |
11 files changed, 0 insertions, 627 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index f82332702..66cdf26ab 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -61,13 +61,9 @@ endif ifeq ($(ARCH),m68k) GCC_CONFOPTS+= --disable-tls -else -ifeq ($(ARCH),cris) -GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls endif -endif ifeq ($(ARCH),powerpc) ifeq ($(ADK_TARGET_LIBC),musl) diff --git a/toolchain/gcc/patches/4.5.3/cflags.patch b/toolchain/gcc/patches/4.5.3/cflags.patch deleted file mode 100644 index 0d5815a54..000000000 --- a/toolchain/gcc/patches/4.5.3/cflags.patch +++ /dev/null @@ -1,253 +0,0 @@ - - This patch brings over a few features from MirBSD: - * -fhonour-copts - If this option is not given, it's warned (depending - on environment variables). This is to catch errors - of misbuilt packages which override CFLAGS themselves. - * -Werror-maybe-reset - Has the effect of -Wno-error if GCC_NO_WERROR is - set and not '0', a no-operation otherwise. This is - to be able to use -Werror in "make" but prevent - GNU autoconf generated configure scripts from - freaking out. - * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks - the default for -O2/-Os, because they trigger gcc bugs - and can delete code with security implications. - - This patch was authored by Thorsten Glaser <tg at mirbsd.de> - with copyright assignment to the FSF in effect. - ---- a/gcc/c-opts.c -+++ b/gcc/c-opts.c -@@ -105,6 +105,9 @@ - /* Number of deferred options scanned for -include. */ - static size_t include_cursor; - -+/* Check if a port honours COPTS. */ -+static int honour_copts = 0; -+ - static void set_Wimplicit (int); - static void handle_OPT_d (const char *); - static void set_std_cxx98 (int); -@@ -454,6 +457,9 @@ - enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC); - break; - -+ case OPT_Werror_maybe_reset: -+ break; -+ - case OPT_Wformat: - set_Wformat (value); - break; -@@ -690,6 +701,12 @@ - flag_exceptions = value; - break; - -+ case OPT_fhonour_copts: -+ if (c_language == clk_c) { -+ honour_copts++; -+ } -+ break; -+ - case OPT_fimplement_inlines: - flag_implement_inlines = value; - break; -@@ -1209,6 +1226,47 @@ - return false; - } - -+ if (c_language == clk_c) { -+ char *ev = getenv ("GCC_HONOUR_COPTS"); -+ int evv; -+ if (ev == NULL) -+ evv = -1; -+ else if ((*ev == '0') || (*ev == '\0')) -+ evv = 0; -+ else if (*ev == '1') -+ evv = 1; -+ else if (*ev == '2') -+ evv = 2; -+ else if (*ev == 's') -+ evv = -1; -+ else { -+ warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1"); -+ evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */ -+ } -+ if (evv == 1) { -+ if (honour_copts == 0) { -+ error ("someone does not honour COPTS at all in lenient mode"); -+ return false; -+ } else if (honour_copts != 1) { -+ warning (0, "someone does not honour COPTS correctly, passed %d times", -+ honour_copts); -+ } -+ } else if (evv == 2) { -+ if (honour_copts == 0) { -+ error ("someone does not honour COPTS at all in strict mode"); -+ return false; -+ } else if (honour_copts != 1) { -+ error ("someone does not honour COPTS correctly, passed %d times", -+ honour_copts); -+ return false; -+ } -+ } else if (evv == 0) { -+ if (honour_copts != 1) -+ inform (0, "someone does not honour COPTS correctly, passed %d times", -+ honour_copts); -+ } -+ } -+ - return true; - } - ---- a/gcc/c.opt -+++ b/gcc/c.opt -@@ -215,6 +215,10 @@ - C ObjC RejectNegative Warning - This switch is deprecated; use -Werror=implicit-function-declaration instead - -+Werror-maybe-reset -+C ObjC C++ ObjC++ -+; Documented in common.opt -+ - Wfloat-equal - C ObjC C++ ObjC++ Var(warn_float_equal) Warning - Warn if testing floating point numbers for equality -@@ -609,6 +613,9 @@ - fhonor-std - C++ ObjC++ - -+fhonour-copts -+C ObjC C++ ObjC++ RejectNegative -+ - fhosted - C ObjC - Assume normal C execution environment ---- a/gcc/common.opt -+++ b/gcc/common.opt -@@ -102,6 +102,10 @@ - Common Joined - Treat specified warning as error - -+Werror-maybe-reset -+Common -+If environment variable GCC_NO_WERROR is set, act as -Wno-error -+ - Wextra - Common Warning - Print extra (possibly unwanted) warnings -@@ -573,6 +577,9 @@ - Common Report Var(flag_guess_branch_prob) Optimization - Enable guessing of branch probabilities - -+fhonour-copts -+Common RejectNegative -+ - ; Nonzero means ignore `#ident' directives. 0 means handle them. - ; Generate position-independent code for executables if possible - ; On SVR4 targets, it also controls whether or not to emit a ---- a/gcc/opts.c -+++ b/gcc/opts.c -@@ -896,8 +896,6 @@ - flag_schedule_insns_after_reload = opt2; - #endif - flag_regmove = opt2; -- flag_strict_aliasing = opt2; -- flag_strict_overflow = opt2; - flag_reorder_blocks = opt2; - flag_reorder_functions = opt2; - flag_tree_vrp = opt2; -@@ -922,6 +919,8 @@ - - /* -O3 optimizations. */ - opt3 = (optimize >= 3); -+ flag_strict_aliasing = opt3; -+ flag_strict_overflow = opt3; - flag_predictive_commoning = opt3; - flag_inline_functions = opt3; - flag_unswitch_loops = opt3; -@@ -1601,6 +1601,17 @@ - enable_warning_as_error (arg, value, lang_mask); - break; - -+ case OPT_Werror_maybe_reset: -+ { -+ char *ev = getenv ("GCC_NO_WERROR"); -+ if ((ev != NULL) && (*ev != '0')) -+ warnings_are_errors = 0; -+ } -+ break; -+ -+ case OPT_fhonour_copts: -+ break; -+ - case OPT_Wlarger_than_: - /* This form corresponds to -Wlarger-than-. - Kept for backward compatibility. ---- a/gcc/doc/cppopts.texi -+++ b/gcc/doc/cppopts.texi -@@ -164,6 +164,11 @@ - Make all warnings into hard errors. Source code which triggers warnings - will be rejected. - -+ at item -Werror-maybe-reset -+ at opindex Werror-maybe-reset -+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment -+variable is set to anything other than 0 or empty. -+ - @item -Wsystem-headers - @opindex Wsystem-headers - Issue warnings for code in system headers. These are normally unhelpful ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -234,7 +234,7 @@ - -Wconversion -Wcoverage-mismatch -Wno-deprecated @gol - -Wno-deprecated-declarations -Wdisabled-optimization @gol - -Wno-div-by-zero -Wempty-body -Wenum-compare -Wno-endif-labels @gol ---Werror -Werror=* @gol -+-Werror -Werror=* -Werror-maybe-reset @gol - -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol - -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol - -Wformat-security -Wformat-y2k @gol -@@ -4161,6 +4161,22 @@ - @option{-Wall} and by @option{-pedantic}, which can be disabled with - @option{-Wno-pointer-sign}. - -+ at item -Werror-maybe-reset -+ at opindex Werror-maybe-reset -+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment -+variable is set to anything other than 0 or empty. -+ -+ at item -fhonour-copts -+ at opindex fhonour-copts -+If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not -+given at least once, and warn if it is given more than once. -+If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not -+given exactly once. -+If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option -+is not given exactly once. -+The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}. -+This flag and environment variable only affect the C language. -+ - @item -Wstack-protector - @opindex Wstack-protector - @opindex Wno-stack-protector -@@ -5699,7 +5715,7 @@ - second branch or a point immediately following it, depending on whether - the condition is known to be true or false. - --Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. -+Enabled at levels @option{-O3}. - - @item -fsplit-wide-types - @opindex fsplit-wide-types ---- a/gcc/java/jvspec.c -+++ b/gcc/java/jvspec.c -@@ -670,6 +670,7 @@ - class name. Append dummy `.c' that can be stripped by set_input so %b - is correct. */ - set_input (concat (main_class_name, "main.c", NULL)); -+ putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */ - err = do_spec (jvgenmain_spec); - if (err == 0) - { diff --git a/toolchain/gcc/patches/4.5.3/mirbsd-compat.patch b/toolchain/gcc/patches/4.5.3/mirbsd-compat.patch deleted file mode 100644 index 2f3ea0c87..000000000 --- a/toolchain/gcc/patches/4.5.3/mirbsd-compat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur gcc-4.4.2.orig/gcc/configure gcc-4.4.2/gcc/configure ---- gcc-4.4.2.orig/gcc/configure Tue Mar 24 18:45:39 2009 -+++ gcc-4.4.2/gcc/configure Sat Dec 19 21:07:07 2009 -@@ -19381,7 +19381,7 @@ - dynamic_linker='ldqnx.so' - ;; - --openbsd*) -+mirbsd*|openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no diff --git a/toolchain/gcc/patches/4.5.3/no-lib64.patch b/toolchain/gcc/patches/4.5.3/no-lib64.patch deleted file mode 100644 index 5c6e0b045..000000000 --- a/toolchain/gcc/patches/4.5.3/no-lib64.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -Nur gcc-4.5.3.orig/gcc/config/i386/linux64.h gcc-4.5.3/gcc/config/i386/linux64.h ---- gcc-4.5.3.orig/gcc/config/i386/linux64.h 2010-03-24 21:44:48.000000000 +0100 -+++ gcc-4.5.3/gcc/config/i386/linux64.h 2011-08-24 06:35:30.000000000 +0200 -@@ -59,7 +59,7 @@ - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #if TARGET_64BIT_DEFAULT - #define SPEC_32 "m32" -diff -Nur gcc-4.5.3.orig/gcc/config/i386/t-linux64 gcc-4.5.3/gcc/config/i386/t-linux64 ---- gcc-4.5.3.orig/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200 -+++ gcc-4.5.3/gcc/config/i386/t-linux64 2011-08-24 06:35:30.000000000 +0200 -@@ -25,7 +25,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib -diff -Nur gcc-4.5.3.orig/gcc/config/mips/linux64.h gcc-4.5.3/gcc/config/mips/linux64.h ---- gcc-4.5.3.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100 -+++ gcc-4.5.3/gcc/config/mips/linux64.h 2011-08-24 06:35:30.000000000 +0200 -@@ -36,9 +36,9 @@ - %{profile:-lc_p} %{!profile:-lc}}" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" --#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" --#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" -+#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" -+#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0" - #define LINUX_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) - -diff -Nur gcc-4.5.3.orig/gcc/config/mips/t-linux64 gcc-4.5.3/gcc/config/mips/t-linux64 ---- gcc-4.5.3.orig/gcc/config/mips/t-linux64 2009-04-21 21:03:23.000000000 +0200 -+++ gcc-4.5.3/gcc/config/mips/t-linux64 2011-08-24 06:35:30.000000000 +0200 -@@ -18,7 +18,7 @@ - - MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 - MULTILIB_DIRNAMES = n32 32 64 --MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 -+MULTILIB_OSDIRNAMES = ../lib ../lib ../lib - - EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o - -diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/linux64.h gcc-4.5.3/gcc/config/rs6000/linux64.h ---- gcc-4.5.3.orig/gcc/config/rs6000/linux64.h 2010-11-17 07:09:53.000000000 +0100 -+++ gcc-4.5.3/gcc/config/rs6000/linux64.h 2011-08-24 06:35:30.000000000 +0200 -@@ -341,7 +341,7 @@ - #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" - #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" - #if UCLIBC_DEFAULT -diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 gcc-4.5.3/gcc/config/rs6000/t-linux64 ---- gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 2009-04-21 21:03:23.000000000 +0200 -+++ gcc-4.5.3/gcc/config/rs6000/t-linux64 2011-08-24 06:35:30.000000000 +0200 -@@ -36,7 +36,7 @@ - MULTILIB_EXTRA_OPTS = fPIC mstrict-align - MULTILIB_EXCEPTIONS = m64/msoft-float - MULTILIB_EXCLUSIONS = m64/!m32/msoft-float --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof -+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof - MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) - - softfp_wrap_start := '\#ifndef __powerpc64__' -diff -Nur gcc-4.5.3.orig/gcc/config/sparc/linux64.h gcc-4.5.3/gcc/config/sparc/linux64.h ---- gcc-4.5.3.orig/gcc/config/sparc/linux64.h 2010-09-22 23:15:37.000000000 +0200 -+++ gcc-4.5.3/gcc/config/sparc/linux64.h 2011-08-24 06:36:52.000000000 +0200 -@@ -110,7 +110,7 @@ - /* If ELF is the default format, we should not use /lib/elf. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" - - #ifdef SPARC_BI_ARCH - -diff -Nur gcc-4.5.3.orig/gcc/config/sparc/t-linux64 gcc-4.5.3/gcc/config/sparc/t-linux64 ---- gcc-4.5.3.orig/gcc/config/sparc/t-linux64 2010-10-04 18:54:26.000000000 +0200 -+++ gcc-4.5.3/gcc/config/sparc/t-linux64 2011-08-24 06:37:15.000000000 +0200 -@@ -26,7 +26,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/toolchain/gcc/patches/4.7.3/musl-cris.patch b/toolchain/gcc/patches/4.7.3/musl-cris.patch deleted file mode 100644 index 4889263a1..000000000 --- a/toolchain/gcc/patches/4.7.3/musl-cris.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur gcc-4.7.3.orig/gcc/config/cris/linux.h gcc-4.7.3/gcc/config/cris/linux.h ---- gcc-4.7.3.orig/gcc/config/cris/linux.h 2011-04-11 20:46:05.000000000 +0200 -+++ gcc-4.7.3/gcc/config/cris/linux.h 2013-10-11 10:01:51.000000000 +0200 -@@ -104,6 +104,7 @@ - #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-cris.1" - - #undef CRIS_LINK_SUBTARGET_SPEC - #define CRIS_LINK_SUBTARGET_SPEC \ diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 6ece517d3..2e5971f19 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -10,13 +10,6 @@ $(WRKBUILD)/.headers: $(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(STAGING_DIR)/usr \ headers_install -ifeq ($(ARCH),cris) -ifeq ($(CPU_ARCH),crisv32) - cd $(STAGING_DIR)/usr/include && ln -sf arch-v32/arch arch -else - cd $(STAGING_DIR)/usr/include && ln -sf arch-v10/arch arch -endif -endif touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/kernel-headers/patches/3.11.10/cris-header.patch b/toolchain/kernel-headers/patches/3.11.10/cris-header.patch deleted file mode 100644 index da455f3b3..000000000 --- a/toolchain/kernel-headers/patches/3.11.10/cris-header.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Nur linux-3.11.5.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.11.5/arch/cris/include/arch-v10/arch/Kbuild ---- linux-3.11.5.orig/arch/cris/include/arch-v10/arch/Kbuild 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/arch/cris/include/arch-v10/arch/Kbuild 2013-10-15 17:05:47.000000000 +0200 -@@ -1 +1,5 @@ - # CRISv10 arch -+header-y += ptrace.h -+header-y += user.h -+header-y += elf.h -+header-y += system.h -diff -Nur linux-3.11.5.orig/arch/cris/include/asm/Kbuild linux-3.11.5/arch/cris/include/asm/Kbuild ---- linux-3.11.5.orig/arch/cris/include/asm/Kbuild 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/arch/cris/include/asm/Kbuild 2013-10-15 17:06:22.000000000 +0200 -@@ -1,7 +1,7 @@ -- --header-y += arch-v10/ --header-y += arch-v32/ -- -+header-y += ../arch-v10/arch/ -+header-y += ../arch-v32/arch/ -+header-y += elf.h -+header-y += user.h - - generic-y += clkdev.h - generic-y += exec.h -diff -Nur linux-3.11.5.orig/arch/cris/include/uapi/asm/Kbuild linux-3.11.5/arch/cris/include/uapi/asm/Kbuild ---- linux-3.11.5.orig/arch/cris/include/uapi/asm/Kbuild 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/arch/cris/include/uapi/asm/Kbuild 2013-10-15 17:05:49.000000000 +0200 -@@ -1,8 +1,8 @@ - # UAPI Header export list - include include/uapi/asm-generic/Kbuild.asm - --header-y += arch-v10/ --header-y += arch-v32/ -+header-y += ../arch-v10/arch/ -+header-y += ../arch-v32/arch/ - header-y += auxvec.h - header-y += bitsperlong.h - header-y += byteorder.h -diff -Nur linux-3.11.5.orig/include/uapi/asm-generic/Kbuild linux-3.11.5/include/uapi/asm-generic/Kbuild ---- linux-3.11.5.orig/include/uapi/asm-generic/Kbuild 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/include/uapi/asm-generic/Kbuild 2013-10-15 17:05:49.000000000 +0200 -@@ -34,3 +34,4 @@ - header-y += types.h - header-y += ucontext.h - header-y += unistd.h -+header-y += user.h -diff -Nur linux-3.11.5.orig/include/uapi/asm-generic/Kbuild.asm linux-3.11.5/include/uapi/asm-generic/Kbuild.asm ---- linux-3.11.5.orig/include/uapi/asm-generic/Kbuild.asm 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/include/uapi/asm-generic/Kbuild.asm 2013-10-15 17:05:49.000000000 +0200 -@@ -18,6 +18,7 @@ - header-y += ipcbuf.h - header-y += mman.h - header-y += msgbuf.h -+header-y += page.h - header-y += param.h - header-y += poll.h - header-y += posix_types.h -@@ -38,6 +39,7 @@ - header-y += termios.h - header-y += types.h - header-y += unistd.h -+header-y += user.h - - header-y += $(foreach hdr,$(opt-header), \ - $(if \ diff --git a/toolchain/kernel-headers/patches/3.12.6/cris-header.patch b/toolchain/kernel-headers/patches/3.12.6/cris-header.patch deleted file mode 100644 index da455f3b3..000000000 --- a/toolchain/kernel-headers/patches/3.12.6/cris-header.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Nur linux-3.11.5.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.11.5/arch/cris/include/arch-v10/arch/Kbuild ---- linux-3.11.5.orig/arch/cris/include/arch-v10/arch/Kbuild 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/arch/cris/include/arch-v10/arch/Kbuild 2013-10-15 17:05:47.000000000 +0200 -@@ -1 +1,5 @@ - # CRISv10 arch -+header-y += ptrace.h -+header-y += user.h -+header-y += elf.h -+header-y += system.h -diff -Nur linux-3.11.5.orig/arch/cris/include/asm/Kbuild linux-3.11.5/arch/cris/include/asm/Kbuild ---- linux-3.11.5.orig/arch/cris/include/asm/Kbuild 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/arch/cris/include/asm/Kbuild 2013-10-15 17:06:22.000000000 +0200 -@@ -1,7 +1,7 @@ -- --header-y += arch-v10/ --header-y += arch-v32/ -- -+header-y += ../arch-v10/arch/ -+header-y += ../arch-v32/arch/ -+header-y += elf.h -+header-y += user.h - - generic-y += clkdev.h - generic-y += exec.h -diff -Nur linux-3.11.5.orig/arch/cris/include/uapi/asm/Kbuild linux-3.11.5/arch/cris/include/uapi/asm/Kbuild ---- linux-3.11.5.orig/arch/cris/include/uapi/asm/Kbuild 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/arch/cris/include/uapi/asm/Kbuild 2013-10-15 17:05:49.000000000 +0200 -@@ -1,8 +1,8 @@ - # UAPI Header export list - include include/uapi/asm-generic/Kbuild.asm - --header-y += arch-v10/ --header-y += arch-v32/ -+header-y += ../arch-v10/arch/ -+header-y += ../arch-v32/arch/ - header-y += auxvec.h - header-y += bitsperlong.h - header-y += byteorder.h -diff -Nur linux-3.11.5.orig/include/uapi/asm-generic/Kbuild linux-3.11.5/include/uapi/asm-generic/Kbuild ---- linux-3.11.5.orig/include/uapi/asm-generic/Kbuild 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/include/uapi/asm-generic/Kbuild 2013-10-15 17:05:49.000000000 +0200 -@@ -34,3 +34,4 @@ - header-y += types.h - header-y += ucontext.h - header-y += unistd.h -+header-y += user.h -diff -Nur linux-3.11.5.orig/include/uapi/asm-generic/Kbuild.asm linux-3.11.5/include/uapi/asm-generic/Kbuild.asm ---- linux-3.11.5.orig/include/uapi/asm-generic/Kbuild.asm 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/include/uapi/asm-generic/Kbuild.asm 2013-10-15 17:05:49.000000000 +0200 -@@ -18,6 +18,7 @@ - header-y += ipcbuf.h - header-y += mman.h - header-y += msgbuf.h -+header-y += page.h - header-y += param.h - header-y += poll.h - header-y += posix_types.h -@@ -38,6 +39,7 @@ - header-y += termios.h - header-y += types.h - header-y += unistd.h -+header-y += user.h - - header-y += $(foreach hdr,$(opt-header), \ - $(if \ diff --git a/toolchain/kernel-headers/patches/3.4.71/cleankernel.patch b/toolchain/kernel-headers/patches/3.4.71/cleankernel.patch deleted file mode 100644 index f8d5448ee..000000000 --- a/toolchain/kernel-headers/patches/3.4.71/cleankernel.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur linux-2.6.29.1.orig/scripts/Makefile.headersinst linux-2.6.29.1/scripts/Makefile.headersinst ---- linux-2.6.29.1.orig/scripts/Makefile.headersinst 2009-04-02 22:55:27.000000000 +0200 -+++ linux-2.6.29.1/scripts/Makefile.headersinst 2009-04-17 20:56:09.143476927 +0200 -@@ -65,7 +65,6 @@ - - targets += $(install-file) - $(install-file): scripts/headers_install.pl $(input-files) FORCE -- $(if $(unwanted),$(call cmd,remove),) - $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) - $(call if_changed,install) - diff --git a/toolchain/kernel-headers/patches/3.4.71/etrax-header.patch b/toolchain/kernel-headers/patches/3.4.71/etrax-header.patch deleted file mode 100644 index 559c0f322..000000000 --- a/toolchain/kernel-headers/patches/3.4.71/etrax-header.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.4.4/arch/cris/include/arch-v10/arch/Kbuild ---- linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/arch-v10/arch/Kbuild 2012-07-18 07:38:39.000000000 +0200 -@@ -1,4 +1,10 @@ -+header-y += dma.h -+header-y += io_interface_mux.h - header-y += user.h - header-y += svinto.h - header-y += sv_addr_ag.h - header-y += sv_addr.agh -+header-y += elf.h -+header-y += page.h -+header-y += ptrace.h -+header-y += system.h -diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.4.4/arch/cris/include/arch-v32/arch/Kbuild ---- linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/arch-v32/arch/Kbuild 2012-07-18 07:38:26.000000000 +0200 -@@ -1,2 +1,7 @@ - header-y += user.h - header-y += cryptocop.h -+header-y += elf.h -+header-y += page.h -+header-y += ptrace.h -+header-y += system.h -+ -diff -Nur linux-3.4.4.orig/arch/cris/include/asm/Kbuild linux-3.4.4/arch/cris/include/asm/Kbuild ---- linux-3.4.4.orig/arch/cris/include/asm/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/asm/Kbuild 2012-07-18 07:38:03.000000000 +0200 -@@ -1,10 +1,13 @@ - include include/asm-generic/Kbuild.asm - --header-y += arch-v10/ --header-y += arch-v32/ -- -+header-y += ../arch-v10/arch/ -+header-y += ../arch-v32/arch/ -+ -+header-y += elf.h - header-y += ethernet.h - header-y += etraxgpio.h - header-y += rs485.h - header-y += rtc.h - header-y += sync_serial.h -+header-y += page.h -+header-y += user.h -diff -Nur linux-3.4.4.orig/arch/cris/include/asm/posix_types.h linux-3.4.4/arch/cris/include/asm/posix_types.h ---- linux-3.4.4.orig/arch/cris/include/asm/posix_types.h 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/asm/posix_types.h 2012-07-18 17:10:45.000000000 +0200 -@@ -6,6 +6,7 @@ - #ifndef __ARCH_CRIS_POSIX_TYPES_H - #define __ARCH_CRIS_POSIX_TYPES_H - -+ - /* - * This file is generally used by user-level software, so you need to - * be a little careful about namespace pollution etc. Also, we cannot -@@ -33,4 +34,6 @@ - typedef unsigned short __kernel_old_dev_t; - #define __kernel_old_dev_t __kernel_old_dev_t - -+#include <asm-generic/posix_types.h> -+ - #endif /* __ARCH_CRIS_POSIX_TYPES_H */ -diff -Nur linux-3.4.4.orig/include/asm-generic/Kbuild linux-3.4.4/include/asm-generic/Kbuild ---- linux-3.4.4.orig/include/asm-generic/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/include/asm-generic/Kbuild 2012-07-18 07:38:03.000000000 +0200 -@@ -3,14 +3,17 @@ - header-y += errno-base.h - header-y += errno.h - header-y += fcntl.h -+header-y += getorder.h - header-y += int-l64.h - header-y += int-ll64.h - header-y += ioctl.h - header-y += ioctls.h - header-y += ipcbuf.h -+header-y += memory_model.h - header-y += mman-common.h - header-y += mman.h - header-y += msgbuf.h -+header-y += page.h - header-y += param.h - header-y += poll.h - header-y += posix_types.h -diff -Nur linux-3.4.4.orig/include/linux/Kbuild linux-3.4.4/include/linux/Kbuild ---- linux-3.4.4.orig/include/linux/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/include/linux/Kbuild 2012-07-18 07:38:03.000000000 +0200 -@@ -380,6 +380,7 @@ - header-y += un.h - header-y += unistd.h - header-y += usbdevice_fs.h -+header-y += user.h - header-y += utime.h - header-y += utsname.h - header-y += uvcvideo.h diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 98bb6f2b1..6345e239b 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -30,10 +30,6 @@ UCLIBCCFG=uclibc.config.big endif endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y) -UCLIBCCFG=uclibc.config.v32 -endif - ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) UCLIBCCFG=uclibc.config.little.mips64 endif |