[haiku-commits] haiku: hrev46634 - in headers: config build/config_build os/kernel
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 2 Jan 2014 07:43:25 +0100 (CET)
hrev46634 adds 1 changeset to branch 'master'
old head: 5e97cd45cfc4a27bd4c234b318f75aa0eadb766b
new head: f8da8f3477d3c18142e59d17d05a545982faa5a8
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=f8da8f3+%5E5e97cd4
----------------------------------------------------------------------------
f8da8f3: ARM: Be aware of ARMEL and ARMEL
* My BeagleBone gcc defines __ARMEL__ but not
__ARM__ which breaks the native tool builds
* As ARM was originally Little Endian, we assume
__ARM__ means as such.
* Look for Big Endian ARM and define the needed big
endian preprocessors
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46634
Commit: f8da8f3477d3c18142e59d17d05a545982faa5a8
URL: http://cgit.haiku-os.org/haiku/commit/?id=f8da8f3
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Thu Jan 2 06:41:02 2014 UTC
----------------------------------------------------------------------------
3 files changed, 12 insertions(+), 3 deletions(-)
headers/build/config_build/HaikuConfig.h | 6 +++++-
headers/config/HaikuConfig.h | 7 ++++++-
headers/os/kernel/OS.h | 2 +-
----------------------------------------------------------------------------
diff --git a/headers/build/config_build/HaikuConfig.h
b/headers/build/config_build/HaikuConfig.h
index 8d49522..d29158f 100644
--- a/headers/build/config_build/HaikuConfig.h
+++ b/headers/build/config_build/HaikuConfig.h
@@ -35,9 +35,13 @@
#elif __MIPSEL__
# define __HAIKU_ARCH mipsel
# define __HAIKU_ARCH_MIPSEL 1
-#elif __ARM__
+#elif __ARM__ || __ARMEL__
# define __HAIKU_ARCH arm
# define __HAIKU_ARCH_ARM 1
+#elif __ARMEB__
+# define __HAIKU_ARCH armeb
+# define __HAIKU_ARCH_ARM 1
+# define __HAIKU_BIG_ENDIAN 1
#else
# error Unsupported architecture!
#endif
diff --git a/headers/config/HaikuConfig.h b/headers/config/HaikuConfig.h
index c1dea0d..6648f53 100644
--- a/headers/config/HaikuConfig.h
+++ b/headers/config/HaikuConfig.h
@@ -47,10 +47,15 @@
# define __HAIKU_ARCH mipsel
# define __HAIKU_ARCH_ABI "mipsel"
# define __HAIKU_ARCH_MIPSEL 1
-#elif __ARM__
+#elif __ARM__ || __ARMEL__
# define __HAIKU_ARCH arm
# define __HAIKU_ARCH_ABI "arm"
# define __HAIKU_ARCH_ARM 1
+#elif __ARMEB__
+# define __HAIKU_ARCH armeb
+# define __HAIKU_ARCH_ABI "armeb"
+# define __HAIKU_ARCH_ARM 1
+# define __HAIKU_BIG_ENDIAN 1
#else
# error Unsupported architecture!
#endif
diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h
index 1b2e7f8..7b639a5 100644
--- a/headers/os/kernel/OS.h
+++ b/headers/os/kernel/OS.h
@@ -428,7 +428,7 @@ extern void ktrace_vprintf(const char
*format, va_list args);
# define B_MAX_CPU_COUNT 8
#elif __M68K__
# define B_MAX_CPU_COUNT 1
-#elif __ARM__
+#elif __ARM__ || __ARMEL__ || __ARMEB__
# define B_MAX_CPU_COUNT 1
#elif __MIPSEL__
# define B_MAX_CPU_COUNT 1
Other related posts:
- » [haiku-commits] haiku: hrev46634 - in headers: config build/config_build os/kernel - kallisti5
