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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d9839390c5b707315b6906a703658e59f277fe97..42c8f853f7e9dcfb2b1809dff743ba9feadbfa92 100644 (file)
--- 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.

diff --git a/libgo/go/runtime/testdata/testprogcgo/pprof.go b/libgo/go/runtime/testdata/testprogcgo/pprof.go
index 4460b9304e5cf750fb213ac63f293350498f9c78..c4fde0251ae07858b8dada8c15ffa9663546c5de 100644 (file)
--- a/libgo/go/runtime/testdata/testprogcgo/pprof.go
+++ b/libgo/go/runtime/testdata/testprogcgo/pprof.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build !gccgo
+
 package main
 
 // Run a slow C function saving a CPU profile.

diff --git a/libgo/go/runtime/testdata/testprogcgo/raceprof.go b/libgo/go/runtime/testdata/testprogcgo/raceprof.go
index fe624c541fd166a8a61ca9673f18b526434ffc19..466a367873c9808d0c926b525626b09b32109151 100644 (file)
--- a/libgo/go/runtime/testdata/testprogcgo/raceprof.go
+++ b/libgo/go/runtime/testdata/testprogcgo/raceprof.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build linux,amd64
+// +build !gccgo
 
 package main
 

diff --git a/libgo/go/runtime/testdata/testprogcgo/threadpprof.go b/libgo/go/runtime/testdata/testprogcgo/threadpprof.go
index 3da82961b9b74a21d5fe6da480e55d38a91180bf..bec4ef50d7613be2bc747ed4bed02f8affdfafc2 100644 (file)
--- a/libgo/go/runtime/testdata/testprogcgo/threadpprof.go
+++ b/libgo/go/runtime/testdata/testprogcgo/threadpprof.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build !plan9,!windows
+// +build !gccgo
 
 package main
 

diff --git a/libgo/go/runtime/testdata/testprogcgo/traceback.go b/libgo/go/runtime/testdata/testprogcgo/traceback.go
index 2a023f66caeb74f49933e2f9111b20beac3faa69..d21990e553187d53c0b6c13345f389972ab37113 100644 (file)
--- a/libgo/go/runtime/testdata/testprogcgo/traceback.go
+++ b/libgo/go/runtime/testdata/testprogcgo/traceback.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build !gccgo
+
 package main
 
 // This program will crash.

diff --git a/libgo/go/runtime/testdata/testprogcgo/tracebackctxt.go b/libgo/go/runtime/testdata/testprogcgo/tracebackctxt.go
index 51fa4ad25c320f357a7b466009787e584664089c..3940a77d4f9c0163df13fe2ce56e9b46088fc806 100644 (file)
--- a/libgo/go/runtime/testdata/testprogcgo/tracebackctxt.go
+++ b/libgo/go/runtime/testdata/testprogcgo/tracebackctxt.go
@@ -4,6 +4,8 @@
 
 // The __attribute__((weak)) used below doesn't seem to work on Windows.
 
+// +build !gccgo
+
 package main
 
 // Test the context argument to SetCgoTraceback.

diff --git a/libgo/go/runtime/testdata/testprogcgo/tracebackctxt_c.c b/libgo/go/runtime/testdata/testprogcgo/tracebackctxt_c.c
index 900cada0d3d7fc1f1c541f43f90f970b4cb5d0b4..f02b7ca3924f62b26570ca600b7c5f6cd805425e 100644 (file)
--- a/libgo/go/runtime/testdata/testprogcgo/tracebackctxt_c.c
+++ b/libgo/go/runtime/testdata/testprogcgo/tracebackctxt_c.c
@@ -5,6 +5,8 @@
 // The C definitions for tracebackctxt.go. That file uses //export so
 // it can't put function definitions in the "C" import comment.
 
+// +build !gccgo
+
 #include <stdlib.h>
 #include <stdint.h>