|
From: <sv...@va...> - 2009-04-24 04:12:35
|
Author: njn Date: 2009-04-24 05:12:28 +0100 (Fri, 24 Apr 2009) New Revision: 9598 Log: Merged r9596 (build system tweaks, minus the Darwin bits) from the DARWIN branch. Added: trunk/Makefile.core-tool.am Removed: trunk/Makefile.install.am Modified: trunk/Makefile.am trunk/Makefile.tool.am trunk/coregrind/Makefile.am trunk/none/tests/ppc32/Makefile.am trunk/none/tests/ppc64/Makefile.am trunk/none/tests/x86/Makefile.am Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-04-24 04:02:59 UTC (rev 9597) +++ trunk/Makefile.am 2009-04-24 04:12:28 UTC (rev 9598) @@ -106,7 +106,7 @@ rm -f $(inplacedir)/default.supp ln -s ../default.supp $(inplacedir) -distclean-local: +clean-local: rm -rf $(inplacedir) # These list the bits of vex we need to install Copied: trunk/Makefile.core-tool.am (from rev 9596, branches/DARWIN/Makefile.core-tool.am) =================================================================== --- trunk/Makefile.core-tool.am (rev 0) +++ trunk/Makefile.core-tool.am 2009-04-24 04:12:28 UTC (rev 9598) @@ -0,0 +1,26 @@ +# This file contains things shared by coregrind/Makefile.am and tool +# Makefile.am files. + +# This is used by coregrind/Makefile.am and Makefile.tool.am for doing +# "in-place" installs. It copies $(noinst_PROGRAMS) into $inplacedir. +# It needs to be depended on by an 'all-local' rule. +inplace-noinst_PROGRAMS: + if [ -n "$(noinst_PROGRAMS)" ] ; then \ + mkdir -p $(inplacedir); \ + for f in $(noinst_PROGRAMS) ; do \ + rm -f $(inplacedir)/$$f; \ + ln -f -s ../$(subdir)/$$f $(inplacedir); \ + done ; \ + fi + +# This is used by coregrind/Makefile.am and by <tool>/Makefile.am for doing +# "make install". It copies $(noinst_PROGRAMS) into $prefix/lib/valgrind/. +# It needs to be depended on by an 'install-exec-local' rule. +install-noinst_PROGRAMS: + if [ -n "$(noinst_PROGRAMS)" ] ; then \ + $(mkinstalldirs) $(DESTDIR)$(valdir); \ + for f in $(noinst_PROGRAMS); do \ + $(INSTALL_PROGRAM) $$f $(DESTDIR)$(valdir); \ + done ; \ + fi + Deleted: trunk/Makefile.install.am =================================================================== --- trunk/Makefile.install.am 2009-04-24 04:02:59 UTC (rev 9597) +++ trunk/Makefile.install.am 2009-04-24 04:12:28 UTC (rev 9598) @@ -1,23 +0,0 @@ -# This is used by coregrind/Makefile.am and Makefile.tool.am for doing -# "in-place" installs. It copies $(noinst_PROGRAMS) into $inplacedir. -# It needs to be depended on by an 'all-local' rule. -inplace-noinst_PROGRAMS: - if [ -n "$(noinst_PROGRAMS)" ] ; then \ - mkdir -p $(inplacedir); \ - for f in $(noinst_PROGRAMS) ; do \ - rm -f $(inplacedir)/$$f; \ - ln -f -s ../$(subdir)/$$f $(inplacedir); \ - done ; \ - fi - -# This is used by coregrind/Makefile.am and by <tool>/Makefile.am for doing -# "make install". It copies $(noinst_PROGRAMS) into $prefix/lib/valgrind/. -# It needs to be depended on by an 'install-exec-local' rule. -install-noinst_PROGRAMS: - if [ -n "$(noinst_PROGRAMS)" ] ; then \ - $(mkinstalldirs) $(DESTDIR)$(valdir); \ - for f in $(noinst_PROGRAMS); do \ - $(INSTALL_PROGRAM) $$f $(DESTDIR)$(valdir); \ - done ; \ - fi - Modified: trunk/Makefile.tool.am =================================================================== --- trunk/Makefile.tool.am 2009-04-24 04:02:59 UTC (rev 9597) +++ trunk/Makefile.tool.am 2009-04-24 04:12:28 UTC (rev 9598) @@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.all.am include $(top_srcdir)/Makefile.flags.am -include $(top_srcdir)/Makefile.install.am +include $(top_srcdir)/Makefile.core-tool.am LIBREPLACEMALLOC_X86_LINUX = \ Modified: trunk/coregrind/Makefile.am =================================================================== --- trunk/coregrind/Makefile.am 2009-04-24 04:02:59 UTC (rev 9597) +++ trunk/coregrind/Makefile.am 2009-04-24 04:12:28 UTC (rev 9598) @@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.all.am include $(top_srcdir)/Makefile.flags.am -include $(top_srcdir)/Makefile.install.am +include $(top_srcdir)/Makefile.core-tool.am AM_CPPFLAGS_CORE_COMMON = \ Modified: trunk/none/tests/ppc32/Makefile.am =================================================================== --- trunk/none/tests/ppc32/Makefile.am 2009-04-24 04:02:59 UTC (rev 9597) +++ trunk/none/tests/ppc32/Makefile.am 2009-04-24 04:12:28 UTC (rev 9598) @@ -33,6 +33,6 @@ AM_CXXFLAGS += @FLAG_M32@ AM_CCASFLAGS = @FLAG_M32@ -jm_insns_CFLAGS = -Winline -Wall -O -g -mregnames -maltivec @FLAG_M32@ -testVMX_CFLAGS = -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \ +jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec @FLAG_M32@ +testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \ -DGCC_COMPILER @FLAG_M32@ Modified: trunk/none/tests/ppc64/Makefile.am =================================================================== --- trunk/none/tests/ppc64/Makefile.am 2009-04-24 04:02:59 UTC (rev 9597) +++ trunk/none/tests/ppc64/Makefile.am 2009-04-24 04:12:28 UTC (rev 9598) @@ -20,4 +20,4 @@ AM_CXXFLAGS += @FLAG_M64@ AM_CCASFLAGS = @FLAG_M64@ -jm_insns_CFLAGS = -Winline -Wall -O -g -mregnames -maltivec @FLAG_M64@ +jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec @FLAG_M64@ Modified: trunk/none/tests/x86/Makefile.am =================================================================== --- trunk/none/tests/x86/Makefile.am 2009-04-24 04:02:59 UTC (rev 9597) +++ trunk/none/tests/x86/Makefile.am 2009-04-24 04:12:28 UTC (rev 9598) @@ -97,7 +97,7 @@ # generic C ones cpuid_SOURCES = cpuid_c.c cpuid_s.s # fpu_lazy_eflags must use these flags -- the bug only occurred with them -fpu_lazy_eflags_CFLAGS = @FLAG_M32@ -O2 -march=pentiumpro +fpu_lazy_eflags_CFLAGS = $(AM_CFLAGS) -O2 -march=pentiumpro fxtract_LDADD = -lm insn_basic_SOURCES = insn_basic.def insn_basic_LDADD = -lm |