Support powerpc with GCC that defines __PPC__ but not __powerpc__.

	* config.h.in (__powerpc__) [__PPC__ && !__powerpc__]: New definition.
	* grub-core/lib/setjmp.S: Treat __PPC__ as equivalent to __powerpc__.

diff --git a/ChangeLog b/ChangeLog
index 0103927a6583d7c3627dbf09df7e00ee338df7bd..eb86e5d693aa67bd9945b4b96c99f8250bf0d3b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Support powerpc with GCC that defines __PPC__ but not __powerpc__.
+
+       * config.h.in (__powerpc__) [__PPC__ && !__powerpc__]: New definition.
+       * grub-core/lib/setjmp.S: Treat __PPC__ as equivalent to __powerpc__.
+
 2012-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/datetime.h (grub_get_datetime_cmos): Don't define in

diff --git a/config.h.in b/config.h.in
index 39b8fbafd56be53cc1371404480fb1a0d87dd32e..d6a1db31a689e1f4b398eaffd7b460639de3cd66 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -2,6 +2,9 @@
 #undef _FILE_OFFSET_BITS
 #define _LARGEFILE_SOURCE
 #define _FILE_OFFSET_BITS 64
+#if defined(__PPC__) && !defined(__powerpc__)
+#define __powerpc__ 1
+#endif
 #if defined (GRUB_UTIL) || !defined (GRUB_MACHINE)
 #include <config-util.h>
 #define NESTED_FUNC_ATTR

diff --git a/grub-core/lib/setjmp.S b/grub-core/lib/setjmp.S
index fb7f94767dc51d9f1a0a7a3cf9681ec8841561ff..2e4974297aab762eca64abe6328efc34073ad90a 100644 (file)
--- a/grub-core/lib/setjmp.S
+++ b/grub-core/lib/setjmp.S
@@ -6,7 +6,7 @@
 #include "./sparc64/setjmp.S"
 #elif defined(__mips__)
 #include "./mips/setjmp.S"
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) || defined(__PPC__)
 #include "./powerpc/setjmp.S"
 #elif defined(__ia64__)
 #include "./ia64/setjmp.S"