From f6b01572348ae44c7cc9a2b7433b7099b2ce7b6a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 9 Jan 2010 18:30:34 +0100
Subject: libc/uClibc: do not mangle ARM {E,O}ABI when ARCH != ARM

(manualy transplanted from 2ad2cbc1f709f48a195746476a71f1244cc67cee)
(transplanted from 2ad2cbc1f709f48a195746476a71f1244cc67cee))

diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index 1465e01..f441f14 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -198,17 +198,19 @@ s/.*(DOSTRIP).*/# \\1 is not set/
 ENDSED
 
     # Ah. We may one day need architecture-specific handler here...
-    # Hack the ARM {E,O}ABI into the config file
-    if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
-        cat >>"${munge_file}" <<-ENDSED
+    if [ "${CT_ARCH}" = "arm" ]; then
+        # Hack the ARM {E,O}ABI into the config file
+        if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
+            cat >>"${munge_file}" <<-ENDSED
 s/.*(CONFIG_ARM_OABI).*/# \\1 is not set/
 s/.*(CONFIG_ARM_EABI).*/\\1=y/
 ENDSED
-    else
-        cat >>"${munge_file}" <<-ENDSED
+        else
+            cat >>"${munge_file}" <<-ENDSED
 s/.*(CONFIG_ARM_OABI).*/\\1=y/
 s/.*(CONFIG_ARM_EABI).*/# \\1 is not set/
 ENDSED
+        fi
     fi
 
     # Accomodate for old and new uClibc versions, where the
-- 
cgit v0.10.2-6-g49f6