diff options
| author | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-04-15 03:12:43 +0000 |
|---|---|---|
| committer | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-04-15 03:12:43 +0000 |
| commit | 83b62cbbab29bde83eba40231f307c2a311e73c8 (patch) | |
| tree | d91c3eee7aad21654a55394c5a9bce238c5699df /perf | |
| parent | 663a8ccd7aca4ddbc1c65b2fb6ca8bb8727167b2 (diff) | |
Merge r9533..9536 (add tests/{asm.h,sys_mman.h,malloc.h} from the DARWIN
branch.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9537 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'perf')
| -rw-r--r-- | perf/Makefile.am | 9 | ||||
| -rw-r--r-- | perf/bigcode.c | 2 | ||||
| -rw-r--r-- | perf/bz2.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/perf/Makefile.am b/perf/Makefile.am index 20e7e8f7..1101ac95 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -1,6 +1,5 @@ -# For AM_FLAG_M3264_PRI -include $(top_srcdir)/Makefile.flags.am +include $(top_srcdir)/Makefile.tool-tests.am noinst_SCRIPTS = vg_perf @@ -18,9 +17,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ check_PROGRAMS = \ bigcode bz2 fbench ffbench heap sarp tinycc -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include -AM_CFLAGS = -Winline -Wall -Wshadow -g -O $(AM_FLAG_M3264_PRI) -AM_CXXFLAGS = $(AM_CFLAGS) +AM_CFLAGS += -O $(AM_FLAG_M3264_PRI) +AM_CXXFLAGS += -O $(AM_FLAG_M3264_PRI) + # Extra stuff bz2_CFLAGS = $(AM_CFLAGS) -Wno-inline diff --git a/perf/bigcode.c b/perf/bigcode.c index 15b34653..c3687985 100644 --- a/perf/bigcode.c +++ b/perf/bigcode.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <string.h> #include <assert.h> -#include <sys/mman.h> +#include "tests/sys_mman.h" #define FN_SIZE 996 // Must be big enough to hold the compiled f() #define N_LOOPS 20000 // Should be divisible by four @@ -6412,7 +6412,7 @@ void set_inbuf ( void ) } #include <stdio.h> -#include <malloc.h> +#include "tests/malloc.h" #include <assert.h> /* For providing services. */ |