2
0
Эх сурвалжийг харах

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

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6292 c046a42c-6fe2-441c-8c8c-71466251a162
malc 16 жил өмнө
parent
commit
1eff7fbf11
2 өөрчлөгдсөн 5 нэмэгдсэн , 3 устгасан
  1. 2 2
      cache-utils.c
  2. 3 1
      cache-utils.h

+ 2 - 2
cache-utils.c

@@ -1,6 +1,6 @@
 #include "cache-utils.h"
 #include "cache-utils.h"
 
 
-#ifdef __powerpc__
+#ifdef HOST_PPC
 struct qemu_cache_conf qemu_cache_conf = {
 struct qemu_cache_conf qemu_cache_conf = {
     .dcache_bsize = 16,
     .dcache_bsize = 16,
     .icache_bsize = 16
     .icache_bsize = 16
@@ -68,4 +68,4 @@ void qemu_cache_utils_init(char **envp)
 }
 }
 #endif
 #endif
 
 
-#endif /* __powerpc__ */
+#endif /* HOST_PPC */

+ 3 - 1
cache-utils.h

@@ -1,7 +1,9 @@
 #ifndef QEMU_CACHE_UTILS_H
 #ifndef QEMU_CACHE_UTILS_H
 #define QEMU_CACHE_UTILS_H
 #define QEMU_CACHE_UTILS_H
 
 
-#ifdef __powerpc__
+#include "config-host.h"
+
+#ifdef HOST_PPC
 struct qemu_cache_conf {
 struct qemu_cache_conf {
     unsigned long dcache_bsize;
     unsigned long dcache_bsize;
     unsigned long icache_bsize;
     unsigned long icache_bsize;