diff options
| author | Andreas Färber <andreas.faerber@web.de> | 2014-02-10 15:26:53 +0100 |
|---|---|---|
| committer | Andreas Färber <andreas.faerber@web.de> | 2014-03-02 18:03:06 +0100 |
| commit | e9829b5584169ad14df2ca8776b87f4985aa9f06 (patch) | |
| tree | 4f565d84c19fec69ef097605f987ae87dd365826 | |
| parent | 7add40facbbba5580745bdb2337c56ee56514eea (diff) | |
| download | qemu-openhackware-e9829b5584169ad14df2ca8776b87f4985aa9f06.tar.gz | |
Complement __powerpc__ with _ARCH_PPC
__powerpc__ does not seem to be defined in recent gcc versions.
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
| -rw-r--r-- | src/libc/include/endian.h | 2 | ||||
| -rw-r--r-- | src/libc/include/stdint.h | 4 | ||||
| -rw-r--r-- | src/libc/src/malloc.c | 2 | ||||
| -rw-r--r-- | src/libpart/isofs.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/libc/include/endian.h b/src/libc/include/endian.h index 87fc546..d0ec797 100644 --- a/src/libc/include/endian.h +++ b/src/libc/include/endian.h @@ -90,7 +90,7 @@ static inline void generic_cpu_swap64p_32 (uint64_t *outp, uint64_t in) #define __CPU_ENDIAN_4321__ #define __CPU_LENGTH_64__ -#elif defined (__powerpc__) +#elif defined (__powerpc__) || defined (_ARCH_PPC) #define __CPU_ENDIAN_1234__ #define __CPU_LENGTH_32__ diff --git a/src/libc/include/stdint.h b/src/libc/include/stdint.h index 1bf62b4..1efd3b3 100644 --- a/src/libc/include/stdint.h +++ b/src/libc/include/stdint.h @@ -44,7 +44,7 @@ typedef signed int int32_t; typedef unsigned long uint64_t; typedef signed long int64_t; -#elif defined (__powerpc__) +#elif defined (__powerpc__) || defined (_ARCH_PPC) typedef unsigned char uint8_t; typedef signed char int8_t; @@ -55,7 +55,7 @@ typedef signed int int32_t; typedef unsigned long long uint64_t; typedef signed long long int64_t; -#elif defined (__powerpc64__) +#elif defined (__powerpc64__) || defined (_ARCH_PPC64) typedef unsigned char uint8_t; typedef signed char int8_t; diff --git a/src/libc/src/malloc.c b/src/libc/src/malloc.c index 19eb2b2..14bd8e5 100644 --- a/src/libc/src/malloc.c +++ b/src/libc/src/malloc.c @@ -45,7 +45,7 @@ void page_put (void *addr, int nb_pages); #define NATURAL_ALIGN_BITS 2 #define PAGE_BITS 12 #define __32_BITS 1 -#elif defined (__powerpc__) +#elif defined (__powerpc__) || defined (_ARCH_PPC) #define NATURAL_ALIGN_BITS 2 #define PAGE_BITS 12 #define __32_BITS 1 diff --git a/src/libpart/isofs.c b/src/libpart/isofs.c index bbf8a50..6e0adae 100644 --- a/src/libpart/isofs.c +++ b/src/libpart/isofs.c @@ -176,7 +176,7 @@ part_t *isofs_probe_partitions (bloc_device_t *bd) ERROR("ISO catalog not for x86: %d\n", valid->arch); continue; } -#elif defined (__powerpc__) +#elif defined (__powerpc__) || defined (_ARCH_PPC) if (valid->arch != ISOBOOT_PPC && valid->arch != ISOBOOT_MAC) { ERROR("ISO catalog not for PPC: %d\n", valid->arch); continue; |