diff options
author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2011-06-28 07:25:29 +0000 |
---|---|---|
committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2011-06-28 07:25:29 +0000 |
commit | 6e9de463ef677f093e9f24f126e1b11c28cf59fd (patch) | |
tree | 1cdb17543d9cdba6039e70d0dc7dc092ff6c94e2 /none | |
parent | a5d978efef05f2ff06a2fe937db68ce579121be7 (diff) |
Delete the AIX5 port. The last release this worked for is 3.4.1,
and then only on AIX 5.2 and 5.3.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11842 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'none')
-rw-r--r-- | none/tests/Makefile.am | 23 | ||||
-rw-r--r-- | none/tests/amd64/xadd.c | 6 | ||||
-rw-r--r-- | none/tests/fdleak_cmsg.c | 24 | ||||
-rw-r--r-- | none/tests/pth_atfork1.c | 4 | ||||
-rw-r--r-- | none/tests/x86/xadd.c | 6 |
5 files changed, 23 insertions, 40 deletions
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index 5c3fc814..097adb8d 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -236,30 +236,18 @@ pth_mutexspeed_LDADD = -lpthread pth_once_LDADD = -lpthread pth_rwlock_LDADD = -lpthread pth_stackalign_LDADD = -lpthread -if VGCONF_OS_IS_AIX5 - res_search_LDADD = -lpthread -else - res_search_LDADD = -lresolv -lpthread - resolv_LDADD = -lresolv -lpthread -endif +res_search_LDADD = -lresolv -lpthread +resolv_LDADD = -lresolv -lpthread semlimit_LDADD = -lpthread thread_exits_LDADD = -lpthread threaded_fork_LDADD = -lpthread threadederrno_LDADD = -lpthread tls_SOURCES = tls.c tls2.c tls_DEPENDENCIES = tls.so tls2.so -if VGCONF_OS_IS_AIX5 - tls_LDFLAGS = -else - tls_LDFLAGS = -Wl,-rpath,$(top_builddir)/none/tests -endif +tls_LDFLAGS = -Wl,-rpath,$(top_builddir)/none/tests tls_LDADD = tls.so tls2.so -lpthread tls_so_SOURCES = tls_so.c tls_so_DEPENDENCIES = tls2.so -if VGCONF_OS_IS_AIX5 - tls_so_LDFLAGS = -shared -fPIC - tls_so_LDADD = `pwd`/tls2.so -else if VGCONF_OS_IS_DARWIN tls_so_LDFLAGS = -dynamic -dynamiclib -all_load -fpic tls_so_LDADD = `pwd`/tls2.so @@ -267,13 +255,12 @@ else tls_so_LDFLAGS = -Wl,-rpath,$(top_builddir)/none/tests -shared -fPIC tls_so_LDADD = tls2.so endif -endif tls_so_CFLAGS = $(AM_CFLAGS) -fPIC tls2_so_SOURCES = tls2_so.c if VGCONF_OS_IS_DARWIN -tls2_so_LDFLAGS = -dynamic -dynamiclib -all_load + tls2_so_LDFLAGS = -dynamic -dynamiclib -all_load else -tls2_so_LDFLAGS = -shared + tls2_so_LDFLAGS = -shared endif valgrind_cpp_test_SOURCES = valgrind_cpp_test.cpp diff --git a/none/tests/amd64/xadd.c b/none/tests/amd64/xadd.c index 38d4f20a..78c495b1 100644 --- a/none/tests/amd64/xadd.c +++ b/none/tests/amd64/xadd.c @@ -10,12 +10,10 @@ #undef PLAT_amd64_linux #undef PLAT_ppc32_linux #undef PLAT_ppc64_linux -#undef PLAT_ppc32_aix5 -#undef PLAT_ppc64_aix5 -#if !defined(_AIX) && defined(__i386__) +#if defined(__i386__) # define PLAT_x86_linux 1 -#elif !defined(_AIX) && defined(__x86_64__) +#elif defined(__x86_64__) # define PLAT_amd64_linux 1 #endif diff --git a/none/tests/fdleak_cmsg.c b/none/tests/fdleak_cmsg.c index 0bb32dab..530932b6 100644 --- a/none/tests/fdleak_cmsg.c +++ b/none/tests/fdleak_cmsg.c @@ -1,22 +1,22 @@ -/* On AIX 5.2, _LINUX_SOURCE_COMPAT needs to be defined when reading - sys/socket.h in order to make CMSG_SPACE and CMSG_LEN visible. */ -#if defined(_AIX) -#define _LINUX_SOURCE_COMPAT 1 -#endif + + + + + #include <sys/socket.h> -#if defined(_AIX) -#undef _LINUX_SOURCE_COMPAT -#endif -/* Needed for 'memset' on AIX 5.2 */ -#if defined(_AIX) -# include <memory.h> -#endif + + + + + + + #include <string.h> #include <sys/types.h> diff --git a/none/tests/pth_atfork1.c b/none/tests/pth_atfork1.c index df5ef981..99a087fd 100644 --- a/none/tests/pth_atfork1.c +++ b/none/tests/pth_atfork1.c @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ #include <errno.h> -#if !defined(_AIX) && !defined(__APPLE__) +#if !defined(__APPLE__) # include <error.h> #endif #include <stdlib.h> @@ -27,7 +27,7 @@ #include <sys/wait.h> #include <stdio.h> -#if defined(_AIX) || defined(__APPLE__) +#if defined(__APPLE__) #include <string.h> /* strerror */ static void error (int status, int errnum, char* msg) { diff --git a/none/tests/x86/xadd.c b/none/tests/x86/xadd.c index 38d4f20a..78c495b1 100644 --- a/none/tests/x86/xadd.c +++ b/none/tests/x86/xadd.c @@ -10,12 +10,10 @@ #undef PLAT_amd64_linux #undef PLAT_ppc32_linux #undef PLAT_ppc64_linux -#undef PLAT_ppc32_aix5 -#undef PLAT_ppc64_aix5 -#if !defined(_AIX) && defined(__i386__) +#if defined(__i386__) # define PLAT_x86_linux 1 -#elif !defined(_AIX) && defined(__x86_64__) +#elif defined(__x86_64__) # define PLAT_amd64_linux 1 #endif |