From: Nicholas Nethercote <njn@valgrind.org>
Date: Sat, 14 May 2005 21:51:49 +0000 (+0000)
Subject: Whoops, a little premature in removing core_asm.h -- still need it
X-Git-Tag: svn/VALGRIND_3_0_0~606
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dee67271fb28d0b1971e0e17b6018aebc9a443e4;p=thirdparty%2Fvalgrind.git

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 7a8343be9b..1aa8dcb8e4 100644
--- 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 d7c654cc49..0c9a1e8dea 100644
--- 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
index 0000000000..ac474965be
--- /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 16540775ad..8ee1653ca1 100644
--- 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. */