diff options
Diffstat (limited to 'helgrind')
| -rw-r--r-- | helgrind/tests/tc07_hbl1.c | 11 | ||||
| -rw-r--r-- | helgrind/tests/tc08_hbl2.c | 11 | ||||
| -rw-r--r-- | helgrind/tests/tc11_XCHG.c | 9 | ||||
| -rw-r--r-- | helgrind/tests/tc19_shadowmem.c | 2 | ||||
| -rw-r--r-- | helgrind/tests/tc20_verifywrap.c | 6 |
5 files changed, 9 insertions, 30 deletions
diff --git a/helgrind/tests/tc07_hbl1.c b/helgrind/tests/tc07_hbl1.c index 2834c5d8..e5b11c44 100644 --- a/helgrind/tests/tc07_hbl1.c +++ b/helgrind/tests/tc07_hbl1.c @@ -6,8 +6,6 @@ /* Simple test program, no race. Parent and child both modify x and use the hardware bus lock. */ -#undef PLAT_ppc64_aix5 -#undef PLAT_ppc32_aix5 #undef PLAT_x86_darwin #undef PLAT_amd64_darwin #undef PLAT_x86_linux @@ -17,11 +15,7 @@ #undef PLAT_arm_linux #undef PLAT_s390x_linux -#if defined(_AIX) && defined(__64BIT__) -# define PLAT_ppc64_aix5 1 -#elif defined(_AIX) && !defined(__64BIT__) -# define PLAT_ppc32_aix5 1 -#elif defined(__APPLE__) && defined(__i386__) +#if defined(__APPLE__) && defined(__i386__) # define PLAT_x86_darwin 1 #elif defined(__APPLE__) && defined(__x86_64__) # define PLAT_amd64_darwin 1 @@ -44,8 +38,7 @@ # define INC(_lval,_lqual) \ __asm__ __volatile__ ( \ "lock ; incl (%0)" : /*out*/ : /*in*/"r"(&(_lval)) : "memory", "cc" ) -#elif defined(PLAT_ppc32_linux) || defined(PLAT_ppc64_linux) \ - || defined(PLAT_ppc32_aix5) || defined(PLAT_ppc64_aix5) +#elif defined(PLAT_ppc32_linux) || defined(PLAT_ppc64_linux) # define INC(_lval,_lqual) \ __asm__ __volatile__( \ "1:\n" \ diff --git a/helgrind/tests/tc08_hbl2.c b/helgrind/tests/tc08_hbl2.c index 7821cde2..9c05e38d 100644 --- a/helgrind/tests/tc08_hbl2.c +++ b/helgrind/tests/tc08_hbl2.c @@ -22,8 +22,6 @@ child joins back to parent. Parent (writer) uses hardware bus lock; child is only reading and so does not need to use a bus lock. */ -#undef PLAT_ppc64_aix5 -#undef PLAT_ppc32_aix5 #undef PLAT_x86_darwin #undef PLAT_amd64_darwin #undef PLAT_x86_linux @@ -33,11 +31,7 @@ #undef PLAT_arm_linux #undef PLAT_s390x_linux -#if defined(_AIX) && defined(__64BIT__) -# define PLAT_ppc64_aix5 1 -#elif defined(_AIX) && !defined(__64BIT__) -# define PLAT_ppc32_aix5 1 -#elif defined(__APPLE__) && defined(__i386__) +#if defined(__APPLE__) && defined(__i386__) # define PLAT_x86_darwin 1 #elif defined(__APPLE__) && defined(__x86_64__) # define PLAT_amd64_darwin 1 @@ -61,8 +55,7 @@ # define INC(_lval,_lqual) \ __asm__ __volatile__ ( \ "lock ; incl (%0)" : /*out*/ : /*in*/"r"(&(_lval)) : "memory", "cc" ) -#elif defined(PLAT_ppc32_linux) || defined(PLAT_ppc64_linux) \ - || defined(PLAT_ppc32_aix5) || defined(PLAT_ppc64_aix5) +#elif defined(PLAT_ppc32_linux) || defined(PLAT_ppc64_linux) # define INC(_lval,_lqual) \ __asm__ __volatile__( \ "1:\n" \ diff --git a/helgrind/tests/tc11_XCHG.c b/helgrind/tests/tc11_XCHG.c index 584d896a..f7fe47ff 100644 --- a/helgrind/tests/tc11_XCHG.c +++ b/helgrind/tests/tc11_XCHG.c @@ -9,8 +9,6 @@ use the hardware bus lock (implicitly, since XCHG r,m on x86/amd64 does not require an explicit LOCK prefix.). */ -#undef PLAT_ppc64_aix5 -#undef PLAT_ppc32_aix5 #undef PLAT_x86_darwin #undef PLAT_amd64_darwin #undef PLAT_x86_linux @@ -20,11 +18,7 @@ #undef PLAT_arm_linux #undef PLAT_s390x_linux -#if defined(_AIX) && defined(__64BIT__) -# define PLAT_ppc64_aix5 1 -#elif defined(_AIX) && !defined(__64BIT__) -# define PLAT_ppc32_aix5 1 -#elif defined(__APPLE__) && defined(__i386__) +#if defined(__APPLE__) && defined(__i386__) # define PLAT_x86_darwin 1 #elif defined(__APPLE__) && defined(__x86_64__) # define PLAT_amd64_darwin 1 @@ -61,7 +55,6 @@ ) #elif defined(PLAT_ppc32_linux) || defined(PLAT_ppc64_linux) \ - || defined(PLAT_ppc32_aix5) || defined(PLAT_ppc64_aix5) \ || defined(PLAT_arm_linux) || defined(PLAT_s390x_linux) # if defined(HAVE_BUILTIN_ATOMIC) # define XCHG_M_R(_addr,_lval) \ diff --git a/helgrind/tests/tc19_shadowmem.c b/helgrind/tests/tc19_shadowmem.c index ec05061f..99cb5018 100644 --- a/helgrind/tests/tc19_shadowmem.c +++ b/helgrind/tests/tc19_shadowmem.c @@ -2287,5 +2287,5 @@ void* steer ( void* infoV ) if (wot == 999) return fn(info); __asm__ __volatile__(""); assert(0); - return 0; /* keep gcc happy on AIX */ + /*NOTREACHED*/return 0; } diff --git a/helgrind/tests/tc20_verifywrap.c b/helgrind/tests/tc20_verifywrap.c index 6a8b30c3..e3708951 100644 --- a/helgrind/tests/tc20_verifywrap.c +++ b/helgrind/tests/tc20_verifywrap.c @@ -18,7 +18,7 @@ #include <pthread.h> #include <semaphore.h> -#if !defined(_AIX) && !defined(__APPLE__) +#if !defined(__APPLE__) #if !defined(__GLIBC_PREREQ) # error "This program needs __GLIBC_PREREQ (in /usr/include/features.h)" @@ -261,10 +261,10 @@ int main ( void ) return 0; } -#else /* defined(_AIX) */ +#else /* defined(__APPLE__) */ int main ( void ) { - fprintf(stderr, "This program does not work on AIX.\n"); + fprintf(stderr, "This program does not work on Mac OS X.\n"); return 0; } #endif |