aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-06-22 14:27:09 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-06-22 14:27:09 +0000
commit2a208bc2570b07b64deb1d549332e5d981c867bc (patch)
treeae74f47931a73db978078706cc4d67b42d0fcabb /gcc/go
parent7d8c7b26c811748fc606085bf169dcd8a426eaf4 (diff)
downloadgcc-2a208bc2570b07b64deb1d549332e5d981c867bc.zip
gcc-2a208bc2570b07b64deb1d549332e5d981c867bc.tar.gz
gcc-2a208bc2570b07b64deb1d549332e5d981c867bc.tar.bz2
runtime: don't build test files that use SetCgoTraceback for gccgo
The gofrontend doesn't support the runtime.SetCgoTraceback function, which is specifically for handling mixed Go and C tracebacks. Use a build tag to avoid compiling the runtime/testdata/testprogcgo files that refer to SetCgoTraceback. These files are not currently compiled anyhow, but they will be with a future gotools patch. Reviewed-on: https://go-review.googlesource.com/46452 From-SVN: r249556
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d983939..42c8f85 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-bbc4f30a027ee09475d08aa4aeed1f2f7067e2e9
+e017833e4ce4a3bc3ba02eac4351b15c86157ec0
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.