Arch-abstraction:

- factor out different CFLAGS in Makefiles

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2829

diff --git a/Makefile.tool-flags.am b/Makefile.tool-flags.am
index 90de4dc18a99232e58bd34e05f79c28b83e5ceea..776d9137945423588c28553a3d4009b44e6635b8 100644 (file)
--- a/Makefile.tool-flags.am
+++ b/Makefile.tool-flags.am
@@ -4,7 +4,6 @@ add_includes = -I$(top_builddir)/include -I$(top_srcdir)/include \
                -I$(top_srcdir)/include/$(VG_ARCH)
 
 AM_CPPFLAGS = $(add_includes)
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
-               @PREFERRED_STACK_BOUNDARY@ -g
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -g @ARCH_TOOL_AM_CFLAGS@
 AM_CCASFLAGS = $(add_includes)
 

diff --git a/configure.in b/configure.in
index d1b61557c5e374876cda27e15afef0d756dde3a1..7372085c8b086a35cfbbcf478aba968a49bc37e4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -68,18 +68,24 @@ AC_CANONICAL_HOST
 AC_MSG_CHECKING([for a supported CPU])
 AC_SUBST(VG_ARCH)
 AC_SUBST(KICKSTART_BASE)
+AC_SUBST(ARCH_CORE_AM_CFLAGS)
+AC_SUBST(ARCH_TOOL_AM_CFLAGS)
 
 case "${host_cpu}" in
      i?86) 
        AC_MSG_RESULT([ok (${host_cpu})])
         VG_ARCH="x86"
         KICKSTART_BASE="0xb0000000"
+        ARCH_CORE_AM_CFLAGS="-fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -DELFSZ=32"
+        ARCH_TOOL_AM_CFLAGS="-fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@"
         ;;
 
      powerpc*)
         AC_MSG_RESULT([no (${host_cpu})])
         VG_ARCH="ppc"
         KICKSTART_BASE="0x70000000"
+        ARCH_CORE_AM_CFLAGS="-DELFSZ=32"
+        ARCH_TOOL_AM_CFLAGS="-fpic"
         AC_MSG_ERROR([PowerPC not supported. Sorry])
         ;;
 

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index c6b2e0bece93fae91393698097c39a22c588359e..a1a4a1795189f7e16ad1c93d0a9d387cf1b9baed 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -6,8 +6,7 @@ SUBDIRS = $(VG_ARCH) $(VG_PLATFORM) demangle . docs
 AM_CPPFLAGS += -DVG_LIBDIR="\"$(valdir)"\" -I$(srcdir)/demangle \
                -DKICKSTART_BASE=@KICKSTART_BASE@ \
                -DVG_PLATFORM="\"$(VG_PLATFORM)"\"
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fno-omit-frame-pointer \
-               @PREFERRED_STACK_BOUNDARY@ -g -DELFSZ=32
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -g @ARCH_CORE_AM_CFLAGS@
 
 default.supp: $(SUPP_FILES)