diff options
| -rw-r--r-- | mk/build.mk | 5 | ||||
| -rwxr-xr-x | scripts/create-sys | 6 | ||||
| -rw-r--r-- | target/arm/sys-available/toolchain-arm | 5 | ||||
| -rw-r--r-- | target/arm/sys-available/toolchain-armeb | 11 | ||||
| -rw-r--r-- | target/config/Config.in | 16 | ||||
| -rw-r--r-- | target/mips/sys-available/toolchain-mips | 3 | ||||
| -rw-r--r-- | target/mips/sys-available/toolchain-mipsel | 9 | ||||
| -rw-r--r-- | target/tarch.lst | 11 | ||||
| -rw-r--r-- | toolchain/uClibc/patches/ld64.patch | 12 |
9 files changed, 54 insertions, 24 deletions
diff --git a/mk/build.mk b/mk/build.mk index 66a081e97..8dbd321d2 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -498,13 +498,14 @@ bulktoolchain: mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \ ( \ echo === building $$arch $$libc toolchain-$$arch on $$(date); \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##"); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ + $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/toolchain_$${arch}_$${libc}/build.log; \ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ - done <${TOPDIR}/target/arch.lst ;\ + done <${TOPDIR}/target/tarch.lst ;\ done # build all target architecture, target systems and libc combinations diff --git a/scripts/create-sys b/scripts/create-sys index 6e61e017c..ffa0ed70f 100755 --- a/scripts/create-sys +++ b/scripts/create-sys @@ -3,11 +3,11 @@ topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd systems=$(grep -h config target/*/sys-available/*|cut -d " " -f 2) while read arch; do - count=1 + count=0 + rm -rf $topdir/target/$arch/sys-enabled && mkdir -p $topdir/target/$arch/sys-enabled && cd $topdir/target/$arch/sys-enabled && - ln -sf ../sys-available/toolchain-$arch 0-toolchain-$arch - for i in $(ls $topdir/target/$arch/sys-available/|grep -v toolchain);do + for i in $(ls $topdir/target/$arch/sys-available/);do cd $topdir/target/$arch/sys-enabled/ && ln -sf ../sys-available/$i $count-$i count=$((count+1)) diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index a5e31c711..ade935950 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -1,10 +1,11 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM - bool "Toolchain only" + bool "Toolchain only (little endian)" select ADK_arm select ADK_toolchain_arm + select ADK_little select ADK_TOOLCHAIN select ADK_EABI select ADK_TARGET_NO_FPU help - ARM toolchain. + ARM toolchain (little endian). diff --git a/target/arm/sys-available/toolchain-armeb b/target/arm/sys-available/toolchain-armeb new file mode 100644 index 000000000..8a99ca78a --- /dev/null +++ b/target/arm/sys-available/toolchain-armeb @@ -0,0 +1,11 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB + bool "Toolchain only (big endian)" + select ADK_arm + select ADK_toolchain_armeb + select ADK_big + select ADK_TOOLCHAIN + select ADK_EABI + select ADK_TARGET_NO_FPU + help + ARM toolchain (big endian). + diff --git a/target/config/Config.in b/target/config/Config.in index 8697f337e..c1feb7053 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -30,22 +30,6 @@ config ADK_TOOLCHAIN_ARCHIVE endchoice choice -prompt "Target Endianess" -depends on (ADK_LINUX_ARM || ADK_LINUX_MIPS) && ADK_TOOLCHAIN -config ADK_ENDIAN - boolean "Choose target endianess" - -config ADK_TARGET_LITTLE_ENDIAN - boolean "Little endian" - select ADK_little - -config ADK_TARGET_BIG_ENDIAN - boolean "Big endian" - select ADK_big - -endchoice - -choice prompt "Target Kernel" depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_TARGET_KERNEL diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips index d07306ee8..783d71fa0 100644 --- a/target/mips/sys-available/toolchain-mips +++ b/target/mips/sys-available/toolchain-mips @@ -1,6 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS - bool "Toolchain only" + bool "Toolchain only (big endian)" select ADK_mips + select ADK_big select ADK_toolchain_mips select ADK_TOOLCHAIN help diff --git a/target/mips/sys-available/toolchain-mipsel b/target/mips/sys-available/toolchain-mipsel new file mode 100644 index 000000000..7eb9a743f --- /dev/null +++ b/target/mips/sys-available/toolchain-mipsel @@ -0,0 +1,9 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL + bool "Toolchain only (little endian)" + select ADK_mips + select ADK_little + select ADK_toolchain_mipsel + select ADK_TOOLCHAIN + help + MIPS toolchain. + diff --git a/target/tarch.lst b/target/tarch.lst new file mode 100644 index 000000000..16d0f0d69 --- /dev/null +++ b/target/tarch.lst @@ -0,0 +1,11 @@ +arm +armeb +cris +mips +mipsel +ppc +ppc64 +sparc +sparc64 +x86 +x86_64 diff --git a/toolchain/uClibc/patches/ld64.patch b/toolchain/uClibc/patches/ld64.patch new file mode 100644 index 000000000..2a9cc22b3 --- /dev/null +++ b/toolchain/uClibc/patches/ld64.patch @@ -0,0 +1,12 @@ +diff -Nur uClibc-0.9.32-rc3.orig/Rules.mak uClibc-0.9.32-rc3/Rules.mak +--- uClibc-0.9.32-rc3.orig/Rules.mak 2011-03-16 20:11:13.000000000 +0100 ++++ uClibc-0.9.32-rc3/Rules.mak 2011-05-08 21:55:43.986610132 +0200 +@@ -120,7 +120,7 @@ + SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) + UBACKTRACE_DSO := libubacktrace.so.$(MAJOR_VERSION) + ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) +-UCLIBC_LDSO_NAME := ld64-uClibc ++UCLIBC_LDSO_NAME := ld-uClibc + ARCH_NATIVE_BIT := 64 + else + UCLIBC_LDSO_NAME := ld-uClibc |