My earlier patch to inline runtime.getcallerpc and runtime.getcallersp
when compiling the runtime package was incomplete, because it only
took effect when passing the -fcompiling-runtime option, and that
option is not passed when testing the runtime package. This patch by
Than McIntosh fixes that by passing the option. Bootstrapped and ran
Go testsuite on x86_64-pc-linux-gnu. Committed to mainline.
Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 240560)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-4046a883070c1f5f58de336f7378f3bca69ea2b6
+c79a35411c1065c71add196fdeca6e5207a79248
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/Makefile.am
===================================================================
--- libgo/Makefile.am (revision 240560)
+++ libgo/Makefile.am (working copy)
@@ -1291,6 +1291,7 @@ runtime.inc: s-runtime-inc; @true
s-runtime-inc: runtime-go.lo
$(SHELL) $(srcdir)/mvifdiff.sh runtime.inc.tmp runtime.inc
$(STAMP) $@
+runtime_check_GOCFLAGS = -fgo-compiling-runtime
runtime/check: $(CHECK_DEPS)
@$(CHECK)
.PHONY: runtime/check
Index: libgo/Makefile.in
===================================================================
--- libgo/Makefile.in (revision 240560)
+++ libgo/Makefile.in (working copy)
@@ -1249,6 +1249,7 @@ CHECK_DEPS = $(toolexeclibgo_DATA) $(too
@LIBGO_IS_SOLARIS_FALSE@matchargs_os =
extra_go_files_runtime = runtime_sysinfo.go
runtime_go_lo_GOCFLAGS = -fgo-c-header=runtime.inc.tmp -fgo-compiling-runtime
+runtime_check_GOCFLAGS = -fgo-compiling-runtime
@LIBGO_IS_BSD_TRUE@golang_org_x_net_route_lo = \
@LIBGO_IS_BSD_TRUE@ golang_org/x/net/route/route.lo
