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.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6242 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.core.am b/Makefile.core.am
index 6cf336c..a0a4646 100644
--- a/Makefile.core.am
+++ b/Makefile.core.am
@@ -46,10 +46,28 @@
 		-DVGO_linux=1 \
 		-DVGP_ppc64_linux=1
 
-include $(top_srcdir)/Makefile.flags.am
+add_includes_ppc32_aix5 = -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="\"ppc32-aix5\"" \
+		-DVGA_ppc32=1 \
+		-DVGO_aix5=1 \
+		-DVGP_ppc32_aix5=1
 
-PRELOAD_LDFLAGS_COMMON = -nostdlib -shared -Wl,-z,interpose,-z,initfirst
-PRELOAD_LDFLAGS_X86_LINUX = $(PRELOAD_LDFLAGS_COMMON) @FLAG_M32@
-PRELOAD_LDFLAGS_AMD64_LINUX = $(PRELOAD_LDFLAGS_COMMON) -m64
-PRELOAD_LDFLAGS_PPC32_LINUX = $(PRELOAD_LDFLAGS_COMMON) @FLAG_M32@
-PRELOAD_LDFLAGS_PPC64_LINUX = $(PRELOAD_LDFLAGS_COMMON) -m64
+add_includes_ppc64_aix5 = -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="\"ppc64-aix5\"" \
+		-DVGA_ppc64=1 \
+		-DVGO_aix5=1 \
+		-DVGP_ppc64_aix5=1
+
+include $(top_srcdir)/Makefile.flags.am