- pass the selected arm variant and ABI setting down to uClibc.

  Now does not prompt for the former entered arch variant and ABI setting anymore, but still does for USE_BX (should this be forced to y if supported?)
- TODO: add missing variants that are supported by uClibc to buildroot

toolchain/uClibc/uclibc.mk

@@ -97,11 +97,18 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.unpacked $(UCLIBC_CONFIG_FILE)
 		-e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
 		$(UCLIBC_DIR)/.config
 ifeq ($(UCLIBC_TARGET_ARCH),arm)
-	$(SED) 's,^.*CONFIG_$(shell echo $(BR2_ARM_TYPE)).*,CONFIG_$(shell echo $(BR2_ARM_TYPE))=y,g' \
-	$(UCLIBC_DIR)/.config
-endif
+	$(SED) '/.*CONFIG_ARM.*/d' -e '/.*CONFIG_GENERIC_ARM.*/d' \
+		 $(UCLIBC_DIR)/.config
+	/bin/echo "CONFIG_$(shell echo $(BR2_ARM_TYPE))=y" >> \
+		$(UCLIBC_DIR)/.config
 ifeq ($(BR2_ARM_EABI),y)
-	$(SED) 's,# CONFIG_ARM_EABI is not set,CONFIG_ARM_EABI=y,g' $(UCLIBC_DIR)/.config
+	/bin/echo "# CONFIG_ARM_OABI is not set" >> $(UCLIBC_DIR)/.config
+	/bin/echo "CONFIG_ARM_EABI=y" >> $(UCLIBC_DIR)/.config
+endif
+ifeq ($(BR2_ARM_OABI),y)
+	/bin/echo "CONFIG_ARM_OABI=y" >> $(UCLIBC_DIR)/.config
+	/bin/echo "# CONFIG_ARM_EABI is not set" >> $(UCLIBC_DIR)/.config
+endif
 endif
 ifneq ($(UCLIBC_TARGET_ENDIAN),)
 	$(SED) '/^# ARCH_$(UCLIBC_TARGET_ENDIAN)_ENDIAN /{s,# ,,;s, is not set,=y,g}' \