summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-11 09:57:21 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-11 09:57:21 +0200
commitc2b8e42bf1d6a4e52ad27ba0ff50738227f7b52a (patch)
treeefbb779abe366f10a97c6888b226e30b4c344586 /toolchain
parent19306d1b1074060ff78680fc91de6d08a1897471 (diff)
parent4538623684f2f6b381afb7bfce8ac5dd39161ef9 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/eglibc/Makefile11
-rw-r--r--toolchain/eglibc/Makefile.multilib4
-rw-r--r--toolchain/kernel-headers/patches/3.4.13/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.4.9/aufs2.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.13/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.4.9/cleankernel.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.13/etrax-header.patch (renamed from toolchain/kernel-headers/patches/3.4.9/etrax-header.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.13/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/3.4.9/linux-gcc-check.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.13/microperl.patch (renamed from toolchain/kernel-headers/patches/3.4.9/microperl.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.13/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.4.9/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.13/relocs.patch (renamed from toolchain/kernel-headers/patches/3.4.9/relocs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.5.6/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.5.4/aufs2.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.5.6/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.5.4/cleankernel.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.5.6/etrax-header.patch (renamed from toolchain/kernel-headers/patches/3.5.4/etrax-header.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.5.6/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/3.5.4/linux-gcc-check.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.5.6/microperl.patch (renamed from toolchain/kernel-headers/patches/3.5.4/microperl.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.5.6/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.5.4/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.5.6/relocs.patch (renamed from toolchain/kernel-headers/patches/3.5.4/relocs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.5.6/sortext.patch (renamed from toolchain/kernel-headers/patches/3.5.4/sortext.patch)0
17 files changed, 10 insertions, 5 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 13c28c8a2..3bc55ad15 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -48,7 +48,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
$(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
); \
touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs.h; \
- touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs-{32,x32,64}.h; \
+ touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h; \
done
touch $@
else
@@ -76,7 +76,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
$(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
);
touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
- touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+ touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h
touch $@
endif
@@ -118,7 +118,12 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
# default libgcc searching for 64 bit libraries
${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-64 install_root=$(STAGING_TARGET_DIR) install
touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
- touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+ touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h
+ # for libgcc build we need C library files, 64 bit default
+ mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2 ; \
+ $(CP) $(STAGING_TARGET_DIR)-64/lib/* $(STAGING_TARGET_DIR)-64/usr/lib/* \
+ $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/; \
+ rm $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/libc.so ; \
for abi in $(TABI); do \
mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \
$(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/* $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/lib/* \
diff --git a/toolchain/eglibc/Makefile.multilib b/toolchain/eglibc/Makefile.multilib
index 6416bc006..825f5d63d 100644
--- a/toolchain/eglibc/Makefile.multilib
+++ b/toolchain/eglibc/Makefile.multilib
@@ -28,10 +28,10 @@ endif
endif
ifeq ($(ADK_TARGET_MULTILIB_MIPS_O32),y)
ifeq ($(ADK_KERNEL_CPU_LITTLE_ENDIAN),y)
-TABI+=mips64el-openadk-linux-gnu:o32
+TABI+=mips64el-openadk-linux-gnu:32
TCFLAGS:=-mabi=
else
-TABI+=mips64-openadk-linux-gnu:o32
+TABI+=mips64-openadk-linux-gnu:32
TCFLAGS:=-mabi=
endif
endif
diff --git a/toolchain/kernel-headers/patches/3.4.9/aufs2.patch b/toolchain/kernel-headers/patches/3.4.13/aufs2.patch
index d40c9a3fe..d40c9a3fe 100644
--- a/toolchain/kernel-headers/patches/3.4.9/aufs2.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/aufs2.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/cleankernel.patch b/toolchain/kernel-headers/patches/3.4.13/cleankernel.patch
index f8d5448ee..f8d5448ee 100644
--- a/toolchain/kernel-headers/patches/3.4.9/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/etrax-header.patch b/toolchain/kernel-headers/patches/3.4.13/etrax-header.patch
index 559c0f322..559c0f322 100644
--- a/toolchain/kernel-headers/patches/3.4.9/etrax-header.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/etrax-header.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.4.13/linux-gcc-check.patch
index 7cc381845..7cc381845 100644
--- a/toolchain/kernel-headers/patches/3.4.9/linux-gcc-check.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/linux-gcc-check.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/microperl.patch b/toolchain/kernel-headers/patches/3.4.13/microperl.patch
index 44c39f6e8..44c39f6e8 100644
--- a/toolchain/kernel-headers/patches/3.4.9/microperl.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/microperl.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/mkpiggy.patch b/toolchain/kernel-headers/patches/3.4.13/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.4.9/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/relocs.patch b/toolchain/kernel-headers/patches/3.4.13/relocs.patch
index 43c5bb580..43c5bb580 100644
--- a/toolchain/kernel-headers/patches/3.4.9/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/relocs.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/aufs2.patch b/toolchain/kernel-headers/patches/3.5.6/aufs2.patch
index d40c9a3fe..d40c9a3fe 100644
--- a/toolchain/kernel-headers/patches/3.5.4/aufs2.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/aufs2.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/cleankernel.patch b/toolchain/kernel-headers/patches/3.5.6/cleankernel.patch
index f8d5448ee..f8d5448ee 100644
--- a/toolchain/kernel-headers/patches/3.5.4/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/etrax-header.patch b/toolchain/kernel-headers/patches/3.5.6/etrax-header.patch
index 03d19a9ab..03d19a9ab 100644
--- a/toolchain/kernel-headers/patches/3.5.4/etrax-header.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/etrax-header.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.5.6/linux-gcc-check.patch
index 7cc381845..7cc381845 100644
--- a/toolchain/kernel-headers/patches/3.5.4/linux-gcc-check.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/linux-gcc-check.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/microperl.patch b/toolchain/kernel-headers/patches/3.5.6/microperl.patch
index 44c39f6e8..44c39f6e8 100644
--- a/toolchain/kernel-headers/patches/3.5.4/microperl.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/microperl.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/mkpiggy.patch b/toolchain/kernel-headers/patches/3.5.6/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.5.4/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/relocs.patch b/toolchain/kernel-headers/patches/3.5.6/relocs.patch
index 43c5bb580..43c5bb580 100644
--- a/toolchain/kernel-headers/patches/3.5.4/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/relocs.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/sortext.patch b/toolchain/kernel-headers/patches/3.5.6/sortext.patch
index d82b76a2d..d82b76a2d 100644
--- a/toolchain/kernel-headers/patches/3.5.4/sortext.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/sortext.patch