update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / coregrind / Makefile.am

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/Makefile.am b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/Makefile.am
index 1195c9894729ebbd70dafe66e4f7ddcd69eb3e12..c5a876c61271e1cae597d3b46be3f6fc201ca369 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/Makefile.am
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/Makefile.am
@@ -59,12 +59,18 @@ valgrind_CFLAGS    = $(AM_CFLAGS_PRI)
 valgrind_CXXFLAGS  = $(AM_CXXFLAGS_PRI)
 valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI)
 valgrind_LDFLAGS   = $(AM_CFLAGS_PRI)
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
+valgrind_LDFLAGS   += -Wl,-read_only_relocs -Wl,suppress
+endif
 
 no_op_client_for_valgrind_SOURCES = no_op_client_for_valgrind.c
 no_op_client_for_valgrind_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
 no_op_client_for_valgrind_CFLAGS    = $(AM_CFLAGS_PRI)
 no_op_client_for_valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI)
 no_op_client_for_valgrind_LDFLAGS   = $(AM_CFLAGS_PRI)
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
+no_op_client_for_valgrind_LDFLAGS   += -Wl,-read_only_relocs -Wl,suppress
+endif
 
 #----------------------------------------------------------------------------
 # Darwin Mach stuff
@@ -114,11 +120,13 @@ mach_defs += \
         /usr/include/mach/vm_map.defs
 endif
 
-# Be careful w.r.t. parellel builds.  See section 27.9 of the automake info
+# Be careful w.r.t. parallel builds.  See section 27.9 of the automake info
 # page, "Handling Tools that Produce many Outputs".
-$(mach_user_srcs): $(mach_defs)
+$(abs_builddir)/m_mach: 
+       mkdir -p $@
+$(mach_user_srcs): $(mach_defs) $(abs_builddir)/m_mach
        (cd m_mach && mig $(mach_defs))
-$(mach_hdrs): $(mach_defs) $(mach_user_srcs)
+$(mach_hdrs): $(mach_defs) $(mach_user_srcs) $(abs_builddir)/m_mach
        (cd m_mach && mig $(mach_defs))
 
 #----------------------------------------------------------------------------
@@ -311,8 +319,6 @@ COREGRIND_SOURCES_COMMON = \
        m_sigframe/sigframe-ppc64-aix5.c \
        m_sigframe/sigframe-x86-darwin.c \
        m_sigframe/sigframe-amd64-darwin.c \
-       m_start-x86-darwin.S \
-       m_start-amd64-darwin.S \
        m_syswrap/syscall-x86-linux.S \
        m_syswrap/syscall-amd64-linux.S \
        m_syswrap/syscall-ppc32-linux.S \