From 9bb5ff20f343fd212c521b47fc84d0099696e7da Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mandriva.org>
Date: Sun, 24 Jan 2010 11:45:37 +0000
Subject: add armel support (from Arnaud Patard)

---
 NEWS                 |  1 +
 multiarch-dispatch.h | 14 ++++++++++++++
 multiarch-platform   |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 4e7d186..fc87b9e 100644
--- a/NEWS
+++ b/NEWS
@@ -2,3 +2,4 @@
 - fix broken sparc64 check (from Per Øyvind Karlsen, #27277)
 - fix broken check for rpm/macros.d directory (from Per Øyvind Karlsen)
 - add mips support (from Arnaud Patard)
+- add armel support (from Arnaud Patard)
diff --git a/multiarch-dispatch.h b/multiarch-dispatch.h
index e253410..51d724a 100644
--- a/multiarch-dispatch.h
+++ b/multiarch-dispatch.h
@@ -15,6 +15,10 @@
 #undef	mips
 #define	_multiarch_defined_mips
 #endif
+#ifdef	arm
+#undef	arm
+#define	_multiarch_defined_arm
+#endif
 
 /* Dispatch arch dependent header */
 #if defined(__linux__)
@@ -47,6 +51,12 @@
 #else
 #include _MULTIARCH_MAKE_HEADER(mipsel,_MULTIARCH_HEADER)
 #endif
+#elif defined(__arm__)
+#if defined(__BIG_ENDIAN__)
+#include _MULTIARCH_MAKE_HEADER(armeb,_MULTIARCH_HEADER)
+#else
+#include _MULTIARCH_MAKE_HEADER(arm,_MULTIARCH_HEADER)
+#endif
 #else
 #error "Unknown architecture, please submit bug report"
 #endif
@@ -71,3 +81,7 @@
 #undef  _multiarch_defined_mips
 #define mips 1
 #endif
+#ifdef  _multiarch_defined_arm
+#undef  _multiarch_defined_arm
+#define arm 1
+#endif
diff --git a/multiarch-platform b/multiarch-platform
index 00df2fa..f46916f 100755
--- a/multiarch-platform
+++ b/multiarch-platform
@@ -5,7 +5,7 @@ le=$?
 case $arch in
 i?86) arch=i386;;
 mips*) [ $le -eq 1 ] && arch="$arch"el ;;
-arm) [ $le -eq 0 ] && arch="$arch"eb ;;
+arm*) [ $le -eq 0 ] && arch="armeb" || arch="arm" ;;
 esac
 os=`uname -s`
 case $os in
-- 
cgit v1.2.1