|
From: <sv...@va...> - 2009-01-08 06:25:00
|
Author: njn Date: 2009-01-08 06:24:54 +0000 (Thu, 08 Jan 2009) New Revision: 8921 Log: Merge r8919 from the trunk. Removed: branches/DARWIN/cachegrind/tests/wrap5.c branches/DARWIN/memcheck/tests/vcpu_bz2.c Modified: branches/DARWIN/Makefile.am branches/DARWIN/cachegrind/tests/Makefile.am branches/DARWIN/cachegrind/tests/wrap5.vgtest branches/DARWIN/memcheck/tests/Makefile.am branches/DARWIN/memcheck/tests/vcpu_bz2.vgtest Modified: branches/DARWIN/Makefile.am =================================================================== --- branches/DARWIN/Makefile.am 2009-01-08 06:24:13 UTC (rev 8920) +++ branches/DARWIN/Makefile.am 2009-01-08 06:24:54 UTC (rev 8921) @@ -76,7 +76,7 @@ exp-regtest: check @PERL@ tests/vg_regtest $(EXP_TOOLS) -## Preprend @PERL@ because tests/vg_per isn't executable +## Preprend @PERL@ because tests/vg_perf isn't executable perf: check @PERL@ perf/vg_perf perf Modified: branches/DARWIN/cachegrind/tests/Makefile.am =================================================================== --- branches/DARWIN/cachegrind/tests/Makefile.am 2009-01-08 06:24:13 UTC (rev 8920) +++ branches/DARWIN/cachegrind/tests/Makefile.am 2009-01-08 06:24:54 UTC (rev 8921) @@ -27,7 +27,7 @@ wrap5.vgtest wrap5.stderr.exp wrap5.stdout.exp check_PROGRAMS = \ - chdir clreq dlclose myprint.so wrap5 + chdir clreq dlclose myprint.so AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI) @@ -37,14 +37,3 @@ myprint_so_SOURCES = myprint.c myprint_so_LDFLAGS = $(AM_FLAG_M3264_PRI) -shared -fPIC myprint_so_CFLAGS = $(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 = $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc -endif -endif Deleted: branches/DARWIN/cachegrind/tests/wrap5.c =================================================================== --- branches/DARWIN/cachegrind/tests/wrap5.c 2009-01-08 06:24:13 UTC (rev 8920) +++ branches/DARWIN/cachegrind/tests/wrap5.c 2009-01-08 06:24:54 UTC (rev 8921) @@ -1 +0,0 @@ -link ../../memcheck/tests/wrap5.c \ No newline at end of file Modified: branches/DARWIN/cachegrind/tests/wrap5.vgtest =================================================================== --- branches/DARWIN/cachegrind/tests/wrap5.vgtest 2009-01-08 06:24:13 UTC (rev 8920) +++ branches/DARWIN/cachegrind/tests/wrap5.vgtest 2009-01-08 06:24:54 UTC (rev 8921) @@ -1,2 +1,2 @@ -prog: wrap5 +prog: ../../memcheck/tests/wrap5 cleanup: rm cachegrind.out.* Modified: branches/DARWIN/memcheck/tests/Makefile.am =================================================================== --- branches/DARWIN/memcheck/tests/Makefile.am 2009-01-08 06:24:13 UTC (rev 8920) +++ branches/DARWIN/memcheck/tests/Makefile.am 2009-01-08 06:24:54 UTC (rev 8921) @@ -222,7 +222,7 @@ mismatches new_override metadata \ varinfo1 varinfo2 varinfo3 varinfo4 \ varinfo5 varinfo5so.so varinfo6 \ - vcpu_bz2 vcpu_fbench vcpu_fnfns \ + vcpu_fbench vcpu_fnfns \ xml1 \ wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \ writev zeropage Deleted: branches/DARWIN/memcheck/tests/vcpu_bz2.c =================================================================== --- branches/DARWIN/memcheck/tests/vcpu_bz2.c 2009-01-08 06:24:13 UTC (rev 8920) +++ branches/DARWIN/memcheck/tests/vcpu_bz2.c 2009-01-08 06:24:54 UTC (rev 8921) @@ -1 +0,0 @@ -link ../../perf/bz2.c \ No newline at end of file Modified: branches/DARWIN/memcheck/tests/vcpu_bz2.vgtest =================================================================== --- branches/DARWIN/memcheck/tests/vcpu_bz2.vgtest 2009-01-08 06:24:13 UTC (rev 8920) +++ branches/DARWIN/memcheck/tests/vcpu_bz2.vgtest 2009-01-08 06:24:54 UTC (rev 8921) @@ -1,3 +1,3 @@ -prog: vcpu_bz2 +prog: ../../perf/bz2 args: x vgopts: -q |