Author: sewardj
Date: 2006-10-17 01:56:43 +0100 (Tue, 17 Oct 2006)
New Revision: 6242
Log:
Merge r6086:
Makefile.am changes for AIX5. Almost all boilerplate stuff fitting in
with the existing factorisation scheme. The only change of interest
is that configure.in now generates automake symbols of name
VGP_platform and VGO_os, whereas previously it just made VG_platform
which was a bit inconsistent with the VGP/VGO/VGA scheme used in C
code.
Modified:
trunk/Makefile.am
trunk/Makefile.core.am
trunk/Makefile.flags.am
trunk/Makefile.install.am
trunk/Makefile.tool-flags.am
trunk/Makefile.tool.am
trunk/auxprogs/Makefile.am
trunk/cachegrind/Makefile.am
trunk/cachegrind/tests/Makefile.am
trunk/callgrind/Makefile.am
trunk/coregrind/Makefile.am
trunk/helgrind/Makefile.am
trunk/helgrind/tests/Makefile.am
trunk/include/Makefile.am
trunk/lackey/Makefile.am
trunk/massif/Makefile.am
trunk/memcheck/Makefile.am
trunk/memcheck/tests/Makefile.am
trunk/none/Makefile.am
trunk/none/tests/Makefile.am
Modified: trunk/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -18,6 +18,7 @@
=20
SUPP_FILES =3D \
glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \
+ aix5libc.supp \
xfree-3.supp xfree-4.supp
=20
dist_val_DATA =3D $(SUPP_FILES) default.supp
@@ -32,22 +33,30 @@
CLEANFILES =3D=20
DISTCLEANFILES =3D default.supp
=20
-if VG_X86_LINUX
+if VGP_X86_LINUX
BUILT_SOURCES +=3D valt_load_address_x86_linux.lds
CLEANFILES +=3D valt_load_address_x86_linux.lds
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
BUILT_SOURCES +=3D valt_load_address_amd64_linux.lds
CLEANFILES +=3D valt_load_address_amd64_linux.lds
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
BUILT_SOURCES +=3D valt_load_address_ppc32_linux.lds
CLEANFILES +=3D valt_load_address_ppc32_linux.lds
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
BUILT_SOURCES +=3D valt_load_address_ppc64_linux.lds
CLEANFILES +=3D valt_load_address_ppc64_linux.lds
endif
+if VGP_PPC32_AIX5
+# No need to generate valt_load_address*.lds; the final executables
+# can be linked to be at any address. They will be relocated by
+# AIX kernel when they are loaded.
+endif
+if VGP_PPC64_AIX5
+# Ditto
+endif
=20
default.supp: $(SUPP_FILES)
=20
@@ -99,6 +108,8 @@
# These list the bits of vex we need to copy into the tarball
=20
VEX_PRIMARY_SOURCES =3D \
+ VEX/quote.txt \
+ VEX/newline.txt \
VEX/HACKING.README \
VEX/LICENSE.README \
VEX/LICENSE.GPL \
Modified: trunk/Makefile.core.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Makefile.core.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/Makefile.core.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -46,10 +46,28 @@
-DVGO_linux=3D1 \
-DVGP_ppc64_linux=3D1
=20
+add_includes_ppc32_aix5 =3D -I$(top_srcdir)/coregrind \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/coregrind/ppc32 \
+ -I$(top_srcdir)/coregrind/aix5 \
+ -I$(top_srcdir)/coregrind/ppc32-aix5 \
+ -I$(top_srcdir)/include \
+ -I@VEX_DIR@/pub \
+ -DVG_PLATFORM=3D"\"ppc32-aix5\"" \
+ -DVGA_ppc32=3D1 \
+ -DVGO_aix5=3D1 \
+ -DVGP_ppc32_aix5=3D1
+
+add_includes_ppc64_aix5 =3D -I$(top_srcdir)/coregrind \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/coregrind/ppc64 \
+ -I$(top_srcdir)/coregrind/aix5 \
+ -I$(top_srcdir)/coregrind/ppc64-aix5 \
+ -I$(top_srcdir)/include \
+ -I@VEX_DIR@/pub \
+ -DVG_PLATFORM=3D"\"ppc64-aix5\"" \
+ -DVGA_ppc64=3D1 \
+ -DVGO_aix5=3D1 \
+ -DVGP_ppc64_aix5=3D1
+
include $(top_srcdir)/Makefile.flags.am
-
-PRELOAD_LDFLAGS_COMMON =3D -nostdlib -shared -Wl,-z,interpose,-z,initfir=
st
-PRELOAD_LDFLAGS_X86_LINUX =3D $(PRELOAD_LDFLAGS_COMMON) @FLAG_M32@
-PRELOAD_LDFLAGS_AMD64_LINUX =3D $(PRELOAD_LDFLAGS_COMMON) -m64
-PRELOAD_LDFLAGS_PPC32_LINUX =3D $(PRELOAD_LDFLAGS_COMMON) @FLAG_M32@
-PRELOAD_LDFLAGS_PPC64_LINUX =3D $(PRELOAD_LDFLAGS_COMMON) -m64
Modified: trunk/Makefile.flags.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Makefile.flags.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/Makefile.flags.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -15,8 +15,8 @@
AM_FLAG_M3264_AMD64_LINUX =3D @FLAG_M64@
AM_CPPFLAGS_AMD64_LINUX =3D $(add_includes_amd64_linux)
AM_CFLAGS_AMD64_LINUX =3D $(WERROR) @FLAG_M64@ -fomit-frame-pointer =
\
- @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_AMD64_LINUX =3D $(add_includes_amd64_linux) -m64 -g
+ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE)
+AM_CCASFLAGS_AMD64_LINUX =3D $(add_includes_amd64_linux) @FLAG_M64@ -g
=20
AM_FLAG_M3264_PPC32_LINUX =3D @FLAG_M32@
AM_CPPFLAGS_PPC32_LINUX =3D $(add_includes_ppc32_linux)
@@ -26,8 +26,20 @@
AM_FLAG_M3264_PPC64_LINUX =3D @FLAG_M64@
AM_CPPFLAGS_PPC64_LINUX =3D $(add_includes_ppc64_linux)
AM_CFLAGS_PPC64_LINUX =3D $(WERROR) @FLAG_M64@ $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_PPC64_LINUX =3D $(add_includes_ppc64_linux) -Wa,-maltivec =
-m64 -g
+AM_CCASFLAGS_PPC64_LINUX =3D $(add_includes_ppc64_linux) -Wa,-maltivec =
@FLAG_M64@ -g
=20
+AM_FLAG_M3264_PPC32_AIX5 =3D @FLAG_MAIX32@
+AM_CPPFLAGS_PPC32_AIX5 =3D $(add_includes_ppc32_aix5)
+AM_CFLAGS_PPC32_AIX5 =3D $(WERROR) @FLAG_MAIX32@ -mcpu=3Dpowerpc $(=
AM_CFLAGS_BASE)
+AM_CCASFLAGS_PPC32_AIX5 =3D $(add_includes_ppc32_aix5) \
+ @FLAG_MAIX32@ -mcpu=3Dpowerpc -g
+
+AM_FLAG_M3264_PPC64_AIX5 =3D @FLAG_MAIX64@
+AM_CPPFLAGS_PPC64_AIX5 =3D $(add_includes_ppc64_aix5)
+AM_CFLAGS_PPC64_AIX5 =3D $(WERROR) @FLAG_MAIX64@ -mcpu=3Dpowerpc64 =
$(AM_CFLAGS_BASE)
+AM_CCASFLAGS_PPC64_AIX5 =3D $(add_includes_ppc64_aix5) \
+ @FLAG_MAIX64@ -mcpu=3Dpowerpc64 -g
+
# Flags for the primary target. These must be used to build the
# regtests and performance tests. In fact, these must be used to
# build anything which is built only once on a dual-arch build.
@@ -36,3 +48,21 @@
AM_CPPFLAGS_PRI =3D $(AM_CPPFLAGS_@VG_PLATFORM_PRI@)
AM_CFLAGS_PRI =3D $(AM_CFLAGS_@VG_PLATFORM_PRI@)
AM_CCASFLAGS_PRI =3D $(AM_CCASFLAGS_@VG_PLATFORM_PRI@)
+
+if VGP_HAVE_SECONDARY
+ AM_FLAG_M3264_SEC =3D $(AM_FLAG_M3264_@VG_PLATFORM_SEC@)
+else
+ AM_FLAG_M3264_SEC =3D=20
+endif
+
+
+# Baseline link flags for making dynamic shared objects.
+#
+PRELOAD_LDFLAGS_COMMON_LINUX =3D -nostdlib -shared -Wl,-z,interpose,-z,i=
nitfirst
+PRELOAD_LDFLAGS_COMMON_AIX5 =3D -nostdlib -shared -Wl,-G -Wl,-bnogc
+PRELOAD_LDFLAGS_X86_LINUX =3D $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M3=
2@
+PRELOAD_LDFLAGS_AMD64_LINUX =3D $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M6=
4@
+PRELOAD_LDFLAGS_PPC32_LINUX =3D $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M3=
2@
+PRELOAD_LDFLAGS_PPC64_LINUX =3D $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M6=
4@
+PRELOAD_LDFLAGS_PPC32_AIX5 =3D $(PRELOAD_LDFLAGS_COMMON_AIX5) @FLAG_MA=
IX32@
+PRELOAD_LDFLAGS_PPC64_AIX5 =3D $(PRELOAD_LDFLAGS_COMMON_AIX5) @FLAG_MA=
IX64@
Modified: trunk/Makefile.install.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Makefile.install.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/Makefile.install.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -19,7 +19,7 @@
done ; \
fi ; \
if [ -n "$(noinst_LIBRARIES)" ] ; then \
- for f in $(noinst_LIBRARIES); do \
+ for f in $(noinst_LIBRARIES) expr_wont_match_me; do \
if expr match $$f libcoregrind_ > /dev/null ; then \
pU=3D`echo $$f | sed -e 's/libcoregrind_//g' -e 's/\.a//g'` ; \
pD=3D`echo $$pU | sed -e 's/_/-/g'` ; \
Modified: trunk/Makefile.tool-flags.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Makefile.tool-flags.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/Makefile.tool-flags.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -22,4 +22,16 @@
-DVGO_linux=3D1 \
-DVGP_ppc64_linux=3D1
=20
+add_includes_ppc32_aix5 =3D -I$(top_srcdir)/include \
+ -I@VEX_DIR@/pub \
+ -DVGA_ppc32=3D1 \
+ -DVGO_aix5=3D1 \
+ -DVGP_ppc32_aix5=3D1
+
+add_includes_ppc64_aix5 =3D -I$(top_srcdir)/include \
+ -I@VEX_DIR@/pub \
+ -DVGA_ppc64=3D1 \
+ -DVGO_aix5=3D1 \
+ -DVGP_ppc64_aix5=3D1
+
include $(top_srcdir)/Makefile.flags.am
Modified: trunk/Makefile.tool.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Makefile.tool.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/Makefile.tool.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -18,6 +18,12 @@
LIBREPLACEMALLOC_PPC64_LINUX =3D \
$(top_builddir)/coregrind/libreplacemalloc_toolpreload_ppc64_linux.a
=20
+LIBREPLACEMALLOC_PPC32_AIX5 =3D \
+ $(top_builddir)/coregrind/libreplacemalloc_toolpreload_ppc32_aix5.a
+
+LIBREPLACEMALLOC_PPC64_AIX5 =3D \
+ $(top_builddir)/coregrind/libreplacemalloc_toolpreload_ppc64_aix5.a
+
COREGRIND_LIBS_X86_LINUX =3D \
$(top_builddir)/coregrind/libcoregrind_x86_linux.a \
@VEX_DIR@/libvex_x86_linux.a
@@ -34,58 +40,84 @@
$(top_builddir)/coregrind/libcoregrind_ppc64_linux.a \
@VEX_DIR@/libvex_ppc64_linux.a
=20
+COREGRIND_LIBS_PPC32_AIX5 =3D \
+ $(top_builddir)/coregrind/libcoregrind_ppc32_aix5.a \
+ @VEX_DIR@/libvex_ppc32_aix5.a
+
+COREGRIND_LIBS_PPC64_AIX5 =3D \
+ $(top_builddir)/coregrind/libcoregrind_ppc64_aix5.a \
+ @VEX_DIR@/libvex_ppc64_aix5.a
+
##.PHONY: @VEX_DIR@/libvex.a
=20
@VEX_DIR@/libvex_x86_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" libvex_x86_linux.a \
+ $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" AR=3D"$(AR)" \
+ libvex_x86_linux.a \
EXTRA_CFLAGS=3D"$(AM_CFLAGS_X86_LINUX) @FLAG_WDECL_AFTER_STMT@"
=20
@VEX_DIR@/libvex_amd64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" libvex_amd64_linux.a \
+ $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" AR=3D"$(AR)" \
+ libvex_amd64_linux.a \
EXTRA_CFLAGS=3D"$(AM_CFLAGS_AMD64_LINUX) @FLAG_WDECL_AFTER_STMT@"
=20
@VEX_DIR@/libvex_ppc32_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" libvex_ppc32_linux.a \
+ $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" AR=3D"$(AR)" \
+ libvex_ppc32_linux.a \
EXTRA_CFLAGS=3D"$(AM_CFLAGS_PPC32_LINUX) @FLAG_WDECL_AFTER_STMT@"
=20
@VEX_DIR@/libvex_ppc64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" libvex_ppc64_linux.a \
+ $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" AR=3D"$(AR)" \
+ libvex_ppc64_linux.a \
EXTRA_CFLAGS=3D"$(AM_CFLAGS_PPC64_LINUX) @FLAG_WDECL_AFTER_STMT@"
=20
+@VEX_DIR@/libvex_ppc32_aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h
+ $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" AR=3D"$(AR) -X32" \
+ libvex_ppc32_aix5.a \
+ EXTRA_CFLAGS=3D"$(AM_CFLAGS_PPC32_AIX5) @FLAG_WDECL_AFTER_STMT@"
+
+@VEX_DIR@/libvex_ppc64_aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h
+ $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" AR=3D"$(AR) -X64" \
+ libvex_ppc64_aix5.a \
+ EXTRA_CFLAGS=3D"$(AM_CFLAGS_PPC64_AIX5) @FLAG_WDECL_AFTER_STMT@"
+
@VEX_DIR@/priv/main/vex_svnversion.h:
$(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" version
=20
TOOL_LDADD_COMMON =3D -lgcc
-TOOL_LDFLAGS_COMMON =3D -static \
+TOOL_LDFLAGS_COMMON_LINUX =3D -static \
-Wl,-defsym,valt_load_address=3D@VALT_LOAD_ADDRESS@ \
-nodefaultlibs -nostartfiles -u _start
+TOOL_LDFLAGS_COMMON_AIX5 =3D -static -Wl,-e_start_valgrind
=20
+
TOOL_LDADD_X86_LINUX =3D $(COREGRIND_LIBS_X86_LINUX) $(TOOL_LDADD_COMMON=
)
TOOL_LDFLAGS_X86_LINUX =3D \
- $(TOOL_LDFLAGS_COMMON) @FLAG_M32@ \
+ $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ \
-Wl,-T,$(top_builddir)/valt_load_address_x86_linux.lds
=20
TOOL_LDADD_AMD64_LINUX =3D $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_CO=
MMON)
TOOL_LDFLAGS_AMD64_LINUX =3D \
- $(TOOL_LDFLAGS_COMMON) -m64 \
+ $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M64@ \
-Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds
=20
TOOL_LDADD_PPC32_LINUX =3D $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_CO=
MMON)
TOOL_LDFLAGS_PPC32_LINUX =3D \
- $(TOOL_LDFLAGS_COMMON) @FLAG_M32@ \
+ $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ \
-Wl,-T,$(top_builddir)/valt_load_address_ppc32_linux.lds
=20
TOOL_LDADD_PPC64_LINUX =3D $(COREGRIND_LIBS_PPC64_LINUX) $(TOOL_LDADD_CO=
MMON)
TOOL_LDFLAGS_PPC64_LINUX =3D \
- $(TOOL_LDFLAGS_COMMON) -m64 \
+ $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M64@ \
-Wl,-T,$(top_builddir)/valt_load_address_ppc64_linux.lds
=20
-PRELOAD_LDFLAGS_COMMON =3D -nostdlib -shared -Wl,-z,interpose,-z,initfir=
st
-PRELOAD_LDFLAGS_X86_LINUX =3D $(PRELOAD_LDFLAGS_COMMON) @FLAG_M32@
-PRELOAD_LDFLAGS_AMD64_LINUX =3D $(PRELOAD_LDFLAGS_COMMON) -m64
-PRELOAD_LDFLAGS_PPC32_LINUX =3D $(PRELOAD_LDFLAGS_COMMON) @FLAG_M32@
-PRELOAD_LDFLAGS_PPC64_LINUX =3D $(PRELOAD_LDFLAGS_COMMON) -m64
+TOOL_LDADD_PPC32_AIX5 =3D $(COREGRIND_LIBS_PPC32_AIX5) $(TOOL_LDADD_COMM=
ON)
+TOOL_LDFLAGS_PPC32_AIX5 =3D \
+ $(TOOL_LDFLAGS_COMMON_AIX5) @FLAG_MAIX32@
=20
+TOOL_LDADD_PPC64_AIX5 =3D $(COREGRIND_LIBS_PPC64_AIX5) $(TOOL_LDADD_COMM=
ON)
+TOOL_LDFLAGS_PPC64_AIX5 =3D \
+ $(TOOL_LDFLAGS_COMMON_AIX5) @FLAG_MAIX64@ -Wl,-bbigtoc
+
LIBREPLACEMALLOC_LDFLAGS_X86_LINUX =3D \
-Wl,--whole-archive \
$(LIBREPLACEMALLOC_X86_LINUX) \
@@ -102,3 +134,7 @@
-Wl,--whole-archive \
$(LIBREPLACEMALLOC_PPC64_LINUX) \
-Wl,--no-whole-archive
+LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5 =3D \
+ $(LIBREPLACEMALLOC_PPC32_AIX5)
+LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5 =3D \
+ $(LIBREPLACEMALLOC_PPC64_AIX5)
Modified: trunk/auxprogs/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/auxprogs/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/auxprogs/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -6,6 +6,8 @@
noinst_SCRIPTS =3D gen-mdg DotToScc.hs primes.c \
gsl16test gsl16-badfree.patch gsl16-wavelet.patch \
ppcfround.c ppc64shifts.c libmpiwrap.c mpiwrap_type_test.c \
+ aix5_VKI_info.c libmpiwrap_aix5.exp \
+ aix5_proc_self_sysent.c \
posixtestsuite-1.5.1-diff-results \
posixtestsuite-1.5.1-diff.txt
=20
@@ -26,43 +28,103 @@
=20
=20
#------------------------- mpi wrappers -----------------------
-# Build libmpiwrap.so for the primary target only.
+# Build libmpiwrap.so for the primary target, and for the secondary
+# target if relevant.
#
# This is really horrible.
#
-# Don't let automake install this, since it puts it in the
-# wrong place. Instead install it ourselves in the right
+# Don't let automake install this, since it puts the .so's in the
+# wrong place. Instead install them ourselves in the right
# place using the install-exec-local target below.
#
# Also, automake isn't good at supporting non-$(CC) compilers.
# But we need to use $(MPI_CC) here. Hence the nasty hack of
-# directly saying how to build libmpiwrap.so, instead of
+# directly saying how to build libmpiwrap-*.so, instead of
# using automake's standard gunk.
#
-if BUILD_MPIWRAP
-noinst_PROGRAMS =3D libmpiwrap.so
-#libmpiwrap_so_SOURCES =3D mpiwrap.c
-#libmpiwrap_so_CFLAGS =3D $(AM_FLAG_M3264_PRI) \
-# -g -O -fPIC -fno-omit-frame-pointer \
-# -I../include -I@MPI_PREFIX@/include
-#libmpiwrap_so_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -g -shared
-#
-# Note re leading '-'s: tells GNU make to keep going even if command fai=
ls
-#
-libmpiwrap.so: libmpiwrap.c
- -$(MPI_CC) -g -O -fno-omit-frame-pointer -Wall -fPIC -shared \
+if VGO_AIX5
+ HACKY_FLAGS_PRI =3D -g -O -bE:libmpiwrap_aix5.exp -bM:SRE -bnoentry \
+ -qflag=3Dw:w \
+ `echo $(AM_FLAG_M3264_PRI) | sed s/maix/q/g`
+ HACKY_FLAGS_SEC =3D -g -O -bE:libmpiwrap_aix5.exp -bM:SRE -bnoentry \
+ -qflag=3Dw:w \
+ `echo $(AM_FLAG_M3264_SEC) | sed s/maix/q/g`
+else
+ HACKY_FLAGS_PRI =3D -g -O -fno-omit-frame-pointer -Wall -fpic -shared \
+ $(AM_FLAG_M3264_PRI)
+ HACKY_FLAGS_SEC =3D -g -O -fno-omit-frame-pointer -Wall -fpic -shared \
+ $(AM_FLAG_M3264_SEC)
+endif
+
+
+## First, we have to say how to build the .so's ..
+##
+noinst_PROGRAMS =3D
+if BUILD_MPIWRAP_PRI
+noinst_PROGRAMS +=3D libmpiwrap-@VG_PLATFORM_PRI@.so
+libmpiwrap-@VG_PLATFORM_PRI@.so: libmpiwrap.c
+ $(MPI_CC) $(HACKY_FLAGS_PRI) \
-I../include \
- $(AM_FLAG_M3264_PRI) \
- -o libmpiwrap.so libmpiwrap.c
+ -o libmpiwrap-@VG_PLATFORM_PRI@.so libmpiwrap.c
+endif
+if BUILD_MPIWRAP_SEC
+noinst_PROGRAMS +=3D libmpiwrap-@VG_PLATFORM_SEC@.so
+libmpiwrap-@VG_PLATFORM_SEC@.so: libmpiwrap.c
+ $(MPI_CC) $(HACKY_FLAGS_SEC) \
+ -I../include \
+ -o libmpiwrap-@VG_PLATFORM_SEC@.so libmpiwrap.c
+endif
=20
+
+## And here we say how to install them.
+##
+# The following install hack is serialised by "libmpiwrap.so".
+# Hence force -j 1.
+.NOTPARALLEL:
+
install-exec-local:
+if BUILD_MPIWRAP_PRI
# convert (eg) X86_LINUX to x86-linux
# really should use sed here, rather than assume tr is available
pD=3D`echo @VG_PLATFORM_PRI@ | tr A-Z_ a-z-` ; \
$(mkinstalldirs) $(DESTDIR)$(valdir)/$$pD;
- -pD=3D`echo @VG_PLATFORM_PRI@ | tr A-Z_ a-z-` ; \
- $(INSTALL_PROGRAM) ./libmpiwrap.so $(DESTDIR)$(valdir)/$$pD
+ rm -f ./libmpiwrap.so; \
+ cp ./libmpiwrap-@VG_PLATFORM_PRI@.so ./libmpiwrap.so; \
+ $(INSTALL_PROGRAM) ./libmpiwrap.so \
+ $(DESTDIR)$(valdir)/$$pD; \
+ rm -f ./libmpiwrap.so
endif
+if BUILD_MPIWRAP_SEC
+ pD=3D`echo @VG_PLATFORM_SEC@ | tr A-Z_ a-z-` ; \
+ $(mkinstalldirs) $(DESTDIR)$(valdir)/$$pD; \
+ rm -f ./libmpiwrap.so; \
+ cp ./libmpiwrap-@VG_PLATFORM_SEC@.so ./libmpiwrap.so; \
+ $(INSTALL_PROGRAM) ./libmpiwrap.so \
+ $(DESTDIR)$(valdir)/$$pD; \
+ rm -f ./libmpiwrap.so
+endif
+
+
+## And some hacks for 'make dist'
+## It would seem that using nodist_SOURCES is the right fix, but
+## I can't figure out how to do it.
+##
+if BUILD_MPIWRAP_PRI
+#nodist_SOURCES =3D libmpiwrap-@VG_PLATFORM_PRI@.c
+libmpiwrap-@VG_PLATFORM_PRI@.c:
+ rm -f libmpiwrap-@VG_PLATFORM_PRI@.c
+ touch libmpiwrap-@VG_PLATFORM_PRI@.c
+libmpiwrap-.c:
+ rm -f libmpiwrap-.c
+ touch libmpiwrap-.c
+endif
+if BUILD_MPIWRAP_SEC
+#nodist_SOURCES =3D libmpiwrap-@VG_PLATFORM_SEC@.c
+libmpiwrap-@VG_PLATFORM_SEC@.c:
+ rm -f libmpiwrap-@VG_PLATFORM_SEC@.c
+ touch libmpiwrap-@VG_PLATFORM_SEC@.c
+endif
+
#
#----------------------------------------------------------
=20
Modified: trunk/cachegrind/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cachegrind/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/cachegrind/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -5,18 +5,24 @@
noinst_HEADERS =3D cg_arch.h cg_sim.c
=20
noinst_PROGRAMS =3D=20
-if VG_X86_LINUX
+if VGP_X86_LINUX
noinst_PROGRAMS +=3D cachegrind-x86-linux
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
noinst_PROGRAMS +=3D cachegrind-amd64-linux
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
noinst_PROGRAMS +=3D cachegrind-ppc32-linux
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
noinst_PROGRAMS +=3D cachegrind-ppc64-linux
endif
+if VGP_PPC32_AIX5
+noinst_PROGRAMS +=3D cachegrind-ppc32-aix5
+endif
+if VGP_PPC64_AIX5
+noinst_PROGRAMS +=3D cachegrind-ppc64-aix5
+endif
=20
CACHEGRIND_SOURCES_COMMON =3D cg_main.c
CACHEGRIND_SOURCES_X86 =3D cg-x86.c
@@ -51,3 +57,17 @@
cachegrind_ppc64_linux_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_LINUX)
cachegrind_ppc64_linux_LDADD =3D $(TOOL_LDADD_PPC64_LINUX)
cachegrind_ppc64_linux_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_LINUX)
+
+cachegrind_ppc32_aix5_SOURCES =3D $(CACHEGRIND_SOURCES_COMMON) $(CA=
CHEGRIND_SOURCES_PPC32)
+cachegrind_ppc32_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5)
+cachegrind_ppc32_aix5_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5)
+cachegrind_ppc32_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC32_AIX5)
+cachegrind_ppc32_aix5_LDADD =3D $(TOOL_LDADD_PPC32_AIX5)
+cachegrind_ppc32_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC32_AIX5)
+
+cachegrind_ppc64_aix5_SOURCES =3D $(CACHEGRIND_SOURCES_COMMON) $(CA=
CHEGRIND_SOURCES_PPC64)
+cachegrind_ppc64_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5)
+cachegrind_ppc64_aix5_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5)
+cachegrind_ppc64_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_AIX5)
+cachegrind_ppc64_aix5_LDADD =3D $(TOOL_LDADD_PPC64_AIX5)
+cachegrind_ppc64_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_AIX5)
Modified: trunk/cachegrind/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cachegrind/tests/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/cachegrind/tests/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -3,16 +3,16 @@
include $(top_srcdir)/Makefile.flags.am
=20
SUBDIRS =3D .
-if VG_X86_LINUX
+if VGP_X86_LINUX
SUBDIRS +=3D x86
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
SUBDIRS +=3D amd64
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
SUBDIRS +=3D ppc32
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
SUBDIRS +=3D ppc64
endif
=20
@@ -37,3 +37,14 @@
myprint_so_SOURCES =3D myprint.c
myprint_so_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -shared -fPIC
myprint_so_CFLAGS =3D $(AM_FLAG_M3264_PRI) -fPIC
+
+if VGP_PPC32_AIX5
+if VGP_PPC64_AIX5
+else
+ # persuade the AIX linker not to junk apparently unused
+ # function descriptors. Unfortunately -Wl,-G -Wl,-bnogc
+ # produces a link error on 64-bit AIX, hence only 32-bit
+ # gets these flags.
+ wrap5_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
+endif
+endif
Modified: trunk/callgrind/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/callgrind/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/callgrind/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -5,18 +5,24 @@
noinst_HEADERS =3D global.h costs.h events.h
=20
noinst_PROGRAMS =3D=20
-if VG_X86_LINUX
+if VGP_X86_LINUX
noinst_PROGRAMS +=3D callgrind-x86-linux
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
noinst_PROGRAMS +=3D callgrind-amd64-linux
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
noinst_PROGRAMS +=3D callgrind-ppc32-linux
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
noinst_PROGRAMS +=3D callgrind-ppc64-linux
endif
+if VGP_PPC32_AIX5
+noinst_PROGRAMS +=3D callgrind-ppc32-aix5
+endif
+if VGP_PPC64_AIX5
+noinst_PROGRAMS +=3D callgrind-ppc64-aix5
+endif
=20
CALLGRIND_SOURCES_COMMON =3D main.c events.c bb.c clo.c \
costs.c bbcc.c command.c debug.c fn.c \
@@ -58,7 +64,19 @@
callgrind_ppc64_linux_LDADD =3D $(TOOL_LDADD_PPC64_LINUX)
callgrind_ppc64_linux_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_LINUX)
=20
+callgrind_ppc32_aix5_SOURCES =3D $(CALLGRIND_SOURCES_COMMON) $(CALL=
GRIND_SOURCES_PPC32)
clincludedir =3D $(includedir)/valgrind
+callgrind_ppc32_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5)
+callgrind_ppc32_aix5_CFLAGS =3D $(CALLGRIND_CFLAGS_COMMON) $(AM_CF=
LAGS_PPC32_AIX5)
+callgrind_ppc32_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC32_AIX5)
+callgrind_ppc32_aix5_LDADD =3D $(TOOL_LDADD_PPC32_AIX5)
+callgrind_ppc32_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC32_AIX5)
=20
+callgrind_ppc64_aix5_SOURCES =3D $(CALLGRIND_SOURCES_COMMON) $(CALL=
GRIND_SOURCES_PPC64)
+callgrind_ppc64_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5)
clinclude_HEADERS =3D \
callgrind.h
+callgrind_ppc64_aix5_CFLAGS =3D $(CALLGRIND_CFLAGS_COMMON) $(AM_CF=
LAGS_PPC64_AIX5)
+callgrind_ppc64_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_AIX5)
+callgrind_ppc64_aix5_LDADD =3D $(TOOL_LDADD_PPC64_AIX5)
+callgrind_ppc64_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_AIX5)
Modified: trunk/coregrind/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/coregrind/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -12,23 +12,31 @@
AM_CPPFLAGS_AMD64_LINUX +=3D -DVG_LIBDIR=3D"\"$(valdir)"\"
AM_CPPFLAGS_PPC32_LINUX +=3D -DVG_LIBDIR=3D"\"$(valdir)"\"
AM_CPPFLAGS_PPC64_LINUX +=3D -DVG_LIBDIR=3D"\"$(valdir)"\"
+AM_CPPFLAGS_PPC32_AIX5 +=3D -DVG_LIBDIR=3D"\"$(valdir)"\"
+AM_CPPFLAGS_PPC64_AIX5 +=3D -DVG_LIBDIR=3D"\"$(valdir)"\"
=20
=20
default.supp: $(SUPP_FILES)
=20
noinst_LIBRARIES =3D
-if VG_X86_LINUX
+if VGP_X86_LINUX
noinst_LIBRARIES +=3D libcoregrind_x86_linux.a libreplacemalloc_toolprel=
oad_x86_linux.a
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
noinst_LIBRARIES +=3D libcoregrind_amd64_linux.a libreplacemalloc_toolpr=
eload_amd64_linux.a
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
noinst_LIBRARIES +=3D libcoregrind_ppc32_linux.a libreplacemalloc_toolpr=
eload_ppc32_linux.a
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
noinst_LIBRARIES +=3D libcoregrind_ppc64_linux.a libreplacemalloc_toolpr=
eload_ppc64_linux.a
endif
+if VGP_PPC32_AIX5
+noinst_LIBRARIES +=3D libcoregrind_ppc32_aix5.a libreplacemalloc_toolpre=
load_ppc32_aix5.a
+endif
+if VGP_PPC64_AIX5
+noinst_LIBRARIES +=3D libcoregrind_ppc64_aix5.a libreplacemalloc_toolpre=
load_ppc64_aix5.a
+endif
=20
#------------------------- launcher -----------------------
# Build the launcher (valgrind) for the primary target only.
@@ -36,9 +44,16 @@
bin_PROGRAMS =3D \
valgrind
=20
+if VGO_AIX5
valgrind_SOURCES =3D \
- launcher.c \
+ launcher-aix5.c \
+ m_debuglog.c \
+ m_vkiscnums.c
+else
+valgrind_SOURCES =3D \
+ launcher-linux.c \
m_debuglog.c
+endif
=20
valgrind_CPPFLAGS =3D $(AM_CPPFLAGS_PRI)
valgrind_CFLAGS =3D $(AM_CFLAGS_PRI)
@@ -49,18 +64,24 @@
=20
=20
noinst_PROGRAMS =3D
-if VG_X86_LINUX
+if VGP_X86_LINUX
noinst_PROGRAMS +=3D vgpreload_core-x86-linux.so
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
noinst_PROGRAMS +=3D vgpreload_core-amd64-linux.so
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
noinst_PROGRAMS +=3D vgpreload_core-ppc32-linux.so
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
noinst_PROGRAMS +=3D vgpreload_core-ppc64-linux.so
endif
+if VGP_PPC32_AIX5
+noinst_PROGRAMS +=3D vgpreload_core-ppc32-aix5.so
+endif
+if VGP_PPC64_AIX5
+noinst_PROGRAMS +=3D vgpreload_core-ppc64-aix5.so
+endif
=20
noinst_HEADERS =3D \
pub_core_aspacemgr.h \
@@ -116,6 +137,7 @@
m_debuginfo/priv_readstabs.h \
m_debuginfo/priv_readdwarf.h \
m_debuginfo/priv_readelf.h \
+ m_debuginfo/priv_readxcoff.h \
m_demangle/ansidecl.h \
m_demangle/dyn-string.h \
m_demangle/demangle.h \
@@ -125,8 +147,11 @@
m_syswrap/priv_syswrap-generic.h \
m_syswrap/priv_syswrap-linux.h \
m_syswrap/priv_syswrap-linux-variants.h \
+ m_syswrap/priv_syswrap-aix5.h \
m_syswrap/priv_syswrap-main.h \
- m_aspacemgr/priv_aspacemgr.h
+ m_aspacemgr/priv_aspacemgr.h \
+ launcher-aix5-bootblock.h \
+ m_initimg/simple_huffman.c
=20
BUILT_SOURCES =3D=20
CLEANFILES =3D=20
@@ -169,9 +194,6 @@
m_vkiscnums.c \
m_aspacemgr/aspacemgr-common.c \
m_debuginfo/storage.c \
- m_debuginfo/readdwarf.c \
- m_debuginfo/readstabs.c \
- m_debuginfo/readelf.c \
m_debuginfo/debuginfo.c \
m_demangle/cp-demangle.c \
m_demangle/cplus-dem.c \
@@ -181,7 +203,6 @@
m_replacemalloc/replacemalloc_core.c \
m_scheduler/scheduler.c \
m_scheduler/sema.c \
- m_syswrap/syswrap-generic.c \
m_syswrap/syswrap-main.c
=20
COREGRIND_LINUX_SOURCE =3D \
@@ -189,8 +210,18 @@
m_syswrap/syswrap-linux.c \
m_syswrap/syswrap-linux-variants.c \
m_aspacemgr/aspacemgr-linux.c \
- m_initimg/initimg-linux.c
+ m_initimg/initimg-linux.c \
+ m_debuginfo/readelf.c \
+ m_debuginfo/readdwarf.c \
+ m_debuginfo/readstabs.c \
+ m_syswrap/syswrap-generic.c
=20
+COREGRIND_AIX5_SOURCE =3D \
+ m_aspacemgr/aspacemgr-aix5.c \
+ m_initimg/initimg-aix5.c \
+ m_debuginfo/readxcoff.c \
+ m_syswrap/syswrap-aix5.c
+
libcoregrind_x86_linux_a_SOURCES =3D \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_LINUX_SOURCE) \
@@ -243,6 +274,35 @@
libcoregrind_ppc64_linux_a_CFLAGS =3D $(AM_CFLAGS_PPC64_LINUX)
libcoregrind_ppc64_linux_a_CCASFLAGS =3D $(AM_CCASFLAGS_PPC64_LINUX)
=20
+libcoregrind_ppc32_aix5_a_SOURCES =3D \
+ $(COREGRIND_SOURCES_COMMON) \
+ $(COREGRIND_AIX5_SOURCE) \
+ m_coredump/coredump-ppc32-aix5.c \
+ m_dispatch/dispatch-ppc32-aix5.S \
+ m_sigframe/sigframe-ppc32-aix5.c \
+ m_syswrap/syscall-ppc32-aix5.S \
+ m_syswrap/syswrap-ppc32-aix5.c
+
+libcoregrind_ppc32_aix5_a_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5)
+libcoregrind_ppc32_aix5_a_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5)
+libcoregrind_ppc32_aix5_a_CCASFLAGS =3D $(AM_CCASFLAGS_PPC32_AIX5)
+libcoregrind_ppc32_aix5_a_AR =3D $(AR) -X32 cru
+
+libcoregrind_ppc64_aix5_a_SOURCES =3D \
+ $(COREGRIND_SOURCES_COMMON) \
+ $(COREGRIND_AIX5_SOURCE) \
+ m_coredump/coredump-ppc64-aix5.c \
+ m_dispatch/dispatch-ppc64-aix5.S \
+ m_sigframe/sigframe-ppc64-aix5.c \
+ m_syswrap/syscall-ppc64-aix5.S \
+ m_syswrap/syswrap-ppc64-aix5.c
+
+libcoregrind_ppc64_aix5_a_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5)
+libcoregrind_ppc64_aix5_a_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5)
+libcoregrind_ppc64_aix5_a_CCASFLAGS =3D $(AM_CCASFLAGS_PPC64_AIX5)
+libcoregrind_ppc64_aix5_a_AR =3D $(AR) -X64 cru
+
+
libreplacemalloc_toolpreload_x86_linux_a_SOURCES =3D m_replacemalloc/vg_=
replace_malloc.c
libreplacemalloc_toolpreload_x86_linux_a_CPPFLAGS =3D $(AM_CPPFLAGS_X86_=
LINUX)
libreplacemalloc_toolpreload_x86_linux_a_CFLAGS =3D $(AM_CFLAGS_X86_LINU=
X) -fpic -fno-omit-frame-pointer
@@ -259,14 +319,28 @@
libreplacemalloc_toolpreload_ppc64_linux_a_CPPFLAGS =3D $(AM_CPPFLAGS_PP=
C64_LINUX)
libreplacemalloc_toolpreload_ppc64_linux_a_CFLAGS =3D $(AM_CFLAGS_PPC64_=
LINUX) -fpic -fno-omit-frame-pointer
=20
+libreplacemalloc_toolpreload_ppc32_aix5_a_SOURCES =3D m_replacemalloc/vg=
_replace_malloc.c
+libreplacemalloc_toolpreload_ppc32_aix5_a_CPPFLAGS =3D $(AM_CPPFLAGS_PPC=
32_AIX5)
+libreplacemalloc_toolpreload_ppc32_aix5_a_CFLAGS =3D $(AM_CFLAGS_PPC32_A=
IX5) -fpic -fno-omit-frame-pointer
+libreplacemalloc_toolpreload_ppc32_aix5_a_AR =3D $(AR) -X32 cru
+
+libreplacemalloc_toolpreload_ppc64_aix5_a_SOURCES =3D m_replacemalloc/vg=
_replace_malloc.c
+libreplacemalloc_toolpreload_ppc64_aix5_a_CPPFLAGS =3D $(AM_CPPFLAGS_PPC=
64_AIX5)
+libreplacemalloc_toolpreload_ppc64_aix5_a_CFLAGS =3D $(AM_CFLAGS_PPC64_A=
IX5) -fpic -fno-omit-frame-pointer
+libreplacemalloc_toolpreload_ppc64_aix5_a_AR =3D $(AR) -X64 cru
+
m_dispatch/dispatch-x86-linux.S: libvex_guest_offsets.h
m_dispatch/dispatch-amd64-linux.S: libvex_guest_offsets.h
m_dispatch/dispatch-ppc32-linux.S: libvex_guest_offsets.h
m_dispatch/dispatch-ppc64-linux.S: libvex_guest_offsets.h
+m_dispatch/dispatch-ppc32-aix5.S: libvex_guest_offsets.h
+m_dispatch/dispatch-ppc64-aix5.S: libvex_guest_offsets.h
m_syswrap/syscall-x86-linux.S: libvex_guest_offsets.h
m_syswrap/syscall-amd64-linux.S: libvex_guest_offsets.h
m_syswrap/syscall-ppc32-linux.S: libvex_guest_offsets.h
m_syswrap/syscall-ppc64-linux.S: libvex_guest_offsets.h
+m_syswrap/syscall-ppc32-aix5.S: libvex_guest_offsets.h
+m_syswrap/syscall-ppc64-aix5.S: libvex_guest_offsets.h
m_syswrap/syswrap-main.c: libvex_guest_offsets.h
=20
libvex_guest_offsets.h:
@@ -294,8 +368,18 @@
vgpreload_core_ppc64_linux_so_CFLAGS =3D $(AM_CFLAGS_PPC64_LINUX) $(AM_C=
FLAGS_PIC)
vgpreload_core_ppc64_linux_so_LDFLAGS =3D $(PRELOAD_LDFLAGS_PPC64_LINUX)
=20
+vgpreload_core_ppc32_aix5_so_SOURCES =3D $(VGPRELOAD_CORE_SOURCES_COMMON=
)
+vgpreload_core_ppc32_aix5_so_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5)
+vgpreload_core_ppc32_aix5_so_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5) $(AM_CFL=
AGS_PIC)
+vgpreload_core_ppc32_aix5_so_LDFLAGS =3D $(PRELOAD_LDFLAGS_PPC32_AIX5)
+
+vgpreload_core_ppc64_aix5_so_SOURCES =3D $(VGPRELOAD_CORE_SOURCES_COMMON=
)
+vgpreload_core_ppc64_aix5_so_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5)
+vgpreload_core_ppc64_aix5_so_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5) $(AM_CFL=
AGS_PIC)
+vgpreload_core_ppc64_aix5_so_LDFLAGS =3D $(PRELOAD_LDFLAGS_PPC64_AIX5)
+
clean-local:
- $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" clean
+ $(MAKE) -C @VEX_DIR@ CC=3D"$(CC)" AR=3D"$(AR)" clean
=20
MANUAL_DEPS =3D $(noinst_HEADERS) $(include_HEADERS)
=20
Modified: trunk/helgrind/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/helgrind/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/helgrind/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -1,18 +1,24 @@
include $(top_srcdir)/Makefile.tool.am
=20
noinst_PROGRAMS =3D=20
-if VG_X86_LINUX
+if VGP_X86_LINUX
noinst_PROGRAMS +=3D helgrind-x86-linux vgpreload_helgrind-x86-linux.so
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
noinst_PROGRAMS +=3D helgrind-amd64-linux vgpreload_helgrind-amd64-linux=
.so
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
noinst_PROGRAMS +=3D helgrind-ppc32-linux vgpreload_helgrind-ppc32-linux=
.so
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
noinst_PROGRAMS +=3D helgrind-ppc64-linux vgpreload_helgrind-ppc64-linux=
.so
endif
+if VGP_PPC32_AIX5
+noinst_PROGRAMS +=3D helgrind-ppc32-aix5 vgpreload_helgrind-ppc32-aix5.s=
o
+endif
+if VGP_PPC64_AIX5
+noinst_PROGRAMS +=3D helgrind-ppc64-aix5 vgpreload_helgrind-ppc64-aix5.s=
o
+endif
=20
vgpreload_helgrind_x86_linux_so_SOURCES =3D=20
vgpreload_helgrind_x86_linux_so_CPPFLAGS =3D $(AM_CPPFLAGS_X86_LINUX=
)
@@ -46,6 +52,22 @@
$(PRELOAD_LDFLAGS_PPC64_LINUX) \
$(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX)
=20
+vgpreload_helgrind_ppc32_aix5_so_SOURCES =3D=20
+vgpreload_helgrind_ppc32_aix5_so_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AI=
X5)
+vgpreload_helgrind_ppc32_aix5_so_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5=
) $(AM_CFLAGS_PIC)
+vgpreload_helgrind_ppc32_aix5_so_DEPENDENCIES =3D $(LIBREPLACEMALLOC_PPC=
32_AIX5)
+vgpreload_helgrind_ppc32_aix5_so_LDFLAGS =3D \
+ $(PRELOAD_LDFLAGS_PPC32_AIX5) \
+ $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5)
+
+vgpreload_helgrind_ppc64_aix5_so_SOURCES =3D=20
+vgpreload_helgrind_ppc64_aix5_so_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AI=
X5)
+vgpreload_helgrind_ppc64_aix5_so_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5=
) $(AM_CFLAGS_PIC)
+vgpreload_helgrind_ppc64_aix5_so_DEPENDENCIES =3D $(LIBREPLACEMALLOC_PPC=
64_AIX5)
+vgpreload_helgrind_ppc64_aix5_so_LDFLAGS =3D \
+ $(PRELOAD_LDFLAGS_PPC64_AIX5) \
+ $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5)
+
HELGRIND_SOURCES_COMMON =3D hg_main.c
=20
helgrind_x86_linux_SOURCES =3D $(HELGRIND_SOURCES_COMMON)
@@ -76,6 +98,20 @@
helgrind_ppc64_linux_LDADD =3D $(TOOL_LDADD_PPC64_LINUX)
helgrind_ppc64_linux_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_LINUX)
=20
+helgrind_ppc32_aix5_SOURCES =3D $(HELGRIND_SOURCES_COMMON)
+helgrind_ppc32_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5)
+helgrind_ppc32_aix5_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5)
+helgrind_ppc32_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC32_AIX5)
+helgrind_ppc32_aix5_LDADD =3D $(TOOL_LDADD_PPC32_AIX5)
+helgrind_ppc32_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC32_AIX5)
+
+helgrind_ppc64_aix5_SOURCES =3D $(HELGRIND_SOURCES_COMMON)
+helgrind_ppc64_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5)
+helgrind_ppc64_aix5_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5)
+helgrind_ppc64_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_AIX5)
+helgrind_ppc64_aix5_LDADD =3D $(TOOL_LDADD_PPC64_AIX5)
+helgrind_ppc64_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_AIX5)
+
hgincludedir =3D $(includedir)/valgrind
=20
hginclude_HEADERS =3D helgrind.h
Modified: trunk/helgrind/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/helgrind/tests/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/helgrind/tests/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -19,10 +19,14 @@
# force -gstabs, because we don't print symaddr for DWARF yet
# Sigh, gcc-3.4.3 on ppc64 generates bogus .stabs. So disable it
# for now on ppc64-linux.
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_=
PRI)
else
-AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -gstabs $(AM_FLAG_M3264_=
PRI)
+
+# In fact -gstabs is broken on many systems now
+#AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -gstabs $(AM_FLAG_M3264=
_PRI)
+AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_=
PRI)
+
endif
=20
LDADD =3D -lpthread
Modified: trunk/include/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/include/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/include/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -28,19 +28,22 @@
pub_tool_stacktrace.h \
pub_tool_threadstate.h \
pub_tool_tooliface.h \
+ pub_tool_vki.h \
pub_tool_vkiscnums.h \
valgrind.h \
- vki/vki-linux.h \
- vki/vki-amd64-linux.h \
- vki/vki-ppc32-linux.h \
- vki/vki-ppc64-linux.h \
- vki/vki-x86-linux.h \
vki/vki-linux.h \
vki/vki-posixtypes-amd64-linux.h \
vki/vki-posixtypes-ppc32-linux.h \
vki/vki-posixtypes-ppc64-linux.h \
vki/vki-posixtypes-x86-linux.h \
+ vki/vki-amd64-linux.h \
+ vki/vki-ppc32-aix5.h \
+ vki/vki-ppc64-aix5.h \
+ vki/vki-ppc32-linux.h \
+ vki/vki-ppc64-linux.h \
+ vki/vki-x86-linux.h \
vki/vki-scnums-amd64-linux.h \
vki/vki-scnums-ppc32-linux.h \
vki/vki-scnums-ppc64-linux.h \
- vki/vki-scnums-x86-linux.h
+ vki/vki-scnums-x86-linux.h \
+ vki/vki-scnums-aix5.h
Modified: trunk/lackey/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lackey/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/lackey/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -1,18 +1,24 @@
include $(top_srcdir)/Makefile.tool.am
=20
noinst_PROGRAMS =3D=20
-if VG_X86_LINUX
+if VGP_X86_LINUX
noinst_PROGRAMS +=3D lackey-x86-linux
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
noinst_PROGRAMS +=3D lackey-amd64-linux
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
noinst_PROGRAMS +=3D lackey-ppc32-linux
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
noinst_PROGRAMS +=3D lackey-ppc64-linux
endif
+if VGP_PPC32_AIX5
+noinst_PROGRAMS +=3D lackey-ppc32-aix5
+endif
+if VGP_PPC64_AIX5
+noinst_PROGRAMS +=3D lackey-ppc64-aix5
+endif
=20
LACKEY_SOURCES_COMMON =3D lk_main.c
=20
@@ -43,3 +49,17 @@
lackey_ppc64_linux_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_LINUX)
lackey_ppc64_linux_LDADD =3D $(TOOL_LDADD_PPC64_LINUX)
lackey_ppc64_linux_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_LINUX)
+
+lackey_ppc32_aix5_SOURCES =3D $(LACKEY_SOURCES_COMMON)
+lackey_ppc32_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5)
+lackey_ppc32_aix5_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5)
+lackey_ppc32_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC32_AIX5)
+lackey_ppc32_aix5_LDADD =3D $(TOOL_LDADD_PPC32_AIX5)
+lackey_ppc32_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC32_AIX5)
+
+lackey_ppc64_aix5_SOURCES =3D $(LACKEY_SOURCES_COMMON)
+lackey_ppc64_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5)
+lackey_ppc64_aix5_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5)
+lackey_ppc64_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_AIX5)
+lackey_ppc64_aix5_LDADD =3D $(TOOL_LDADD_PPC64_AIX5)
+lackey_ppc64_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_AIX5)
Modified: trunk/massif/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/massif/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/massif/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -3,18 +3,24 @@
SUBDIRS +=3D hp2ps
=20
noinst_PROGRAMS =3D=20
-if VG_X86_LINUX
+if VGP_X86_LINUX
noinst_PROGRAMS +=3D massif-x86-linux vgpreload_massif-x86-linux.so
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
noinst_PROGRAMS +=3D massif-amd64-linux vgpreload_massif-amd64-linux.so
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
noinst_PROGRAMS +=3D massif-ppc32-linux vgpreload_massif-ppc32-linux.so
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
noinst_PROGRAMS +=3D massif-ppc64-linux vgpreload_massif-ppc64-linux.so
endif
+if VGP_PPC32_AIX5
+noinst_PROGRAMS +=3D massif-ppc32-aix5 vgpreload_massif-ppc32-aix5.so
+endif
+if VGP_PPC64_AIX5
+noinst_PROGRAMS +=3D massif-ppc64-aix5 vgpreload_massif-ppc64-aix5.so
+endif
=20
vgpreload_massif_x86_linux_so_SOURCES =3D=20
vgpreload_massif_x86_linux_so_CPPFLAGS =3D $(AM_CPPFLAGS_X86_LINUX)
@@ -48,6 +54,22 @@
$(PRELOAD_LDFLAGS_PPC64_LINUX) \
$(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX)
=20
+vgpreload_massif_ppc32_aix5_so_SOURCES =3D=20
+vgpreload_massif_ppc32_aix5_so_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5=
)
+vgpreload_massif_ppc32_aix5_so_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5) =
$(AM_CFLAGS_PIC)
+vgpreload_massif_ppc32_aix5_so_DEPENDENCIES =3D $(LIBREPLACEMALLOC_PPC32=
_AIX5)
+vgpreload_massif_ppc32_aix5_so_LDFLAGS =3D \
+ $(PRELOAD_LDFLAGS_PPC32_AIX5) \
+ $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5)
+
+vgpreload_massif_ppc64_aix5_so_SOURCES =3D=20
+vgpreload_massif_ppc64_aix5_so_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5=
)
+vgpreload_massif_ppc64_aix5_so_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5) =
$(AM_CFLAGS_PIC)
+vgpreload_massif_ppc64_aix5_so_DEPENDENCIES =3D $(LIBREPLACEMALLOC_PPC64=
_AIX5)
+vgpreload_massif_ppc64_aix5_so_LDFLAGS =3D \
+ $(PRELOAD_LDFLAGS_PPC64_AIX5) \
+ $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5)
+
MASSIF_SOURCES_COMMON =3D ms_main.c
=20
massif_x86_linux_SOURCES =3D $(MASSIF_SOURCES_COMMON)
@@ -77,3 +99,17 @@
massif_ppc64_linux_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_LINUX)
massif_ppc64_linux_LDADD =3D $(TOOL_LDADD_PPC64_LINUX)
massif_ppc64_linux_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_LINUX)
+
+massif_ppc32_aix5_SOURCES =3D $(MASSIF_SOURCES_COMMON)
+massif_ppc32_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5)
+massif_ppc32_aix5_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5)
+massif_ppc32_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC32_AIX5)
+massif_ppc32_aix5_LDADD =3D $(TOOL_LDADD_PPC32_AIX5)
+massif_ppc32_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC32_AIX5)
+
+massif_ppc64_aix5_SOURCES =3D $(MASSIF_SOURCES_COMMON)
+massif_ppc64_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5)
+massif_ppc64_aix5_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5)
+massif_ppc64_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_AIX5)
+massif_ppc64_aix5_LDADD =3D $(TOOL_LDADD_PPC64_AIX5)
+massif_ppc64_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_AIX5)
Modified: trunk/memcheck/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/memcheck/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -1,18 +1,24 @@
include $(top_srcdir)/Makefile.tool.am
=20
noinst_PROGRAMS =3D=20
-if VG_X86_LINUX
+if VGP_X86_LINUX
noinst_PROGRAMS +=3D memcheck-x86-linux vgpreload_memcheck-x86-linux.so
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
noinst_PROGRAMS +=3D memcheck-amd64-linux vgpreload_memcheck-amd64-linux=
.so
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
noinst_PROGRAMS +=3D memcheck-ppc32-linux vgpreload_memcheck-ppc32-linux=
.so
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
noinst_PROGRAMS +=3D memcheck-ppc64-linux vgpreload_memcheck-ppc64-linux=
.so
endif
+if VGP_PPC32_AIX5
+noinst_PROGRAMS +=3D memcheck-ppc32-aix5 vgpreload_memcheck-ppc32-aix5.s=
o
+endif
+if VGP_PPC64_AIX5
+noinst_PROGRAMS +=3D memcheck-ppc64-aix5 vgpreload_memcheck-ppc64-aix5.s=
o
+endif
=20
VGPRELOAD_MEMCHECK_SOURCES_COMMON =3D mc_replace_strmem.c
=20
@@ -52,6 +58,24 @@
$(PRELOAD_LDFLAGS_PPC64_LINUX) \
$(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX)
=20
+vgpreload_memcheck_ppc32_aix5_so_SOURCES =3D $(VGPRELOAD_MEMCHECK_S=
OURCES_COMMON)
+vgpreload_memcheck_ppc32_aix5_so_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AI=
X5)
+vgpreload_memcheck_ppc32_aix5_so_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5=
) $(AM_CFLAGS_PIC) -O2
+vgpreload_memcheck_ppc32_aix5_so_CCASFLAGS =3D $(AM_CCASFLAGS_PPC32_A=
IX5)
+vgpreload_memcheck_ppc32_aix5_so_DEPENDENCIES =3D $(LIBREPLACEMALLOC_PPC=
32_AIX5)
+vgpreload_memcheck_ppc32_aix5_so_LDFLAGS =3D \
+ $(PRELOAD_LDFLAGS_PPC32_AIX5) \
+ $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5)
+
+vgpreload_memcheck_ppc64_aix5_so_SOURCES =3D $(VGPRELOAD_MEMCHECK_S=
OURCES_COMMON)
+vgpreload_memcheck_ppc64_aix5_so_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AI=
X5)
+vgpreload_memcheck_ppc64_aix5_so_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5=
) $(AM_CFLAGS_PIC) -O2
+vgpreload_memcheck_ppc64_aix5_so_CCASFLAGS =3D $(AM_CCASFLAGS_PPC64_A=
IX5)
+vgpreload_memcheck_ppc64_aix5_so_DEPENDENCIES =3D $(LIBREPLACEMALLOC_PPC=
64_AIX5)
+vgpreload_memcheck_ppc64_aix5_so_LDFLAGS =3D \
+ $(PRELOAD_LDFLAGS_PPC64_AIX5) \
+ $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5)
+
MEMCHECK_SOURCES_COMMON =3D \
mc_leakcheck.c \
mc_malloc_wrappers.c \
@@ -90,6 +114,22 @@
memcheck_ppc64_linux_LDADD =3D $(TOOL_LDADD_PPC64_LINUX)
memcheck_ppc64_linux_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_LINUX)
=20
+memcheck_ppc32_aix5_SOURCES =3D $(MEMCHECK_SOURCES_COMMON)
+memcheck_ppc32_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5)
+memcheck_ppc32_aix5_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5) -O2
+memcheck_ppc32_aix5_CCASFLAGS =3D $(AM_CCASFLAGS_PPC32_AIX5)
+memcheck_ppc32_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC32_AIX5)
+memcheck_ppc32_aix5_LDADD =3D $(TOOL_LDADD_PPC32_AIX5)
+memcheck_ppc32_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC32_AIX5)
+
+memcheck_ppc64_aix5_SOURCES =3D $(MEMCHECK_SOURCES_COMMON)
+memcheck_ppc64_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5)
+memcheck_ppc64_aix5_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5) -O2
+memcheck_ppc64_aix5_CCASFLAGS =3D $(AM_CCASFLAGS_PPC64_AIX5)
+memcheck_ppc64_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_AIX5)
+memcheck_ppc64_aix5_LDADD =3D $(TOOL_LDADD_PPC64_AIX5)
+memcheck_ppc64_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_AIX5)
+
mcincludedir =3D $(includedir)/valgrind
=20
mcinclude_HEADERS =3D \
Modified: trunk/memcheck/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/memcheck/tests/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -3,16 +3,16 @@
include $(top_srcdir)/Makefile.flags.am
=20
SUBDIRS =3D .
-if VG_X86_LINUX
+if VGP_X86_LINUX
SUBDIRS +=3D x86
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
SUBDIRS +=3D amd64
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
SUBDIRS +=3D ppc32
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
SUBDIRS +=3D ppc64
endif
=20
@@ -133,6 +133,7 @@
wrap7.vgtest wrap7.stdout.exp wrap7.stderr.exp \
wrap8.vgtest wrap8.stdout.exp wrap8.stderr.exp \
wrap8.stdout.exp2 wrap8.stderr.exp2 \
+ wrap8.stdout.exp3 wrap8.stderr.exp3 \
writev.stderr.exp writev.stderr.exp2 writev.stderr.exp3 writev.vgtest \
xml1.stderr.exp xml1.stderr.exp2 xml1.stderr.exp3 \
xml1.stderr.exp64 xml1.stderr.exp64_2 xml1.stdout.exp \
@@ -205,18 +206,55 @@
deep_templates_SOURCES =3D deep_templates.cpp
deep_templates_CXXFLAGS =3D $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -gstabs
=20
+if VGP_PPC32_AIX5
+if VGP_PPC64_AIX5
+else
+ # persuade the AIX linker not to junk apparently unused
+ # function descriptors. Unfortunately -Wl,-G -Wl,-bnogc
+ # produces a link error on 64-bit AIX, hence only 32-bit
+ # gets these flags.
+ wrap1_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
+ wrap2_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
+ wrap3_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
+ wrap4_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
+ wrap5_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
+ wrap6_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
+ wrap8_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
+endif
+endif
+
# Build shared object for wrap7
wrap7_SOURCES =3D wrap7.c
wrap7_DEPENDENCIES =3D wrap7so.so
-wrap7_LDFLAGS =3D $(AM_FLAG_M3264_PRI) \
+if VGP_PPC64_AIX5=20
+ wrap7_LDADD =3D `pwd`/wrap7so.so
+ wrap7_LDFLAGS =3D $(AM_FLAG_M3264_PRI)
+else
+if VGP_PPC32_AIX5
+ wrap7_LDADD =3D `pwd`/wrap7so.so
+ wrap7_LDFLAGS =3D $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
+else
+ wrap7_LDADD =3D wrap7so.so
+ wrap7_LDFLAGS =3D $(AM_FLAG_M3264_PRI) \
-Wl,-rpath,$(top_builddir)/memcheck/tests
-wrap7_LDADD =3D wrap7so.so
+endif
+endif
+
wrap7so_so_SOURCES =3D wrap7so.c
wrap7so_so_LDADD =3D=20
wrap7so_so_DEPENDENCIES =3D=20
-wrap7so_so_LDFLAGS =3D -fpic $(AM_FLAG_M3264_PRI) \
- -Wl,-soname -Wl,wrap7so.so -shared
wrap7so_so_CFLAGS =3D -fpic $(AM_FLAG_M3264_PRI)
+if VGP_PPC64_AIX5
+ wrap7so_so_LDFLAGS =3D -fpic $(AM_FLAG_M3264_PRI) -shared
+else
+if VGP_PPC32_AIX5
+ wrap7so_so_LDFLAGS =3D -fpic $(AM_FLAG_M3264_PRI) -shared \
+ -Wl,-G -Wl,-bnogc
+else
+ wrap7so_so_LDFLAGS =3D -fpic $(AM_FLAG_M3264_PRI) -shared \
+ -Wl,-soname -Wl,wrap7so.so
+endif
+endif
=20
# Valgrind unit self-tests
#hello_LDFLAGS =3D -Wl,-defsym,valt_load_address=3D0x50000000 \
Modified: trunk/none/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/none/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -1,18 +1,24 @@
include $(top_srcdir)/Makefile.tool.am
=20
noinst_PROGRAMS =3D=20
-if VG_X86_LINUX
+if VGP_X86_LINUX
noinst_PROGRAMS +=3D none-x86-linux
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
noinst_PROGRAMS +=3D none-amd64-linux
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
noinst_PROGRAMS +=3D none-ppc32-linux
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
noinst_PROGRAMS +=3D none-ppc64-linux
endif
+if VGP_PPC32_AIX5
+noinst_PROGRAMS +=3D none-ppc32-aix5
+endif
+if VGP_PPC64_AIX5
+noinst_PROGRAMS +=3D none-ppc64-aix5
+endif
=20
NONE_SOURCES_COMMON =3D nl_main.c
=20
@@ -43,3 +49,17 @@
none_ppc64_linux_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_LINUX)
none_ppc64_linux_LDADD =3D $(TOOL_LDADD_PPC64_LINUX)
none_ppc64_linux_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_LINUX)
+
+none_ppc32_aix5_SOURCES =3D $(NONE_SOURCES_COMMON)
+none_ppc32_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC32_AIX5)
+none_ppc32_aix5_CFLAGS =3D $(AM_CFLAGS_PPC32_AIX5)
+none_ppc32_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC32_AIX5)
+none_ppc32_aix5_LDADD =3D $(TOOL_LDADD_PPC32_AIX5)
+none_ppc32_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC32_AIX5)
+
+none_ppc64_aix5_SOURCES =3D $(NONE_SOURCES_COMMON)
+none_ppc64_aix5_CPPFLAGS =3D $(AM_CPPFLAGS_PPC64_AIX5)
+none_ppc64_aix5_CFLAGS =3D $(AM_CFLAGS_PPC64_AIX5)
+none_ppc64_aix5_DEPENDENCIES =3D $(COREGRIND_LIBS_PPC64_AIX5)
+none_ppc64_aix5_LDADD =3D $(TOOL_LDADD_PPC64_AIX5)
+none_ppc64_aix5_LDFLAGS =3D $(TOOL_LDFLAGS_PPC64_AIX5)
Modified: trunk/none/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/Makefile.am 2006-10-17 00:39:31 UTC (rev 6241)
+++ trunk/none/tests/Makefile.am 2006-10-17 00:56:43 UTC (rev 6242)
@@ -3,16 +3,16 @@
include $(top_srcdir)/Makefile.flags.am
=20
SUBDIRS =3D .
-if VG_X86_LINUX
+if VGP_X86_LINUX
SUBDIRS +=3D x86
endif
-if VG_AMD64_LINUX
+if VGP_AMD64_LINUX
SUBDIRS +=3D amd64
endif
-if VG_PPC32_LINUX
+if VGP_PPC32_LINUX
SUBDIRS +=3D ppc32
endif
-if VG_PPC64_LINUX
+if VGP_PPC64_LINUX
SUBDIRS +=3D ppc64
endif
=20
@@ -175,7 +175,11 @@
pth_once_LDADD =3D -lpthread
pth_rwlock_LDADD =3D -lpthread
pth_stackalign_LDADD =3D -lpthread
-res_search_LDADD =3D -lresolv -lpthread
+if VGP_PPC32_AIX5
+ res_search_LDADD =3D -lpthread
+else
+ res_search_LDADD =3D -lresolv -lpthread
+endif
semlimit_LDADD =3D -lpthread
susphello_LDADD =3D -lpthread
thread_exits_LDADD =3D -lpthread
@@ -183,12 +187,21 @@
threadederrno_LDADD =3D -lpthread
tls_SOURCES =3D tls.c tls2.c
tls_DEPENDENCIES =3D tls.so
-tls_LDFLAGS =3D -Wl,-rpath,$(top_builddir)/none/tests
+if VGP_PPC32_AIX5
+ tls_LDFLAGS =3D=20
+else
+ tls_LDFLAGS =3D -Wl,-rpath,$(top_builddir)/none/tests
+endif
tls_LDADD =3D tls.so -lpthread
tls_so_SOURCES =3D tls_so.c
-tls_so_LDADD =3D tls2.so
tls_so_DEPENDENCIES =3D tls2.so
-tls_so_LDFLAGS =3D -Wl,-rpath,$(top_builddir)/none/tests -shared -fPIC
+if VGP_PPC32_AIX5
+ tls_so_LDFLAGS =3D -shared -fPIC
+ tls_so_LDADD =3D `pwd`/tls2.so
+else
+ tls_so_LDFLAGS =3D -Wl,-rpath,$(top_builddir)/none/tests -shared -fPIC
+ tls_so_LDADD =3D tls2.so
+endif
tls_so_CFLAGS =3D $(AM_FLAG_M3264_PRI) -fPIC
tls2_so_SOURCES =3D tls2_so.c
tls2_so_LDFLAGS =3D -shared
|