summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-09-03 12:27:31 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-09-04 10:41:02 (GMT)
commitc276d17b7ca99100a9421e848516af02dd8c2b92 (patch)
tree86c67e36a2aea8f8e6916119fb190b0c52359320
parent5a37d2645d01d8f2aa3c001b99a745379eccb952 (diff)
downloadQt-c276d17b7ca99100a9421e848516af02dd8c2b92.zip
Qt-c276d17b7ca99100a9421e848516af02dd8c2b92.tar.gz
Qt-c276d17b7ca99100a9421e848516af02dd8c2b92.tar.bz2
Add PLATFORM(HPUX) and COMPILER(ACC) defines, for HP-UX support.
Also add PLATFORM(IA64) and PLATFORM(HPPA), though we don't use them and probably don't need. Just in case. Conflicts: src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
index 12af356..a4b249b 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -301,6 +301,30 @@
#define WTF_PLATFORM_BIG_ENDIAN 1
#endif
+/* PLATFORM(HPPA) */
+/* a.k.a. PA-RISC */
+#if defined(__hppa) || defined(__hppa__)
+#define WTF_PLATFORM_HPPA 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
+
+/* PLATFORM(IA64) */
+/* a.k.a. Itanium Processor Family, IPF */
+#if defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
+#define WTF_PLATFORM_IA64 1
+
+/* Itanium can be both big- and little-endian
+ we need to determine at compile time which one it is.
+ - HP's aCC compiler only compiles big-endian (so HP-UXi is always big-endian)
+ - GCC defines __BIG_ENDIAN__ for us (default on HP-UX)
+ - Linux is usually little-endian
+ - I've never seen AIX or Windows on IA-64, but they should be little-endian too
+*/
+#if defined(__BIG_ENDIAN__) || defined(__HP_aCC)
+# define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
+#endif
+
/* PLATFORM(WINCE) && PLATFORM(QT)
We can not determine the endianess at compile time. For
Qt for Windows CE the endianess is specified in the