summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/patches/4.7.3/musl-cris.patch11
-rw-r--r--toolchain/kernel-headers/Makefile24
-rw-r--r--toolchain/kernel-headers/patches/3.9.11/cris-header.patch27
3 files changed, 38 insertions, 24 deletions
diff --git a/toolchain/gcc/patches/4.7.3/musl-cris.patch b/toolchain/gcc/patches/4.7.3/musl-cris.patch
new file mode 100644
index 000000000..4889263a1
--- /dev/null
+++ b/toolchain/gcc/patches/4.7.3/musl-cris.patch
@@ -0,0 +1,11 @@
+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 8b364d760..4346cb1a6 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -10,30 +10,6 @@ $(WRKBUILD)/.headers:
$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
INSTALL_HDR_PATH=$(STAGING_DIR)/usr \
headers_install
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-ifeq ($(ADK_LINUX_MIPS),y)
- $(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=mips V=1 \
- INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)-n32/usr \
- headers_install
- $(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=mips V=1 \
- INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)-64/usr \
- headers_install
- $(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=mips V=1 \
- INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)-o32/usr \
- headers_install
-endif
-ifeq ($(ADK_LINUX_X86_64),y)
- $(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=x86 V=1 \
- INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)-32/usr \
- headers_install
- $(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=x86 V=1 \
- INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)-x32/usr \
- headers_install
- $(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=x86 V=1 \
- INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)-64/usr \
- headers_install
-endif
-endif
$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
INSTALL_HDR_PATH=$(LINUX_HEADER_DIR) \
headers_install
diff --git a/toolchain/kernel-headers/patches/3.9.11/cris-header.patch b/toolchain/kernel-headers/patches/3.9.11/cris-header.patch
new file mode 100644
index 000000000..d00768ca4
--- /dev/null
+++ b/toolchain/kernel-headers/patches/3.9.11/cris-header.patch
@@ -0,0 +1,27 @@
+diff -Nur linux-3.9.11.orig/arch/cris/include/asm/Kbuild linux-3.9.11/arch/cris/include/asm/Kbuild
+--- linux-3.9.11.orig/arch/cris/include/asm/Kbuild 2013-07-21 02:16:17.000000000 +0200
++++ linux-3.9.11/arch/cris/include/asm/Kbuild 2013-10-11 21:26:30.000000000 +0200
+@@ -1,7 +1,6 @@
+
+-header-y += arch-v10/
+-header-y += arch-v32/
+-
++header-y += ../arch-v10/arch/
++header-y += ../arch-v32/arch/
+
+ generic-y += clkdev.h
+ generic-y += exec.h
+diff -Nur linux-3.9.11.orig/arch/cris/include/uapi/asm/Kbuild linux-3.9.11/arch/cris/include/uapi/asm/Kbuild
+--- linux-3.9.11.orig/arch/cris/include/uapi/asm/Kbuild 2013-07-21 02:16:17.000000000 +0200
++++ linux-3.9.11/arch/cris/include/uapi/asm/Kbuild 2013-10-11 21:32:52.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