From f09f7467a35354368852d66382a7a6ddb31d32ee Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Sun, 1 Aug 2004 17:18:21 +0000 Subject: GCC 3.4 fixes. --- devel/valgrind/files/patch-helgrind_hg_main.c | 58 ++++++++++++++++++++++++ devel/valgrind/files/patch-memcheck_mc_include.h | 32 +++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 devel/valgrind/files/patch-helgrind_hg_main.c create mode 100644 devel/valgrind/files/patch-memcheck_mc_include.h (limited to 'devel/valgrind') diff --git a/devel/valgrind/files/patch-helgrind_hg_main.c b/devel/valgrind/files/patch-helgrind_hg_main.c new file mode 100644 index 000000000000..cde946f513a4 --- /dev/null +++ b/devel/valgrind/files/patch-helgrind_hg_main.c @@ -0,0 +1,58 @@ +=================================================================== +RCS file: /home2/webcvs/mirror/valgrind/helgrind/hg_main.c,v +retrieving revision 1.60.2.3 +retrieving revision 1.60.2.4 +diff -u -p -r1.60.2.3 -r1.60.2.4 +--- helgrind/hg_main.c 2003/12/01 13:11:15 1.60.2.3 ++++ helgrind/hg_main.c 2004/02/29 15:53:40 1.60.2.4 +@@ -3101,42 +3101,42 @@ static void eraser_mem_write(Addr a, UIn + + #undef DEBUG_STATE + +-static void eraser_mem_help_read_1(Addr a) ++REGPARM(1) static void eraser_mem_help_read_1(Addr a) + { + eraser_mem_read(a, 1, VG_(get_current_tid)()); + } + +-static void eraser_mem_help_read_2(Addr a) ++REGPARM(1) static void eraser_mem_help_read_2(Addr a) + { + eraser_mem_read(a, 2, VG_(get_current_tid)()); + } + +-static void eraser_mem_help_read_4(Addr a) ++REGPARM(1) static void eraser_mem_help_read_4(Addr a) + { + eraser_mem_read(a, 4, VG_(get_current_tid)()); + } + +-static void eraser_mem_help_read_N(Addr a, UInt size) ++REGPARM(2) static void eraser_mem_help_read_N(Addr a, UInt size) + { + eraser_mem_read(a, size, VG_(get_current_tid)()); + } + +-static void eraser_mem_help_write_1(Addr a, UInt val) ++REGPARM(2) static void eraser_mem_help_write_1(Addr a, UInt val) + { + if (*(UChar *)a != val) + eraser_mem_write(a, 1, VG_(get_current_tid)()); + } +-static void eraser_mem_help_write_2(Addr a, UInt val) ++REGPARM(2) static void eraser_mem_help_write_2(Addr a, UInt val) + { + if (*(UShort *)a != val) + eraser_mem_write(a, 2, VG_(get_current_tid)()); + } +-static void eraser_mem_help_write_4(Addr a, UInt val) ++REGPARM(2) static void eraser_mem_help_write_4(Addr a, UInt val) + { + if (*(UInt *)a != val) + eraser_mem_write(a, 4, VG_(get_current_tid)()); + } +-static void eraser_mem_help_write_N(Addr a, UInt size) ++REGPARM(2) static void eraser_mem_help_write_N(Addr a, UInt size) + { + eraser_mem_write(a, size, VG_(get_current_tid)()); + } diff --git a/devel/valgrind/files/patch-memcheck_mc_include.h b/devel/valgrind/files/patch-memcheck_mc_include.h new file mode 100644 index 000000000000..c61315a5dc03 --- /dev/null +++ b/devel/valgrind/files/patch-memcheck_mc_include.h @@ -0,0 +1,32 @@ +=================================================================== +RCS file: /home2/webcvs/mirror/valgrind/memcheck/mc_include.h,v +retrieving revision 1.16 +retrieving revision 1.16.2.1 +diff -u -p -r1.16 -r1.16.2.1 +--- memcheck/mc_include.h 2003/07/24 08:45:32 1.16 ++++ memcheck/mc_include.h 2004/02/29 15:53:40 1.16.2.1 +@@ -121,16 +121,16 @@ extern void MC_(helper_value_check0_fail + + + /* Functions defined in mc_main.c */ +-extern void MC_(helperc_STOREV4) ( Addr, UInt ); +-extern void MC_(helperc_STOREV2) ( Addr, UInt ); +-extern void MC_(helperc_STOREV1) ( Addr, UInt ); ++extern __attribute__ ((regparm(2))) void MC_(helperc_STOREV4) ( Addr, UInt ); ++extern __attribute__ ((regparm(2))) void MC_(helperc_STOREV2) ( Addr, UInt ); ++extern __attribute__ ((regparm(2))) void MC_(helperc_STOREV1) ( Addr, UInt ); + +-extern UInt MC_(helperc_LOADV1) ( Addr ); +-extern UInt MC_(helperc_LOADV2) ( Addr ); +-extern UInt MC_(helperc_LOADV4) ( Addr ); ++extern __attribute__ ((regparm(1))) UInt MC_(helperc_LOADV1) ( Addr ); ++extern __attribute__ ((regparm(1))) UInt MC_(helperc_LOADV2) ( Addr ); ++extern __attribute__ ((regparm(1))) UInt MC_(helperc_LOADV4) ( Addr ); + +-extern void MC_(fpu_write_check) ( Addr addr, Int size ); +-extern void MC_(fpu_read_check) ( Addr addr, Int size ); ++extern __attribute__ ((regparm(2))) void MC_(fpu_write_check) ( Addr addr, Int size ); ++extern __attribute__ ((regparm(2))) void MC_(fpu_read_check) ( Addr addr, Int size ); + + + /* For client requests */ -- cgit v1.2.3