From 86c31b90a20030e21d358c115ce8de11ef7383f1 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sun, 26 Aug 2007 20:55:02 +0000 Subject: - improve handling of sh (fgretief) for bug #1446 --- toolchain/uClibc/uclibc.mk | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index aa267016e..60ee758b1 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -73,7 +73,7 @@ UCLIBC_TARGET_ENDIAN:=$(shell $(SHELL) -c "echo $(ARCH) | sed \ -e 's/arm/LITTLE/' \ -e 's/mipsel/LITTLE/' \ -e 's/mips/BIG/' \ - -e 's/sh[234]eb/BIG/' \ + -e 's/sh[234].*eb/BIG/' \ -e 's/sh[234]/LITTLE/' \ ") @@ -146,6 +146,38 @@ ifeq ($(BR2_ARM_OABI),y) /bin/echo "# CONFIG_ARM_EABI is not set" >> $(UCLIBC_DIR)/.oldconfig endif endif +ifeq ($(UCLIBC_TARGET_ARCH),sh) + /bin/echo "# CONFIG_SH2A is not set" >> $(UCLIBC_DIR)/.oldconfig + /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) + $(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) + $(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 + /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_sh3eb),y) + $(SED) 's,# CONFIG_SH3 is not set,CONFIG_SH3=y,g' $(UCLIBC_DIR)/.oldconfig +endif +ifeq ($(BR2_sh3),y) + $(SED) 's,# CONFIG_SH3 is not set,CONFIG_SH3=y,g' $(UCLIBC_DIR)/.oldconfig +endif +ifeq ($(BR2_sh4eb),y) + $(SED) 's,# CONFIG_SH4 is not set,CONFIG_SH4=y,g' $(UCLIBC_DIR)/.oldconfig +endif +ifeq ($(BR2_sh4),y) + $(SED) 's,# CONFIG_SH4 is not set,CONFIG_SH4=y,g' $(UCLIBC_DIR)/.oldconfig +endif +endif ifneq ($(UCLIBC_TARGET_ENDIAN),) # The above doesn't work for me, so redo $(SED) 's/.*\(ARCH_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN\).*/# \1 is not set/g' \ -- cgit v1.2.3