From 49a9d32beca9521aa0ffe26f53fc98c009721c23 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 12 Jan 2009 15:21:25 +0100 Subject: [PATCH] fix mips32r2 setting Pull r24795 from svn (thanks jacmet) --- toolchain/uClibc/uclibc.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index f8a73d6..3a48d9b 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -170,6 +170,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),mips) /bin/echo "# CONFIG_MIPS_ISA_3 is not set"; \ /bin/echo "# CONFIG_MIPS_ISA_4 is not set"; \ /bin/echo "# CONFIG_MIPS_ISA_MIPS32 is not set"; \ + /bin/echo "# CONFIG_MIPS_ISA_MIPS32R2 is not set"; \ /bin/echo "# CONFIG_MIPS_ISA_MIPS64 is not set"; \ ) >> $(UCLIBC_DIR)/.oldconfig ifeq ($(BR2_MIPS_OABI32),y) @@ -194,10 +195,10 @@ ifeq ($(BR2_mips_4),y) $(SED) 's/.*\(CONFIG_MIPS_ISA_4\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig endif ifeq ($(BR2_mips_32),y) - $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig + $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\)[^R].*/\1=y/' $(UCLIBC_DIR)/.oldconfig endif ifeq ($(BR2_mips_32r2),y) - $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig + $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32R2\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig endif ifeq ($(BR2_mips_64),y) $(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig -- 2.11.4.GIT