diff options
| author | Phil Edworthy <PHIL.EDWORTHY@renesas.com> | 2011-05-09 14:12:53 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-07-18 23:26:12 +0200 |
| commit | d5247aa842274348de4ed928a062d0027feb87d7 (patch) | |
| tree | 68729b31357d3662618295209b3f95ac03e591c7 /toolchain | |
| parent | b8ee6635ed6339e2676f64903d0c079cdd968c3c (diff) | |
| download | buildroot-novena-d5247aa842274348de4ed928a062d0027feb87d7.tar.gz buildroot-novena-d5247aa842274348de4ed928a062d0027feb87d7.zip | |
sh: Fix Buildroot sh targets to match gnuconfig targets
sh2eb and sh2a_nofpueb gnuconfig targets are no longer supported
in Buildroot. This patch replaces these Buildroot targets with sh2
and sh2a respectively, and adds sh4a targets as these are widely
used.
To build for devices without an fpu, the relevant toolchain flags
will have to be specified.
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'toolchain')
| -rwxr-xr-x | toolchain/elf2flt/elf2flt/config.sub | 8 | ||||
| -rw-r--r-- | toolchain/toolchain-external/Config.in | 4 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/toolchain/elf2flt/elf2flt/config.sub b/toolchain/elf2flt/elf2flt/config.sub index 4279c8491..20724573d 100755 --- a/toolchain/elf2flt/elf2flt/config.sub +++ b/toolchain/elf2flt/elf2flt/config.sub @@ -262,7 +262,7 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b \ @@ -342,8 +342,8 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* \ + | sheb-* | shbe-* | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ @@ -1097,7 +1097,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele) basic_machine=sh-unknown ;; sh64) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 22cee5359..5222702e1 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -139,7 +139,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009 bool "CodeSoucery SH 2010.09" - depends on BR2_sh4 || BR2_sh4eb + depends on BR2_sh4a || BR2_sh4aeb select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP help @@ -154,7 +154,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009 bool "CodeSoucery SH 2010.09" - depends on BR2_sh2a_nofpueb || BR2_sh2eb + depends on BR2_sh2a select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP help diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 19256bb90..3173ef4bb 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -182,14 +182,14 @@ ifeq ($(UCLIBC_TARGET_ARCH),sh) /bin/echo "# CONFIG_SH2 is not set" >> $(UCLIBC_DIR)/.oldconfig /bin/echo "# CONFIG_SH3 is not set" >> $(UCLIBC_DIR)/.oldconfig /bin/echo "# CONFIG_SH4 is not set" >> $(UCLIBC_DIR)/.oldconfig -ifeq ($(BR2_sh2a_nofpueb),y) +ifeq ($(BR2_sh2a),y) $(SED) 's,# CONFIG_SH2A is not set,CONFIG_SH2A=y,g' $(UCLIBC_DIR)/.oldconfig /bin/echo "# UCLIBC_FORMAT_FDPIC_ELF is not set" >> $(UCLIBC_DIR)/.oldconfig /bin/echo "# UCLIBC_FORMAT_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig /bin/echo "# UCLIBC_FORMAT_FLAT_SEP_DATA is not set" >> $(UCLIBC_DIR)/.oldconfig /bin/echo "# UCLIBC_FORMAT_SHARED_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig endif -ifeq ($(BR2_sh2eb),y) +ifeq ($(BR2_sh2),y) $(SED) 's,# CONFIG_SH2 is not set,CONFIG_SH2=y,g' $(UCLIBC_DIR)/.oldconfig /bin/echo "# UCLIBC_FORMAT_FDPIC_ELF is not set" >> $(UCLIBC_DIR)/.oldconfig /bin/echo "# UCLIBC_FORMAT_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig |