diff options
| author | Anssi Hannula <anssi@mandriva.org> | 2010-01-24 11:45:37 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mandriva.org> | 2010-01-24 11:45:37 +0000 |
| commit | 9bb5ff20f343fd212c521b47fc84d0099696e7da (patch) | |
| tree | 4d1b2b1dfd528aafdbf302f6e14065f36d992256 | |
| parent | 5d1702d2f54b3e60e095555eb978e4de8572b2be (diff) | |
| download | multiarch-utils-9bb5ff20f343fd212c521b47fc84d0099696e7da.tar multiarch-utils-9bb5ff20f343fd212c521b47fc84d0099696e7da.tar.gz multiarch-utils-9bb5ff20f343fd212c521b47fc84d0099696e7da.tar.bz2 multiarch-utils-9bb5ff20f343fd212c521b47fc84d0099696e7da.tar.xz multiarch-utils-9bb5ff20f343fd212c521b47fc84d0099696e7da.zip | |
add armel support (from Arnaud Patard)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | multiarch-dispatch.h | 14 | ||||
| -rwxr-xr-x | multiarch-platform | 2 |
3 files changed, 16 insertions, 1 deletions
@@ -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 |