c8-stream-rhel8
imports/c8-stream-rhel8/golang-1.20.10-1.module+el8.9.0+20382+04f7fe80
MSVSphere Packaging Team
1 year ago
parent
d041d5578f
commit
401397a619
@ -1,2 +1,2 @@
|
|||||||
SOURCES/go1.19.13-2-openssl-fips.tar.gz
|
SOURCES/go1.20.10-1-openssl-fips.tar.gz
|
||||||
SOURCES/go1.19.13.tar.gz
|
SOURCES/go1.20.10.tar.gz
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
3335b6ee2baab3a616b7a969b62ac1c9ed136b74 SOURCES/go1.19.13-2-openssl-fips.tar.gz
|
a16d4c1ed23caee22e90f86027d861cadb634993 SOURCES/go1.20.10-1-openssl-fips.tar.gz
|
||||||
5627a7cd27f73a12c909dd818d310deda7146b86 SOURCES/go1.19.13.tar.gz
|
f919ce5ad523ccba39500cab7ccd1ebbfde70021 SOURCES/go1.20.10.tar.gz
|
||||||
|
|||||||
@ -1,53 +0,0 @@
|
|||||||
From 241192ecd31ca03a6f68fa7e55bb9f66040d3a2f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lynn Boger <laboger@linux.vnet.ibm.com>
|
|
||||||
Date: Thu, 14 Jul 2022 10:47:28 -0500
|
|
||||||
Subject: [PATCH] cmd/link: use correct path for dynamic loader on ppc64le
|
|
||||||
|
|
||||||
The setting of the path for the dynamic loader when building for
|
|
||||||
linux/ppc64le ELF v2 was incorrectly set to the path for
|
|
||||||
PPC64 ELF v1. This has not caused issues in the common cases
|
|
||||||
because this string can be set based on the default GO_LDSO setting.
|
|
||||||
It does result in an incorrect value when cross compiling binaries
|
|
||||||
with -buildmode=pie.
|
|
||||||
|
|
||||||
Updates #53813
|
|
||||||
|
|
||||||
Change-Id: I84de1c97b42e0434760b76a57c5a05e055fbb730
|
|
||||||
---
|
|
||||||
src/cmd/link/internal/ppc64/obj.go | 13 +++++++------
|
|
||||||
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go
|
|
||||||
index b6d5ad92af..bca8fa9212 100644
|
|
||||||
--- a/src/cmd/link/internal/ppc64/obj.go
|
|
||||||
+++ b/src/cmd/link/internal/ppc64/obj.go
|
|
||||||
@@ -38,9 +38,12 @@ import (
|
|
||||||
)
|
|
||||||
|
|
||||||
func Init() (*sys.Arch, ld.Arch) {
|
|
||||||
- arch := sys.ArchPPC64
|
|
||||||
- if buildcfg.GOARCH == "ppc64le" {
|
|
||||||
- arch = sys.ArchPPC64LE
|
|
||||||
+ arch := sys.ArchPPC64LE
|
|
||||||
+ dynld := "/lib64/ld64.so.2"
|
|
||||||
+
|
|
||||||
+ if buildcfg.GOARCH == "ppc64" {
|
|
||||||
+ arch = sys.ArchPPC64
|
|
||||||
+ dynld = "/lib64/ld64.so.1"
|
|
||||||
}
|
|
||||||
|
|
||||||
theArch := ld.Arch{
|
|
||||||
@@ -64,9 +67,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
|
||||||
Machoreloc1: machoreloc1,
|
|
||||||
Xcoffreloc1: xcoffreloc1,
|
|
||||||
|
|
||||||
- // TODO(austin): ABI v1 uses /usr/lib/ld.so.1,
|
|
||||||
- Linuxdynld: "/lib64/ld64.so.1",
|
|
||||||
-
|
|
||||||
+ Linuxdynld: dynld,
|
|
||||||
Freebsddynld: "XXX",
|
|
||||||
Openbsddynld: "XXX",
|
|
||||||
Netbsddynld: "XXX",
|
|
||||||
--
|
|
||||||
2.35.3
|
|
||||||
|
|
||||||
@ -1,36 +1,13 @@
|
|||||||
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
|
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
|
||||||
index da5b179..6a772df 100644
|
index 9f26606..2408505 100644
|
||||||
--- a/src/cmd/dist/test.go
|
--- a/src/cmd/dist/test.go
|
||||||
+++ b/src/cmd/dist/test.go
|
+++ b/src/cmd/dist/test.go
|
||||||
@@ -1247,18 +1247,20 @@ func (t *tester) cgoTest(dt *distTest) error {
|
@@ -1259,7 +1259,7 @@ func (t *tester) registerCgoTests() {
|
||||||
fmt.Println("No support for static linking found (lacks libc.a?), skip cgo static linking test.")
|
|
||||||
} else {
|
} else {
|
||||||
if goos != "android" {
|
panic("unknown linkmode with static build: " + linkmode)
|
||||||
- t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, ".")
|
|
||||||
+ t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, "-tags=no_openssl")
|
|
||||||
}
|
|
||||||
t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), ".")
|
|
||||||
t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-ldflags", `-linkmode=external`, ".")
|
|
||||||
if goos != "android" {
|
|
||||||
- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, ".")
|
|
||||||
+ t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, "-tags=no_openssl")
|
|
||||||
+ /*
|
|
||||||
t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=static", "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, ".")
|
|
||||||
// -static in CGO_LDFLAGS triggers a different code path
|
|
||||||
// than -static in -extldflags, so test both.
|
|
||||||
// See issue #16651.
|
|
||||||
cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=static", ".")
|
|
||||||
setEnv(cmd, "CGO_LDFLAGS", "-static -pthread")
|
|
||||||
+ */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1268,7 +1270,7 @@ func (t *tester) cgoTest(dt *distTest) error {
|
|
||||||
t.addCmd(dt, "misc/cgo/test", t.goTest(), "-buildmode=pie", "-ldflags=-linkmode=internal", "-tags=internal,internal_pie", ".")
|
|
||||||
}
|
|
||||||
t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-buildmode=pie", ".")
|
|
||||||
- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie", ".")
|
|
||||||
+ t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie", "-tags=no_openssl")
|
|
||||||
}
|
}
|
||||||
|
- gt.tags = append(gt.tags, "static")
|
||||||
|
+ gt.tags = append(gt.tags, "static", "no_openssl")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
t.registerTest("cgo:"+name, "../misc/cgo/test", gt, opts...)
|
||||||
|
|||||||
Loading…
Reference in new issue