diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-02-09 00:34:55 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-02-09 00:34:55 +0000 |
| commit | cc240aa7d1b5fa87ca507f69a5df81a63cda2ce3 (patch) | |
| tree | 7816f6072883911ab6d91b664bb121e5cbfff3e8 /libgo | |
| parent | 41798077bfd95dc55e0e1a16aa03dfe85435cbd4 (diff) | |
| download | gcc-cc240aa7d1b5fa87ca507f69a5df81a63cda2ce3.zip gcc-cc240aa7d1b5fa87ca507f69a5df81a63cda2ce3.tar.gz gcc-cc240aa7d1b5fa87ca507f69a5df81a63cda2ce3.tar.bz2 | |
re PR go/69357 (libgo refers to _end in a non-weak way)
PR go/69537
runtime: Don't refer to _end symbol in shared library.
Fixes GCC PR 69357.
Reviewed-on: https://go-review.googlesource.com/19362
From-SVN: r233235
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/runtime/go-main.c | 6 | ||||
| -rw-r--r-- | libgo/runtime/malloc.goc | 10 | ||||
| -rw-r--r-- | libgo/runtime/runtime.h | 1 |
3 files changed, 15 insertions, 2 deletions
diff --git a/libgo/runtime/go-main.c b/libgo/runtime/go-main.c index 026469b..ff2958c 100644 --- a/libgo/runtime/go-main.c +++ b/libgo/runtime/go-main.c @@ -30,6 +30,11 @@ extern char **environ; +/* A copy of _end that a shared library can reasonably refer to. */ +uintptr __go_end; + +extern byte _end[]; + /* The main function. */ int @@ -41,6 +46,7 @@ main (int argc, char **argv) return 0; runtime_isstarted = true; + __go_end = (uintptr)_end; runtime_check (); runtime_args (argc, (byte **) argv); runtime_osinit (); diff --git a/libgo/runtime/malloc.goc b/libgo/runtime/malloc.goc index 473879c..0d86292 100644 --- a/libgo/runtime/malloc.goc +++ b/libgo/runtime/malloc.goc @@ -505,7 +505,8 @@ runtime_mallocinit(void) { byte *p, *p1; uintptr arena_size, bitmap_size, spans_size, p_size; - extern byte _end[]; + uintptr *pend; + uintptr end; uintptr limit; uint64 i; bool reserved; @@ -613,7 +614,12 @@ runtime_mallocinit(void) // So adjust it upward a little bit ourselves: 1/4 MB to get // away from the running binary image and then round up // to a MB boundary. - p = (byte*)ROUND((uintptr)_end + (1<<18), 1<<20); + + end = 0; + pend = &__go_end; + if(pend != nil) + end = *pend; + p = (byte*)ROUND(end + (1<<18), 1<<20); p_size = bitmap_size + spans_size + arena_size + PageSize; p = runtime_SysReserve(p, p_size, &reserved); if(p == nil) diff --git a/libgo/runtime/runtime.h b/libgo/runtime/runtime.h index f4b170d..6724229 100644 --- a/libgo/runtime/runtime.h +++ b/libgo/runtime/runtime.h @@ -863,3 +863,4 @@ extern void _cgo_notify_runtime_init_done (void); extern _Bool runtime_iscgo; extern _Bool runtime_cgoHasExtraM; extern Hchan *runtime_main_init_done; +extern uintptr __go_end __attribute__ ((weak)); |