From 0468f8daf112fe2a40fdf6671908a85b0414f1ca Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Thu, 9 Feb 2017 23:48:56 -0800
Subject: Allow one to select uclibceabi/uclibcgnueabi suffix

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index 7ac8a44..1b34855 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -95,3 +95,16 @@ config LIBC_UCLIBC_RPC
     prompt "Add support for RPC"
     help
       Enable support for remote procedure calls (RPC) in uClibc.
+
+if ARCH_arm
+config LIBC_UCLIBC_USE_GNU_SUFFIX
+    bool
+    default y
+    prompt "Use -uclibcgnueabi suffix"
+    help
+      Depending on where the resulting toolchain will be used, you may need
+      to tweak the "system" part of the target tuple. Buildroot prefers
+      to have arm-*-linux-uclibcgnueabi; OpenEmbedded prefers
+      arm-*-linux-uclibceabi. Other tools seem to either accept both, or
+      don't care about the suffix.
+endif
diff --git a/scripts/build/arch/arm.sh b/scripts/build/arch/arm.sh
index 182548e..eeffc7d 100644
--- a/scripts/build/arch/arm.sh
+++ b/scripts/build/arch/arm.sh
@@ -16,7 +16,7 @@ CT_DoArchTupleValues() {
     # The system part of the tuple:
     case "${CT_LIBC},${CT_ARCH_ARM_EABI}" in
         *glibc,y)   CT_TARGET_SYS=gnueabi;;
-        uClibc,y)   CT_TARGET_SYS=uclibcgnueabi;;
+        uClibc,y)   CT_TARGET_SYS=uclibc${CT_LIBC_UCLIBC_USE_GNU_SUFFIX:+gnu}eabi;;
         musl,y)     CT_TARGET_SYS=musleabi;;
         *,y)        CT_TARGET_SYS=eabi;;
     esac
-- 
cgit v0.10.2-6-g49f6