Whoops, a little premature in removing core_asm.h -- still need it

because it #includes tool_asm.h.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3712

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 7a8343be9baeb1bd8c140377cf6b704175ca7278..1aa8dcb8e4bf7731514ef46dd796997252bce2ff 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -37,6 +37,7 @@ val_PROGRAMS = \
 
 noinst_HEADERS = \
        core.h                  \
+       core_asm.h              \
        pub_core_aspacemgr.h    \
        pub_core_debuglog.h     \
        pub_core_demangle.h     \

diff --git a/coregrind/core.h b/coregrind/core.h
index d7c654cc499c15258a5e6c4d39ba0cf8f0322953..0c9a1e8dea7ab8e62c3b782b91af49320723ba48 100644 (file)
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -83,7 +83,7 @@
 */
 
 #include "tool.h"          // tool stuff
-#include "tool_asm.h"      // XXX: temporary, for VG_() and friends
+#include "core_asm.h"
 #include "core_arch.h"     // arch-specific stuff,  eg. x86/core_arch.h
 
 // Ugly: this is needed by linux/core_os.h

diff --git a/coregrind/core_asm.h b/coregrind/core_asm.h
new file mode 100644 (file)
index 0000000..ac47496
--- /dev/null
+++ b/coregrind/core_asm.h
@@ -0,0 +1,2 @@
+// XXX: temporary only
+#include "tool_asm.h"

diff --git a/coregrind/pub_core_debuglog.h b/coregrind/pub_core_debuglog.h
index 16540775ad6d7f9089463d7136348ec1a36d7bb4..8ee1653ca12a8a919d91020912a12fa5cd6bafe2 100644 (file)
--- a/coregrind/pub_core_debuglog.h
+++ b/coregrind/pub_core_debuglog.h
@@ -47,7 +47,7 @@
    portable way to avoid using stdarg.h. */
 #include <stdarg.h>
 
-#include "tool_asm.h"   /* For definition of VG_ macro */
+#include "core_asm.h"   /* For definition of VG_ macro */
 
 /* There are no tool-visible exports from m_debuglog, hence no header
    file for it. */