From fc8ed80ba1362d2ce500003625e1c9c39f765661 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 9 Feb 2011 18:04:23 -0800 Subject: Revert "Build arm and x86 binaries at the same time." This fails to build on MacOS X This reverts commit a39b10bd2574825a815d6ad854499dd127cfa9cb. --- memcheck/memcheck.c | 6 ++++++ memcheck/memcheck.h | 6 ++++++ memcheck/memcheck_common.h | 6 ++++++ memcheck/memcheck_logging.h | 6 ++++++ memcheck/memcheck_malloc_map.c | 6 ++++++ memcheck/memcheck_malloc_map.h | 6 ++++++ memcheck/memcheck_mmrange_map.c | 6 ++++++ memcheck/memcheck_mmrange_map.h | 6 ++++++ memcheck/memcheck_proc_management.c | 6 ++++++ memcheck/memcheck_proc_management.h | 6 ++++++ memcheck/memcheck_util.c | 6 ++++++ memcheck/memcheck_util.h | 6 ++++++ 12 files changed, 72 insertions(+) (limited to 'memcheck') diff --git a/memcheck/memcheck.c b/memcheck/memcheck.c index 3ccb196..3c8194a 100644 --- a/memcheck/memcheck.c +++ b/memcheck/memcheck.c @@ -14,6 +14,12 @@ * Contains implementation of memory checking framework in the emulator. */ +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "qemu-queue.h" #include "qemu_file.h" #include "elff_api.h" diff --git a/memcheck/memcheck.h b/memcheck/memcheck.h index a7761a9..a9a6422 100644 --- a/memcheck/memcheck.h +++ b/memcheck/memcheck.h @@ -18,6 +18,12 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_H #define QEMU_MEMCHECK_MEMCHECK_H +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "memcheck_common.h" #ifdef __cplusplus diff --git a/memcheck/memcheck_common.h b/memcheck/memcheck_common.h index e753094..e6d12db 100644 --- a/memcheck/memcheck_common.h +++ b/memcheck/memcheck_common.h @@ -18,6 +18,12 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_COMMON_H #define QEMU_MEMCHECK_MEMCHECK_COMMON_H +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "qemu-common.h" #include "cpu.h" diff --git a/memcheck/memcheck_logging.h b/memcheck/memcheck_logging.h index 94a3c09..c2ae6e9 100644 --- a/memcheck/memcheck_logging.h +++ b/memcheck/memcheck_logging.h @@ -17,6 +17,12 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_LOGGING_H #define QEMU_MEMCHECK_MEMCHECK_LOGGING_H +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "qemu-common.h" #include "android/utils/debug.h" diff --git a/memcheck/memcheck_malloc_map.c b/memcheck/memcheck_malloc_map.c index d7e8032..07ae889 100644 --- a/memcheck/memcheck_malloc_map.c +++ b/memcheck/memcheck_malloc_map.c @@ -15,6 +15,12 @@ * memory blocks allocated by the guest system. */ +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "memcheck_malloc_map.h" #include "memcheck_util.h" #include "memcheck_logging.h" diff --git a/memcheck/memcheck_malloc_map.h b/memcheck/memcheck_malloc_map.h index 1c25738..b356180 100644 --- a/memcheck/memcheck_malloc_map.h +++ b/memcheck/memcheck_malloc_map.h @@ -24,6 +24,12 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_MALLOC_MAP_H #define QEMU_MEMCHECK_MEMCHECK_MALLOC_MAP_H +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "sys-tree.h" #include "memcheck_common.h" diff --git a/memcheck/memcheck_mmrange_map.c b/memcheck/memcheck_mmrange_map.c index d9a1211..f2609df 100644 --- a/memcheck/memcheck_mmrange_map.c +++ b/memcheck/memcheck_mmrange_map.c @@ -15,6 +15,12 @@ * memory mappings in the guest system. */ +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "memcheck_mmrange_map.h" #include "memcheck_logging.h" diff --git a/memcheck/memcheck_mmrange_map.h b/memcheck/memcheck_mmrange_map.h index f291c95..f2c9701 100644 --- a/memcheck/memcheck_mmrange_map.h +++ b/memcheck/memcheck_mmrange_map.h @@ -22,6 +22,12 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_MMRANGE_MAP_H #define QEMU_MEMCHECK_MEMCHECK_MMRANGE_MAP_H +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "sys-tree.h" #include "memcheck_common.h" diff --git a/memcheck/memcheck_proc_management.c b/memcheck/memcheck_proc_management.c index 45cf141..593ba32 100644 --- a/memcheck/memcheck_proc_management.c +++ b/memcheck/memcheck_proc_management.c @@ -15,6 +15,12 @@ * memchecker framework. */ +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "elff/elff_api.h" #include "memcheck.h" #include "memcheck_proc_management.h" diff --git a/memcheck/memcheck_proc_management.h b/memcheck/memcheck_proc_management.h index 7f489cf..68b6181 100644 --- a/memcheck/memcheck_proc_management.h +++ b/memcheck/memcheck_proc_management.h @@ -18,6 +18,12 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_PROC_MANAGEMENT_H #define QEMU_MEMCHECK_MEMCHECK_PROC_MANAGEMENT_H +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "qemu-queue.h" #include "memcheck_common.h" #include "memcheck_malloc_map.h" diff --git a/memcheck/memcheck_util.c b/memcheck/memcheck_util.c index 8a59914..5449488 100644 --- a/memcheck/memcheck_util.c +++ b/memcheck/memcheck_util.c @@ -14,6 +14,12 @@ * Contains implementation of utility routines for memchecker framework. */ +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "stdio.h" #include "qemu-common.h" #include "android/utils/path.h" diff --git a/memcheck/memcheck_util.h b/memcheck/memcheck_util.h index 2a9907e..b75ee53 100644 --- a/memcheck/memcheck_util.h +++ b/memcheck/memcheck_util.h @@ -17,6 +17,12 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_UTIL_H #define QEMU_MEMCHECK_MEMCHECK_UTIL_H +/* This file should compile iff qemu is built with memory checking + * configuration turned on. */ +#ifndef CONFIG_MEMCHECK +#error CONFIG_MEMCHECK is not defined. +#endif // CONFIG_MEMCHECK + #include "memcheck_common.h" #include "elff/elff_api.h" -- cgit v1.1