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 cf9dcc5b4afd0d1b07326b5156f272788849ffb4..2003660671d78adbe79820d9fc85846d393651de 100644 (file)
--- 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 38adf1585cd39cb59c3eba37583bff7b2d0c9138..f9e80088c8761f7a6959151152896b4363d8f151 100644 (file)
--- 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 c57737c042c661b4ca1aee30e680d4a0be0f5a02..0973acf285e6aba89f26ab817017e8c5fa02bd36 100644 (file)
--- 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 f2c221686c6d17f6e8df12aaad841442fc0f4cd9..8a36d436b3dfa43bfeda765c40e751f18391089d 100644 (file)
--- 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 50c40f8df9ad618a1c375cb0d94f637837ffbef3..5ba36c5d13378be1a162db3615076bde4c1dff9a 100644 (file)
--- 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.