Re: [Qemu-devel] [6292] Do not rely on __powerpc__ being defined as a feature test macro

[C . W . Betts]

That fixes compilation on PowerPC, but it breaks PowerPC 64

On Jan 13, 2009, at 4:12 PM, malc wrote:

Revision: 6292
         http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6292
Author:   malc
Date:     2009-01-13 23:12:34 +0000 (Tue, 13 Jan 2009)

Log Message:
-----------
Do not rely on __powerpc__ being defined as a feature test macro

__powerpc__ is not defined on AIX and Darwin, Makefile.target adds
it to CPPFLAGS for target specific code which cache-utils are not.

Since there's not common definition which can safely be used on all
platforms use HOST_PPC provided by config-host.h

The problem was originally reported by C. W. Betts

Modified Paths:
--------------
   trunk/cache-utils.c
   trunk/cache-utils.h

Modified: trunk/cache-utils.c
===================================================================
--- trunk/cache-utils.c 2009-01-13 21:09:18 UTC (rev 6291)
+++ trunk/cache-utils.c 2009-01-13 23:12:34 UTC (rev 6292)
@@ -1,6 +1,6 @@
#include "cache-utils.h"

-#ifdef __powerpc__
+#ifdef HOST_PPC
struct qemu_cache_conf qemu_cache_conf = {
    .dcache_bsize = 16,
    .icache_bsize = 16
@@ -68,4 +68,4 @@
}
#endif

-#endif /* __powerpc__ */
+#endif /* HOST_PPC */

Modified: trunk/cache-utils.h
===================================================================
--- trunk/cache-utils.h 2009-01-13 21:09:18 UTC (rev 6291)
+++ trunk/cache-utils.h 2009-01-13 23:12:34 UTC (rev 6292)
@@ -1,7 +1,9 @@
#ifndef QEMU_CACHE_UTILS_H
#define QEMU_CACHE_UTILS_H

-#ifdef __powerpc__
+#include "config-host.h"
+
+#ifdef HOST_PPC
struct qemu_cache_conf {
    unsigned long dcache_bsize;
    unsigned long icache_bsize;