Commit 86c31b90 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- improve handling of sh (fgretief) for bug #1446

parent d3361c66

toolchain/uClibc/uclibc.mk

+33 −1
Original line number Diff line number Diff line
@@ -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' \