libgo: fix for runtime/check failure with "-O0 -g"

    Tweak the makefile rules for the runtime/check test to
    insure that the runtime package is compiled with
    "-fgo-compiling-runtime". This resolves a test failure
    (unsat on runtime.getcallerpc) when in a build directory where the
    compiler flags have been configured to disable optimization.

    Reviewed-on: https://go-review.googlesource.com/30010

From-SVN: r240588

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 8ed62a40b0b668de5ce84b64dbf4fa8661f54964..6ab7e422a5a1c840008695b920d94b53216cccda 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -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.

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 81533be09d6615a32bf41597a0f7af33d718ad9f..23cfd07ba945660a13d67a9eebfefa183ce464dd 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -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

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index ebb7ddfc060cde352cfd64eb5e6a9e6be35980dc..b1fb87c900dc49c1db59e1471859df88e273f535 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1249,6 +1249,7 @@ CHECK_DEPS = $(toolexeclibgo_DATA) $(toolexeclibgoarchive_DATA) \
 @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