diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-09-28 18:02:40 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-09-28 18:02:40 +0000 |
| commit | 58920998e374bac41c6affea0284e6d1f00f5c42 (patch) | |
| tree | 57f9b4dc84c2cab069293196315b22343576bfe9 | |
| parent | fd5effb17e5f800fcaf54fc1223b77fa764b7f72 (diff) | |
| download | gcc-58920998e374bac41c6affea0284e6d1f00f5c42.zip gcc-58920998e374bac41c6affea0284e6d1f00f5c42.tar.gz gcc-58920998e374bac41c6affea0284e6d1f00f5c42.tar.bz2 | |
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
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/Makefile.am | 1 | ||||
| -rw-r--r-- | libgo/Makefile.in | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 8ed62a4..6ab7e42 100644 --- 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 81533be..23cfd07 100644 --- 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 ebb7ddf..b1fb87c 100644 --- 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 |