]>
Commit | Line | Data |
---|---|---|
d0a310a7 PS |
1 | --- qemu-0.6.0/softmmu_header.h.orig 2004-07-10 20:20:09.000000000 +0200 |
2 | +++ qemu-0.6.0/softmmu_header.h 2004-10-16 14:48:12.804616248 +0200 | |
3 | @@ -77,12 +77,15 @@ | |
4 | #define RES_TYPE int | |
5 | #endif | |
6 | ||
7 | +#if !((__GNUC__ == 3) && (__GNUC_MINOR__ == 3)) | |
8 | +#define ASM_SOFTMMU | |
9 | +#endif | |
10 | ||
11 | DATA_TYPE REGPARM(1) glue(glue(__ld, SUFFIX), MMUSUFFIX)(unsigned long addr, | |
12 | int is_user); | |
13 | void REGPARM(2) glue(glue(__st, SUFFIX), MMUSUFFIX)(unsigned long addr, DATA_TYPE v, int is_user); | |
14 | ||
15 | -#if (DATA_SIZE <= 4) && defined(__i386__) && (ACCESS_TYPE <= 1) && defined(ASM_SOFTMMU) | |
16 | +#if (DATA_SIZE <= 4) && defined(__i386__) && (ACCESS_TYPE <= 1) && !defined(ASM_SOFTMMU) | |
17 | ||
18 | static inline RES_TYPE glue(glue(ld, USUFFIX), MEMSUFFIX)(void *ptr) | |
19 | { |