From: Nicholas Nethercote <njn@valgrind.org>
Date: Sun, 19 Jun 2005 21:49:28 +0000 (+0000)
Subject: Put VG_(client_trampoline_code) in m_trampoline.
X-Git-Tag: svn/VALGRIND_3_0_0~357
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d618b2572cdae8f1d70cd5f06634b4df136a4d84;p=thirdparty%2Fvalgrind.git

Put VG_(client_trampoline_code) in m_trampoline.


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

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index cf9dcc5b4a..2003660671 100644
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -60,7 +60,6 @@ static const Bool mem_debug = False;
 Addr VG_(client_base);           /* client address space limits */
 Addr VG_(client_end);
 Addr VG_(client_mapbase);
-Addr VG_(client_trampoline_code);
 Addr VG_(clstk_base);
 Addr VG_(clstk_end);
 UWord VG_(clstk_id);
diff --git a/coregrind/m_stacktrace.c b/coregrind/m_stacktrace.c
index 38adf1585c..f9e80088c8 100644
--- a/coregrind/m_stacktrace.c
+++ b/coregrind/m_stacktrace.c
@@ -31,6 +31,7 @@
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_aspacemgr.h"
+#include "pub_core_debuginfo.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
 #include "pub_core_libcprint.h"
diff --git a/coregrind/m_trampoline.S b/coregrind/m_trampoline.S
index c57737c042..0973acf285 100644
--- a/coregrind/m_trampoline.S
+++ b/coregrind/m_trampoline.S
@@ -37,6 +37,7 @@
    space at an arbitary address.  Therefore, this code must be completely
    position-independent.
 */
+.global VG_(client_trampoline_code)
 .global VG_(trampoline_code_start)
 .global VG_(trampoline_code_length)
 .global VG_(tramp_sigreturn_offset)
@@ -101,6 +102,8 @@ VG_(trampoline_code_start):
 tramp_code_end:
 			
 .data
+VG_(client_trampoline_code):
+	.long 0
 VG_(trampoline_code_length):
 	.long tramp_code_end - VG_(trampoline_code_start)
 VG_(tramp_sigreturn_offset):
diff --git a/coregrind/pub_core_aspacemgr.h b/coregrind/pub_core_aspacemgr.h
index f2c221686c..8a36d436b3 100644
--- a/coregrind/pub_core_aspacemgr.h
+++ b/coregrind/pub_core_aspacemgr.h
@@ -50,7 +50,6 @@ extern Addr VG_(client_mapbase); // base of mappings
 extern Addr VG_(clstk_base);	 // client stack range
 extern Addr VG_(clstk_end);
 extern UWord VG_(clstk_id);      // client stack id
-extern Addr VG_(client_trampoline_code);
 
 extern Addr VG_(brk_base);	 // start of brk
 extern Addr VG_(brk_limit);	 // current brk
diff --git a/coregrind/pub_core_trampoline.h b/coregrind/pub_core_trampoline.h
index 50c40f8df9..5ba36c5d13 100644
--- a/coregrind/pub_core_trampoline.h
+++ b/coregrind/pub_core_trampoline.h
@@ -36,6 +36,8 @@
 // over the client's, for arcane signal return and syscall purposes...
 //--------------------------------------------------------------------
 
+extern Addr VG_(client_trampoline_code);
+
 // Platform-specifics aren't neatly factored out here, since some of the
 // constants are not used on all platforms.  But it's non-obvious how
 // to do it better.