mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 13:27:09 +02:00
80d3e2de0e
The external linker for ppc64le was pointing to /lib64/ld-musl-ppc64le.so.1 but the valid path for alpine ppc64le is /lib/ld-musl-powerpc64le.so.1. This issue was found by Lynn Boger from IBM go compiler team.
105 lines
3.9 KiB
Diff
105 lines
3.9 KiB
Diff
diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go
|
|
index 9646b60..aacc4fb 100644
|
|
--- a/src/cmd/link/internal/amd64/obj.go
|
|
+++ b/src/cmd/link/internal/amd64/obj.go
|
|
@@ -67,7 +67,7 @@ func Init() {
|
|
ld.Thearch.Append64 = ld.Append64l
|
|
ld.Thearch.TLSIEtoLE = tlsIEtoLE
|
|
|
|
- ld.Thearch.Linuxdynld = "/lib64/ld-linux-x86-64.so.2"
|
|
+ ld.Thearch.Linuxdynld = "/lib/ld-musl-x86_64.so.1"
|
|
ld.Thearch.Freebsddynld = "/libexec/ld-elf.so.1"
|
|
ld.Thearch.Openbsddynld = "/usr/libexec/ld.so"
|
|
ld.Thearch.Netbsddynld = "/libexec/ld.elf_so"
|
|
diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go
|
|
index 05b90d2..8a69f9c 100644
|
|
--- a/src/cmd/link/internal/arm/obj.go
|
|
+++ b/src/cmd/link/internal/arm/obj.go
|
|
@@ -63,7 +63,7 @@ func Init() {
|
|
ld.Thearch.Append32 = ld.Append32l
|
|
ld.Thearch.Append64 = ld.Append64l
|
|
|
|
- ld.Thearch.Linuxdynld = "/lib/ld-linux.so.3" // 2 for OABI, 3 for EABI
|
|
+ ld.Thearch.Linuxdynld = "/lib/ld-musl-armhf.so.1"
|
|
ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1"
|
|
ld.Thearch.Openbsddynld = "/usr/libexec/ld.so"
|
|
ld.Thearch.Netbsddynld = "/libexec/ld.elf_so"
|
|
diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go
|
|
index 7d49163..66f2061 100644
|
|
--- a/src/cmd/link/internal/arm64/obj.go
|
|
+++ b/src/cmd/link/internal/arm64/obj.go
|
|
@@ -62,7 +62,7 @@ func Init() {
|
|
ld.Thearch.Append32 = ld.Append32l
|
|
ld.Thearch.Append64 = ld.Append64l
|
|
|
|
- ld.Thearch.Linuxdynld = "/lib/ld-linux-aarch64.so.1"
|
|
+ ld.Thearch.Linuxdynld = "/lib/ld-musl-aarch64.so.1"
|
|
|
|
ld.Thearch.Freebsddynld = "XXX"
|
|
ld.Thearch.Openbsddynld = "XXX"
|
|
diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go
|
|
index a333876..d040bfd 100644
|
|
--- a/src/cmd/link/internal/mips/obj.go
|
|
+++ b/src/cmd/link/internal/mips/obj.go
|
|
@@ -77,7 +77,7 @@ func Init() {
|
|
ld.Thearch.Append64 = ld.Append64b
|
|
}
|
|
|
|
- ld.Thearch.Linuxdynld = "/lib/ld.so.1"
|
|
+ ld.Thearch.Linuxdynld = "/lib/ld-musl-mipsle.so.1"
|
|
|
|
ld.Thearch.Freebsddynld = "XXX"
|
|
ld.Thearch.Openbsddynld = "XXX"
|
|
diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go
|
|
index b79cd9d..a681690 100644
|
|
--- a/src/cmd/link/internal/mips64/obj.go
|
|
+++ b/src/cmd/link/internal/mips64/obj.go
|
|
@@ -75,7 +75,7 @@ func Init() {
|
|
ld.Thearch.Append64 = ld.Append64b
|
|
}
|
|
|
|
- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"
|
|
+ ld.Thearch.Linuxdynld = "/lib64/ld-musl-mips64le.so.1"
|
|
|
|
ld.Thearch.Freebsddynld = "XXX"
|
|
ld.Thearch.Openbsddynld = "XXX"
|
|
diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go
|
|
index 6eff2f4..1f3c0be 100644
|
|
--- a/src/cmd/link/internal/ppc64/obj.go
|
|
+++ b/src/cmd/link/internal/ppc64/obj.go
|
|
@@ -77,7 +77,7 @@ func Init() {
|
|
}
|
|
|
|
// TODO(austin): ABI v1 uses /usr/lib/ld.so.1
|
|
- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"
|
|
+ ld.Thearch.Linuxdynld = "/lib/ld-musl-powerpc64le.so.1"
|
|
|
|
ld.Thearch.Freebsddynld = "XXX"
|
|
ld.Thearch.Openbsddynld = "XXX"
|
|
diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go
|
|
index eea8978..09eaa70 100644
|
|
--- a/src/cmd/link/internal/s390x/obj.go
|
|
+++ b/src/cmd/link/internal/s390x/obj.go
|
|
@@ -62,7 +62,7 @@ func Init() {
|
|
ld.Thearch.Append32 = ld.Append32b
|
|
ld.Thearch.Append64 = ld.Append64b
|
|
|
|
- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"
|
|
+ ld.Thearch.Linuxdynld = "/lib/ld-musl-s390x.so.1"
|
|
|
|
// not relevant for s390x
|
|
ld.Thearch.Freebsddynld = "XXX"
|
|
diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go
|
|
index ea213be..7beb2a3 100644
|
|
--- a/src/cmd/link/internal/x86/obj.go
|
|
+++ b/src/cmd/link/internal/x86/obj.go
|
|
@@ -63,7 +63,7 @@ func Init() {
|
|
ld.Thearch.Append32 = ld.Append32l
|
|
ld.Thearch.Append64 = ld.Append64l
|
|
|
|
- ld.Thearch.Linuxdynld = "/lib/ld-linux.so.2"
|
|
+ ld.Thearch.Linuxdynld = "/lib/ld-musl-i386.so.1"
|
|
ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1"
|
|
ld.Thearch.Openbsddynld = "/usr/libexec/ld.so"
|
|
ld.Thearch.Netbsddynld = "/usr/libexec/ld.elf_so"
|