|
From: <sv...@va...> - 2009-06-12 03:14:20
|
Author: njn
Date: 2009-06-12 04:14:08 +0100 (Fri, 12 Jun 2009)
New Revision: 10304
Log:
And yet more preprocessor-based file inclusion.
Modified:
branches/BUILD_TWEAKS/coregrind/Makefile.am
branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-aix5.c
branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c
branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-aix5.c
branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-linux.c
branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-pathscan.c
branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-aix5.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-darwin.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-generic.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux.c
Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 03:14:08 UTC (rev 10304)
@@ -275,6 +275,8 @@
m_xarray.c \
m_aspacehl.c \
m_aspacemgr/aspacemgr-common.c \
+ m_aspacemgr/aspacemgr-linux.c \
+ m_aspacemgr/aspacemgr-aix5.c \
m_coredump/coredump-x86-linux.c \
m_coredump/coredump-amd64-linux.c \
m_coredump/coredump-ppc32-linux.c \
@@ -301,7 +303,10 @@
m_dispatch/dispatch-ppc64-aix5.S \
m_dispatch/dispatch-x86-darwin.S \
m_dispatch/dispatch-amd64-darwin.S \
+ m_initimg/initimg-linux.c \
+ m_initimg/initimg-aix5.c \
m_initimg/initimg-darwin.c \
+ m_initimg/initimg-pathscan.c \
m_mach/mach_basics.c \
m_mach/mach_msg.c \
m_mach/mach_traps-x86-darwin.S \
@@ -328,6 +333,11 @@
m_syswrap/syscall-x86-darwin.S \
m_syswrap/syscall-amd64-darwin.S \
m_syswrap/syswrap-main.c \
+ m_syswrap/syswrap-generic.c \
+ m_syswrap/syswrap-linux.c \
+ m_syswrap/syswrap-linux-variants.c \
+ m_syswrap/syswrap-aix5.c \
+ m_syswrap/syswrap-darwin.c \
m_syswrap/syswrap-x86-linux.c \
m_syswrap/syswrap-amd64-linux.c \
m_syswrap/syswrap-ppc32-linux.c \
@@ -342,35 +352,22 @@
m_ume/script.c
COREGRIND_LINUX_SOURCE = \
- m_aspacemgr/aspacemgr-linux.c \
m_coredump/coredump-elf.c \
m_debuginfo/readelf.c \
m_debuginfo/readdwarf.c \
m_debuginfo/readdwarf3.c \
m_debuginfo/readstabs.c \
- m_debuginfo/readpdb.c \
- m_initimg/initimg-linux.c \
- m_initimg/initimg-pathscan.c \
- m_syswrap/syswrap-linux.c \
- m_syswrap/syswrap-linux-variants.c \
- m_syswrap/syswrap-generic.c
+ m_debuginfo/readpdb.c
COREGRIND_AIX5_SOURCE = \
- m_aspacemgr/aspacemgr-aix5.c \
- m_debuginfo/readxcoff.c \
- m_initimg/initimg-aix5.c \
- m_syswrap/syswrap-aix5.c
+ m_debuginfo/readxcoff.c
COREGRIND_DARWIN_SOURCE = \
- m_aspacemgr/aspacemgr-linux.c \
m_debuginfo/readdwarf.c \
m_debuginfo/readdwarf3.c \
m_debuginfo/readstabs.c \
m_debuginfo/readmacho.c \
- m_debuginfo/readpdb.c \
- m_initimg/initimg-pathscan.c \
- m_syswrap/syswrap-darwin.c \
- m_syswrap/syswrap-generic.c
+ m_debuginfo/readpdb.c
# These are generated using 'mig' from $mach_defs above.
COREGRIND_DARWIN_BUILT_SOURCES = \
Modified: branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-aix5.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-aix5.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -36,6 +36,8 @@
without prior written permission.
*/
+#if defined(VGO_aix5)
+
/* *************************************************************
DO NOT INCLUDE ANY OTHER FILES HERE.
ADD NEW INCLUDES ONLY TO priv_aspacemgr.h
@@ -2635,6 +2637,7 @@
show_AixSegments(0, "as read from procmap", segs);
}
+#endif // defined(VGO_aix5)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -31,6 +31,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux) || defined(VGO_darwin)
+
/* *************************************************************
DO NOT INCLUDE ANY OTHER FILES HERE.
ADD NEW INCLUDES ONLY TO priv_aspacemgr.h
@@ -3470,8 +3472,11 @@
*css_used = css_used_local;
}
-#endif
+#endif // HAVE_PROC
+
+#endif // defined(VGO_linux) || defined(VGO_darwin)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-aix5.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-aix5.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -34,6 +34,8 @@
without prior written permission.
*/
+#if defined(VGO_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -540,6 +542,8 @@
of the symbol was not found.
*/
+#endif // defined(VGO_aix5)
+
/*--------------------------------------------------------------------*/
-/*--- initimg-aix5.c ---*/
+/*--- ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-linux.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-linux.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -29,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_debuglog.h"
@@ -986,7 +988,8 @@
sizeof(VexGuestArchState));
}
+#endif // defined(VGO_linux)
/*--------------------------------------------------------------------*/
-/*--- initimg-linux.c ---*/
+/*--- ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-pathscan.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-pathscan.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_initimg/initimg-pathscan.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -147,3 +147,6 @@
return VG_STREQ(executable_name_out, "") ? NULL : executable_name_out;
}
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_mach/mach_traps-amd64-darwin.S 2009-06-12 03:14:08 UTC (rev 10304)
@@ -132,7 +132,7 @@
syscall
ret
-#endif defined(VGP_amd64_darwin)
+#endif // defined(VGP_amd64_darwin)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-aix5.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-aix5.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -33,6 +33,8 @@
without prior written permission.
*/
+#if defined(VGO_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -2574,6 +2576,8 @@
#undef PRE
#undef POST
+#endif // defined(VGO_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-darwin.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-darwin.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -7543,7 +7545,8 @@
const UInt ML_(mdep_trap_table_size) =
sizeof(ML_(mdep_trap_table)) / sizeof(ML_(mdep_trap_table)[0]);
+#endif // defined(VGO_darwin)
/*--------------------------------------------------------------------*/
-/*--- end syswrap-darwin.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-generic.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-generic.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -1,6 +1,7 @@
/*--------------------------------------------------------------------*/
-/*--- Wrappers for generic Unix system calls syswrap-generic.c ---*/
+/*--- Wrappers for generic (non-AIX5!) Unix system calls ---*/
+/*--- syswrap-generic.c ---*/
/*--------------------------------------------------------------------*/
/*
@@ -28,6 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux) || defined(VGO_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -4096,6 +4099,8 @@
#undef PRE
#undef POST
+#endif // defined(VGO_linux) || defined(VGO_darwin)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -29,11 +29,12 @@
The GNU General Public License is contained in the file COPYING.
*/
-/* The files syswrap-generic.c, syswrap-linux.c, syswrap-x86-linux.c,
- syswrap-amd64-linux.c and syswrap-ppc32-linux.c, and associated
- vki*.h header files, constitute Valgrind's model of how a vanilla
- Linux kernel behaves with respect to syscalls.
+#if defined(VGO_linux)
+/* The files syswrap-generic.c, syswrap-linux.c, syswrap-*-linux.c,
+ and associated vki*.h header files, constitute Valgrind's model of how a
+ vanilla Linux kernel behaves with respect to syscalls.
+
On a few occasions, it is useful to run with a kernel that has some
(minor) extensions to the vanilla model, either due to running on a
hacked kernel, or using a vanilla kernel which has incorporated a
@@ -86,6 +87,8 @@
{
}
+#endif // defined(VGO_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux.c 2009-06-12 02:44:22 UTC (rev 10303)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux.c 2009-06-12 03:14:08 UTC (rev 10304)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGO_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -5195,12 +5197,11 @@
}
}
-
#undef PRE
#undef POST
+#endif // defined(VGO_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
-
-
|