You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
106 lines
3.9 KiB
106 lines
3.9 KiB
5 years ago
|
This patch is intended to fix https://github.com/golang/go/issues/18243
|
||
|
|
|
||
|
|
diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go
|
||
|
|
index 87e8091..4470e05 100644
|
||
|
|
--- a/src/cmd/link/internal/amd64/obj.go
|
||
|
|
+++ b/src/cmd/link/internal/amd64/obj.go
|
||
|
|
@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||
|
|
PEreloc1: pereloc1,
|
||
|
|
TLSIEtoLE: tlsIEtoLE,
|
||
|
|
|
||
|
|
- Linuxdynld: "/lib64/ld-linux-x86-64.so.2",
|
||
|
|
+ Linuxdynld: "/lib/ld-musl-x86_64.so.1",
|
||
|
|
Freebsddynld: "/libexec/ld-elf.so.1",
|
||
|
|
Openbsddynld: "/usr/libexec/ld.so",
|
||
|
|
Netbsddynld: "/libexec/ld.elf_so",
|
||
|
|
diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go
|
||
|
|
index da16f92..fd14940 100644
|
||
|
|
--- a/src/cmd/link/internal/arm/obj.go
|
||
|
|
+++ b/src/cmd/link/internal/arm/obj.go
|
||
|
|
@@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||
|
|
Gentext: gentext,
|
||
|
|
Machoreloc1: machoreloc1,
|
||
|
|
|
||
|
|
- Linuxdynld: "/lib/ld-linux.so.3", // 2 for OABI, 3 for EABI
|
||
|
|
+ Linuxdynld: "/lib/ld-musl-armhf.so.1",
|
||
|
|
Freebsddynld: "/usr/libexec/ld-elf.so.1",
|
||
|
|
Openbsddynld: "/usr/libexec/ld.so",
|
||
|
|
Netbsddynld: "/libexec/ld.elf_so",
|
||
|
|
diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go
|
||
|
|
index 6b386ad..9986371 100644
|
||
|
|
--- a/src/cmd/link/internal/arm64/obj.go
|
||
|
|
+++ b/src/cmd/link/internal/arm64/obj.go
|
||
|
|
@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||
|
|
Gentext: gentext,
|
||
|
|
Machoreloc1: machoreloc1,
|
||
|
|
|
||
|
|
- Linuxdynld: "/lib/ld-linux-aarch64.so.1",
|
||
|
|
+ Linuxdynld: "/lib/ld-musl-aarch64.so.1",
|
||
|
|
|
||
|
|
Freebsddynld: "XXX",
|
||
|
|
Openbsddynld: "XXX",
|
||
|
|
diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go
|
||
|
|
index c5d3451..fd85e63 100644
|
||
|
|
--- a/src/cmd/link/internal/mips/obj.go
|
||
|
|
+++ b/src/cmd/link/internal/mips/obj.go
|
||
|
|
@@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||
|
|
Gentext: gentext,
|
||
|
|
Machoreloc1: machoreloc1,
|
||
|
|
|
||
|
|
- Linuxdynld: "/lib/ld.so.1",
|
||
|
|
+ Linuxdynld: "/lib/ld-musl-mipsle.so.1",
|
||
|
|
|
||
|
|
Freebsddynld: "XXX",
|
||
|
|
Openbsddynld: "XXX",
|
||
|
|
diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go
|
||
|
|
index 83974e5..0f65647 100644
|
||
|
|
--- a/src/cmd/link/internal/mips64/obj.go
|
||
|
|
+++ b/src/cmd/link/internal/mips64/obj.go
|
||
|
|
@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||
|
|
Gentext: gentext,
|
||
|
|
Machoreloc1: machoreloc1,
|
||
|
|
|
||
|
|
- Linuxdynld: "/lib64/ld64.so.1",
|
||
|
|
+ Linuxdynld: "/lib/ld-musl-mips64le.so.1",
|
||
|
|
Freebsddynld: "XXX",
|
||
|
|
Openbsddynld: "XXX",
|
||
|
|
Netbsddynld: "XXX",
|
||
|
|
diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go
|
||
|
|
index 273d9b4..abe257d 100644
|
||
|
|
--- a/src/cmd/link/internal/ppc64/obj.go
|
||
|
|
+++ b/src/cmd/link/internal/ppc64/obj.go
|
||
|
|
@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||
|
|
Machoreloc1: machoreloc1,
|
||
|
|
|
||
|
|
// TODO(austin): ABI v1 uses /usr/lib/ld.so.1,
|
||
|
|
- Linuxdynld: "/lib64/ld64.so.1",
|
||
|
|
+ Linuxdynld: "/lib/ld-musl-powerpc64le.so.1",
|
||
|
|
|
||
|
|
Freebsddynld: "XXX",
|
||
|
|
Openbsddynld: "XXX",
|
||
|
|
diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go
|
||
|
|
index 9ac7eb8..b3f7a66 100644
|
||
|
|
--- a/src/cmd/link/internal/s390x/obj.go
|
||
|
|
+++ b/src/cmd/link/internal/s390x/obj.go
|
||
|
|
@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||
|
|
Gentext: gentext,
|
||
|
|
Machoreloc1: machoreloc1,
|
||
|
|
|
||
|
|
- Linuxdynld: "/lib64/ld64.so.1",
|
||
|
|
+ Linuxdynld: "/lib/ld-musl-s390x.so.1",
|
||
|
|
|
||
|
|
// not relevant for s390x
|
||
|
|
Freebsddynld: "XXX",
|
||
|
|
diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go
|
||
|
|
index 6a744dc..d81f392 100644
|
||
|
|
--- a/src/cmd/link/internal/x86/obj.go
|
||
|
|
+++ b/src/cmd/link/internal/x86/obj.go
|
||
|
|
@@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||
|
|
Machoreloc1: machoreloc1,
|
||
|
|
PEreloc1: pereloc1,
|
||
|
|
|
||
|
|
- Linuxdynld: "/lib/ld-linux.so.2",
|
||
|
|
+ Linuxdynld: "/lib/ld-musl-i386.so.1",
|
||
|
|
Freebsddynld: "/usr/libexec/ld-elf.so.1",
|
||
|
|
Openbsddynld: "/usr/libexec/ld.so",
|
||
|
|
Netbsddynld: "/usr/libexec/ld.elf_so",
|