|
From: <sv...@va...> - 2009-06-11 11:30:12
|
Author: njn
Date: 2009-06-11 12:30:02 +0100 (Thu, 11 Jun 2009)
New Revision: 10301
Log:
Use the preprocessor to select many of the platform-specific files in
coregrind/.
Modified:
branches/BUILD_TWEAKS/coregrind/Makefile.am
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-darwin.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-linux.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-aix5.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-linux.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-aix5.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-linux.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-darwin.c
branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-linux.c
branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-amd64-darwin.S
branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-amd64-linux.S
branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc32-aix5.S
branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc32-linux.S
branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc64-aix5.S
branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc64-linux.S
branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-x86-darwin.S
branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-x86-linux.S
branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-amd64-darwin.c
branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-amd64-linux.c
branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc32-aix5.c
branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc32-linux.c
branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc64-aix5.c
branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc64-linux.c
branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-x86-darwin.c
branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-x86-linux.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-amd64-darwin.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-amd64-linux.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-aix5.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc64-aix5.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc64-linux.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-x86-darwin.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-x86-linux.S
Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-11 11:30:02 UTC (rev 10301)
@@ -236,6 +236,7 @@
CLEANFILES += $(COREGRIND_DARWIN_BUILT_SOURCES)
endif
+# Merge the coredump-$PLATFORM.c files?
COREGRIND_SOURCES_COMMON = \
m_commandline.c \
m_clientstate.c \
@@ -274,6 +275,14 @@
m_xarray.c \
m_aspacehl.c \
m_aspacemgr/aspacemgr-common.c \
+ m_coredump/coredump-x86-linux.c \
+ m_coredump/coredump-amd64-linux.c \
+ m_coredump/coredump-ppc32-linux.c \
+ m_coredump/coredump-ppc64-linux.c \
+ m_coredump/coredump-ppc32-aix5.c \
+ m_coredump/coredump-ppc64-aix5.c \
+ m_coredump/coredump-x86-darwin.c \
+ m_coredump/coredump-amd64-darwin.c \
m_debuginfo/misc.c \
m_debuginfo/d3basics.c \
m_debuginfo/storage.c \
@@ -284,9 +293,33 @@
m_demangle/demangle.c \
m_demangle/dyn-string.c \
m_demangle/safe-ctype.c \
+ m_dispatch/dispatch-x86-linux.S \
+ m_dispatch/dispatch-amd64-linux.S \
+ m_dispatch/dispatch-ppc32-linux.S \
+ m_dispatch/dispatch-ppc64-linux.S \
+ m_dispatch/dispatch-ppc32-aix5.S \
+ m_dispatch/dispatch-ppc64-aix5.S \
+ m_dispatch/dispatch-x86-darwin.S \
+ m_dispatch/dispatch-amd64-darwin.S \
m_replacemalloc/replacemalloc_core.c \
m_scheduler/scheduler.c \
m_scheduler/sema.c \
+ m_sigframe/sigframe-x86-linux.c \
+ m_sigframe/sigframe-amd64-linux.c \
+ m_sigframe/sigframe-ppc32-linux.c \
+ m_sigframe/sigframe-ppc64-linux.c \
+ m_sigframe/sigframe-ppc32-aix5.c \
+ m_sigframe/sigframe-ppc64-aix5.c \
+ m_sigframe/sigframe-x86-darwin.c \
+ m_sigframe/sigframe-amd64-darwin.c \
+ m_syswrap/syscall-x86-linux.S \
+ m_syswrap/syscall-amd64-linux.S \
+ m_syswrap/syscall-ppc32-linux.S \
+ m_syswrap/syscall-ppc64-linux.S \
+ m_syswrap/syscall-ppc32-aix5.S \
+ m_syswrap/syscall-ppc64-aix5.S \
+ m_syswrap/syscall-x86-darwin.S \
+ m_syswrap/syscall-amd64-darwin.S \
m_syswrap/syswrap-main.c \
m_ume/elf.c \
m_ume/macho.c \
@@ -338,10 +371,6 @@
libcoregrind_x86_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_LINUX_SOURCE) \
- m_coredump/coredump-x86-linux.c \
- m_dispatch/dispatch-x86-linux.S \
- m_sigframe/sigframe-x86-linux.c \
- m_syswrap/syscall-x86-linux.S \
m_syswrap/syswrap-x86-linux.c
libcoregrind_x86_linux_a_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX)
libcoregrind_x86_linux_a_CFLAGS = $(AM_CFLAGS_X86_LINUX)
@@ -350,10 +379,6 @@
libcoregrind_amd64_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_LINUX_SOURCE) \
- m_coredump/coredump-amd64-linux.c \
- m_dispatch/dispatch-amd64-linux.S \
- m_sigframe/sigframe-amd64-linux.c \
- m_syswrap/syscall-amd64-linux.S \
m_syswrap/syswrap-amd64-linux.c
libcoregrind_amd64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX)
libcoregrind_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX)
@@ -362,10 +387,6 @@
libcoregrind_ppc32_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_LINUX_SOURCE) \
- m_coredump/coredump-ppc32-linux.c \
- m_dispatch/dispatch-ppc32-linux.S \
- m_sigframe/sigframe-ppc32-linux.c \
- m_syswrap/syscall-ppc32-linux.S \
m_syswrap/syswrap-ppc32-linux.c
libcoregrind_ppc32_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX)
libcoregrind_ppc32_linux_a_CFLAGS = $(AM_CFLAGS_PPC32_LINUX)
@@ -374,10 +395,6 @@
libcoregrind_ppc64_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_LINUX_SOURCE) \
- m_coredump/coredump-ppc64-linux.c \
- m_dispatch/dispatch-ppc64-linux.S \
- m_sigframe/sigframe-ppc64-linux.c \
- m_syswrap/syscall-ppc64-linux.S \
m_syswrap/syswrap-ppc64-linux.c
libcoregrind_ppc64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX)
libcoregrind_ppc64_linux_a_CFLAGS = $(AM_CFLAGS_PPC64_LINUX)
@@ -386,10 +403,6 @@
libcoregrind_ppc32_aix5_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_AIX5_SOURCE) \
- m_coredump/coredump-ppc32-aix5.c \
- m_dispatch/dispatch-ppc32-aix5.S \
- m_sigframe/sigframe-ppc32-aix5.c \
- m_syswrap/syscall-ppc32-aix5.S \
m_syswrap/syswrap-ppc32-aix5.c
libcoregrind_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5)
@@ -399,10 +412,6 @@
libcoregrind_ppc64_aix5_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_AIX5_SOURCE) \
- m_coredump/coredump-ppc64-aix5.c \
- m_dispatch/dispatch-ppc64-aix5.S \
- m_sigframe/sigframe-ppc64-aix5.c \
- m_syswrap/syscall-ppc64-aix5.S \
m_syswrap/syswrap-ppc64-aix5.c
libcoregrind_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5)
@@ -412,12 +421,8 @@
libcoregrind_x86_darwin_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_DARWIN_SOURCE) \
- m_coredump/coredump-x86-darwin.c \
- m_dispatch/dispatch-x86-darwin.S \
m_mach/mach_traps-x86-darwin.S \
- m_sigframe/sigframe-x86-darwin.c \
m_start-x86-darwin.S \
- m_syswrap/syscall-x86-darwin.S \
m_syswrap/syswrap-x86-darwin.c
nodist_libcoregrind_x86_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_x86_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN)
@@ -428,12 +433,8 @@
libcoregrind_amd64_darwin_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_DARWIN_SOURCE) \
- m_coredump/coredump-amd64-darwin.c \
- m_dispatch/dispatch-amd64-darwin.S \
m_mach/mach_traps-amd64-darwin.S \
- m_sigframe/sigframe-amd64-darwin.c \
m_start-amd64-darwin.S \
- m_syswrap/syscall-amd64-darwin.S \
m_syswrap/syswrap-amd64-darwin.c
nodist_libcoregrind_amd64_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_amd64_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN)
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-darwin.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-darwin.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_coredump.h"
@@ -37,3 +39,9 @@
{
// DDD: #warning GrP fixme coredump
}
+
+#endif // defined(VGP_amd64_darwin)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-linux.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-amd64-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_libcbase.h"
@@ -85,6 +87,8 @@
VG_(memset)(fpu->padding, 0, sizeof(fpu->padding));
}
+#endif // defined(VGP_amd64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-aix5.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-aix5.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -33,6 +33,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc32_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_libcassert.h"
@@ -43,6 +45,8 @@
/* not implemented */
}
+#endif // defined(VGP_ppc32_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-linux.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc32-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc32_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_coredump.h"
@@ -72,6 +74,8 @@
# undef DO
}
+#endif // defined(VGP_ppc32_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-aix5.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-aix5.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -33,6 +33,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc64_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_libcassert.h"
@@ -43,6 +45,8 @@
/* not implemented */
}
+#endif // defined(VGP_ppc64_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-linux.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-ppc64-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc64_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_coredump.h"
@@ -72,6 +74,8 @@
# undef DO
}
+#endif // defined(VGP_ppc64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-darwin.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-darwin.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_coredump.h"
@@ -37,3 +39,9 @@
{
// DDD: #warning GrP fixme coredump
}
+
+#endif // defined(VGP_x86_darwin)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-linux.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_coredump/coredump-x86-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_libcbase.h"
@@ -105,6 +107,8 @@
VG_(memset)(xfpu->padding, 0, sizeof(xfpu->padding));
}
+#endif // defined(VGP_x86_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-amd64-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-amd64-darwin.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-amd64-darwin.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_darwin)
+
#include "pub_core_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
@@ -326,6 +328,8 @@
popq %rbx
ret
+#endif // defined(VGP_amd64_darwin)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-amd64-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-amd64-linux.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-amd64-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_linux)
+
#include "pub_core_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
@@ -339,6 +341,8 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
+#endif // defined(VGP_amd64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc32-aix5.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc32-aix5.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc32-aix5.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -34,6 +34,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc32_aix5)
+
#include "pub_core_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
@@ -672,6 +674,7 @@
mr 1,4
blr
+#endif // defined(VGP_ppc32_aix5)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc32-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc32-linux.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc32-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc32_linux)
+
#include "pub_core_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
@@ -621,6 +623,8 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
+#endif // defined(VGP_ppc32_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc64-aix5.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc64-aix5.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc64-aix5.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -34,6 +34,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc64_aix5)
+
#include "pub_core_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
@@ -645,6 +647,8 @@
mr 1,4
blr
+#endif // defined(VGP_ppc64_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc64-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc64-linux.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-ppc64-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc64_linux)
+
#include "pub_core_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
@@ -656,6 +658,8 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
+#endif // defined(VGP_ppc64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-x86-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-x86-darwin.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-x86-darwin.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------*/
/*--- The core dispatch loop, for jumping to a code address. ---*/
-/*--- dispatch-x86.S ---*/
+/*--- dispatch-x86-darwin.S ---*/
/*--------------------------------------------------------------------*/
/*
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_darwin)
+
#include "pub_core_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
@@ -312,6 +314,7 @@
popl %esi
ret
+#endif // defined(VGP_x86_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-x86-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-x86-linux.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_dispatch/dispatch-x86-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_linux)
+
#include "pub_core_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
@@ -306,6 +308,8 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
+#endif // defined(VGP_x86_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-amd64-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-amd64-darwin.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-amd64-darwin.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -63,6 +65,8 @@
I_die_here;
}
+#endif // defined(VGP_amd64_darwin)
+
/*--------------------------------------------------------------------*/
/*--- end sigframe-amd64-darwin.c ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-amd64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-amd64-linux.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-amd64-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_threadstate.h"
@@ -631,6 +633,8 @@
VG_TRACK( post_deliver_signal, tid, sigNo );
}
+#endif // defined(VGP_amd64_linux)
+
/*--------------------------------------------------------------------*/
-/*--- end sigframe-amd64-linux.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc32-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc32-aix5.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc32-aix5.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -34,6 +34,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc32_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -230,6 +232,8 @@
VG_TRACK( post_deliver_signal, tid, sigNo );
}
+#endif // defined(VGP_ppc32_aix5)
+
/*--------------------------------------------------------------------*/
-/*--- end sigframe-ppc32-aix5.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc32-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc32-linux.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc32-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -31,6 +31,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc32_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -973,6 +975,8 @@
//.. VG_TRACK( post_deliver_signal, tid, sigNo );
}
+#endif // defined(VGP_ppc32_linux)
+
/*--------------------------------------------------------------------*/
-/*--- end sigframe-ppc32-linux.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc64-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc64-aix5.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc64-aix5.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -34,6 +34,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc64_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -264,6 +266,8 @@
VG_TRACK( post_deliver_signal, tid, sigNo );
}
+#endif // defined(VGP_ppc64_aix5)
+
/*--------------------------------------------------------------------*/
-/*--- end sigframe-ppc64-aix5.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc64-linux.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-ppc64-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -31,6 +31,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc64_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -382,6 +384,8 @@
VG_TRACK( post_deliver_signal, tid, sigNo );
}
+#endif // defined(VGP_ppc64_linux)
+
/*--------------------------------------------------------------------*/
-/*--- end sigframe-ppc64-linux.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-x86-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-x86-darwin.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-x86-darwin.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -227,6 +229,8 @@
VG_TRACK( post_deliver_signal, tid, sigNo );
}
+#endif // defined(VGP_x86_darwin)
+
/*--------------------------------------------------------------------*/
-/*--- end sigframe-x86-darwin.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-x86-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-x86-linux.c 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_sigframe/sigframe-x86-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_threadstate.h"
@@ -721,6 +723,8 @@
VG_TRACK( post_deliver_signal, tid, sigNo );
}
+#endif // defined(VGP_x86_linux)
+
/*--------------------------------------------------------------------*/
-/*--- end sigframe-x86-linux.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-amd64-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-amd64-darwin.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-amd64-darwin.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_darwin)
+
#include "pub_core_basics_asm.h"
#include "pub_core_vkiscnums.h"
#include "libvex_guest_offsets.h"
@@ -247,6 +249,7 @@
ML_(blksys_committed_UNIX): .quad MK_L_SCCLASS_N(UNIX,4)
ML_(blksys_finished_UNIX): .quad MK_L_SCCLASS_N(UNIX,5)
+#endif // defined(VGP_amd64_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-amd64-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-amd64-linux.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-amd64-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_linux)
+
#include "pub_core_basics_asm.h"
#include "pub_core_vkiscnums.h"
#include "libvex_guest_offsets.h"
@@ -206,6 +208,8 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
+#endif // defined(VGP_amd64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-aix5.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-aix5.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-aix5.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -31,6 +31,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc32_aix5)
+
#include "pub_core_basics_asm.h"
#include "libvex_guest_offsets.h"
@@ -216,6 +218,7 @@
ML_(blksys_committed): .long Lvg4
ML_(blksys_finished): .long Lvg5
+#endif // defined(VGP_ppc32_aix5)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -27,6 +27,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc32_linux)
+
#include "pub_core_basics_asm.h"
#include "pub_core_vkiscnums.h"
#include "libvex_guest_offsets.h"
@@ -156,6 +158,8 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
+#endif defined(VGP_ppc32_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc64-aix5.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc64-aix5.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc64-aix5.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -31,6 +31,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc64_aix5)
+
#include "pub_core_basics_asm.h"
#include "libvex_guest_offsets.h"
@@ -216,6 +218,7 @@
ML_(blksys_committed): .llong Lvg4
ML_(blksys_finished): .llong Lvg5
+#endif // defined(VGP_ppc64_aix5)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc64-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc64-linux.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc64-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -27,6 +27,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc64_linux)
+
#include "pub_core_basics_asm.h"
#include "pub_core_vkiscnums.h"
#include "libvex_guest_offsets.h"
@@ -163,6 +165,8 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
+#endif // defined(VGP_ppc64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-x86-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-x86-darwin.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-x86-darwin.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_darwin)
+
#include "pub_core_basics_asm.h"
#include "pub_core_vkiscnums.h"
#include "libvex_guest_offsets.h"
@@ -245,7 +247,7 @@
ML_(blksys_committed_UNIX): .long MK_L_SCCLASS_N(UNIX,4)
ML_(blksys_finished_UNIX): .long MK_L_SCCLASS_N(UNIX,5)
-
+#endif // defined(VGP_x86_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-x86-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-x86-linux.S 2009-06-11 10:37:41 UTC (rev 10300)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-x86-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_linux)
+
#include "pub_core_basics_asm.h"
#include "pub_core_vkiscnums.h"
#include "libvex_guest_offsets.h"
@@ -166,6 +168,8 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
+#endif // defined(VGP_x86_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
|