This patch fixes the misc/cgo/testcachive test to work with gccgo.
This test is not currently run, but it will be soon. Bootstrapped on
x86_64-pc-linux-gnu. Committed to mainline.
Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 249794)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-8c4d6fd19f6d5dc9b41be384c60507f2236f05ec
+12c65e8310956eb3cc412d9dc9f9e88cbd928c8e
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/misc/cgo/testcarchive/carchive_test.go
===================================================================
--- libgo/misc/cgo/testcarchive/carchive_test.go (revision 249674)
+++ libgo/misc/cgo/testcarchive/carchive_test.go (working copy)
@@ -12,6 +12,7 @@ import (
"os"
"os/exec"
"path/filepath"
+ "runtime"
"strings"
"syscall"
"testing"
@@ -81,13 +82,17 @@ func init() {
cc = append(cc, []string{"-framework", "CoreFoundation",
"-framework", "Foundation"}...)
}
libgodir = GOOS + "_" + GOARCH
- switch GOOS {
- case "darwin":
- if GOARCH == "arm" || GOARCH == "arm64" {
+ if runtime.Compiler == "gccgo" {
+ libgodir = "gccgo_" + libgodir + "_fPIC"
+ } else {
+ switch GOOS {
+ case "darwin":
+ if GOARCH == "arm" || GOARCH == "arm64" {
+ libgodir += "_shared"
+ }
+ case "dragonfly", "freebsd", "linux", "netbsd", "openbsd",
"solaris":
libgodir += "_shared"
}
- case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
- libgodir += "_shared"
}
cc = append(cc, "-I", filepath.Join("pkg", libgodir))
@@ -149,6 +154,9 @@ func testInstall(t *testing.T, exe, libg
} else {
ccArgs = append(ccArgs, "main_unix.c", libgoa)
}
+ if runtime.Compiler == "gccgo" {
+ ccArgs = append(ccArgs, "-lgo")
+ }
t.Log(ccArgs)
if out, err := exec.Command(ccArgs[0], ccArgs[1:]...).CombinedOutput();
err != nil {
t.Logf("%s", out)
@@ -157,7 +165,11 @@ func testInstall(t *testing.T, exe, libg
defer os.Remove(exe)
binArgs := append(cmdToRun(exe), "arg1", "arg2")
- if out, err := exec.Command(binArgs[0],
binArgs[1:]...).CombinedOutput(); err != nil {
+ cmd = exec.Command(binArgs[0], binArgs[1:]...)
+ if runtime.Compiler == "gccgo" {
+ cmd.Env = append(os.Environ(), "GCCGO=1")
+ }
+ if out, err := cmd.CombinedOutput(); err != nil {
t.Logf("%s", out)
t.Fatal(err)
}
@@ -166,8 +178,13 @@ func testInstall(t *testing.T, exe, libg
func TestInstall(t *testing.T) {
defer os.RemoveAll("pkg")
+ libgoa := "libgo.a"
+ if runtime.Compiler == "gccgo" {
+ libgoa = "liblibgo.a"
+ }
+
testInstall(t, "./testp1"+exeSuffix,
- filepath.Join("pkg", libgodir, "libgo.a"),
+ filepath.Join("pkg", libgodir, libgoa),
filepath.Join("pkg", libgodir, "libgo.h"),
"go", "install", "-buildmode=c-archive", "libgo")
@@ -206,6 +223,9 @@ func TestEarlySignalHandler(t *testing.T
}
ccArgs := append(cc, "-o", "testp"+exeSuffix, "main2.c", "libgo2.a")
+ if runtime.Compiler == "gccgo" {
+ ccArgs = append(ccArgs, "-lgo")
+ }
if out, err := exec.Command(ccArgs[0], ccArgs[1:]...).CombinedOutput();
err != nil {
t.Logf("%s", out)
t.Fatal(err)
@@ -243,6 +263,9 @@ func TestSignalForwarding(t *testing.T)
}
ccArgs := append(cc, "-o", "testp"+exeSuffix, "main5.c", "libgo2.a")
+ if runtime.Compiler == "gccgo" {
+ ccArgs = append(ccArgs, "-lgo")
+ }
if out, err := exec.Command(ccArgs[0], ccArgs[1:]...).CombinedOutput();
err != nil {
t.Logf("%s", out)
t.Fatal(err)
@@ -293,6 +316,9 @@ func TestSignalForwardingExternal(t *tes
}
ccArgs := append(cc, "-o", "testp"+exeSuffix, "main5.c", "libgo2.a")
+ if runtime.Compiler == "gccgo" {
+ ccArgs = append(ccArgs, "-lgo")
+ }
if out, err := exec.Command(ccArgs[0], ccArgs[1:]...).CombinedOutput();
err != nil {
t.Logf("%s", out)
t.Fatal(err)
@@ -380,6 +406,9 @@ func TestOsSignal(t *testing.T) {
}
ccArgs := append(cc, "-o", "testp"+exeSuffix, "main3.c", "libgo3.a")
+ if runtime.Compiler == "gccgo" {
+ ccArgs = append(ccArgs, "-lgo")
+ }
if out, err := exec.Command(ccArgs[0], ccArgs[1:]...).CombinedOutput();
err != nil {
t.Logf("%s", out)
t.Fatal(err)
@@ -412,6 +441,9 @@ func TestSigaltstack(t *testing.T) {
}
ccArgs := append(cc, "-o", "testp"+exeSuffix, "main4.c", "libgo4.a")
+ if runtime.Compiler == "gccgo" {
+ ccArgs = append(ccArgs, "-lgo")
+ }
if out, err := exec.Command(ccArgs[0], ccArgs[1:]...).CombinedOutput();
err != nil {
t.Logf("%s", out)
t.Fatal(err)
@@ -436,6 +468,9 @@ func TestExtar(t *testing.T) {
case "windows":
t.Skip("skipping signal test on Windows")
}
+ if runtime.Compiler == "gccgo" {
+ t.Skip("skipping -extar test when using gccgo")
+ }
defer func() {
os.Remove("libgo4.a")
@@ -489,14 +524,26 @@ func TestPIE(t *testing.T) {
t.Fatal(err)
}
- ccArgs := append(cc, "-fPIE", "-pie", "-o", "testp"+exeSuffix,
"main.c", "main_unix.c", filepath.Join("pkg", libgodir, "libgo.a"))
+ libgoa := "libgo.a"
+ if runtime.Compiler == "gccgo" {
+ libgoa = "liblibgo.a"
+ }
+
+ ccArgs := append(cc, "-fPIE", "-pie", "-o", "testp"+exeSuffix,
"main.c", "main_unix.c", filepath.Join("pkg", libgodir, libgoa))
+ if runtime.Compiler == "gccgo" {
+ ccArgs = append(ccArgs, "-lgo")
+ }
if out, err := exec.Command(ccArgs[0], ccArgs[1:]...).CombinedOutput();
err != nil {
t.Logf("%s", out)
t.Fatal(err)
}
binArgs := append(bin, "arg1", "arg2")
- if out, err := exec.Command(binArgs[0],
binArgs[1:]...).CombinedOutput(); err != nil {
+ cmd = exec.Command(binArgs[0], binArgs[1:]...)
+ if runtime.Compiler == "gccgo" {
+ cmd.Env = append(os.Environ(), "GCCGO=1")
+ }
+ if out, err := cmd.CombinedOutput(); err != nil {
t.Logf("%s", out)
t.Fatal(err)
}
Index: libgo/misc/cgo/testcarchive/main_unix.c
===================================================================
--- libgo/misc/cgo/testcarchive/main_unix.c (revision 249674)
+++ libgo/misc/cgo/testcarchive/main_unix.c (working copy)
@@ -5,6 +5,7 @@
#include <signal.h>
#include <stdint.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
struct sigaction sa;
@@ -30,7 +31,12 @@ int install_handler() {
perror("sigaction");
return 2;
}
- if (osa.sa_handler == SIG_DFL || (osa.sa_flags&SA_ONSTACK) == 0) {
+ if (osa.sa_handler == SIG_DFL) {
+ fprintf(stderr, "Go runtime did not install signal handler\n");
+ return 2;
+ }
+ // gccgo does not set SA_ONSTACK for SIGSEGV.
+ if (getenv("GCCGO") == "" && (osa.sa_flags&SA_ONSTACK) == 0) {
fprintf(stderr, "Go runtime did not install signal handler\n");
return 2;
}
