123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134 |
- From 973251ae0c69a35721f6115345d3f57b2847979f Mon Sep 17 00:00:00 2001
- From: Alex Kube <alexander.j.kube@gmail.com>
- Date: Wed, 23 Oct 2019 21:20:13 +0430
- Subject: [PATCH 9/9] ld: replace glibc dynamic linker with musl
- Rework of patch by Khem Raj <raj.khem@gmail.com>
- for go 1.10. Should be applied conditionally on
- musl being the system C library.
- Adapted to Go 1.13 from patches originally submitted to
- the meta/recipes-devtools/go tree by
- Matt Madison <matt@madison.systems>.
- Upstream-Status: Inappropriate [Real fix should be portable across libcs]
- Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
- ---
- src/cmd/link/internal/amd64/obj.go | 2 +-
- src/cmd/link/internal/arm/obj.go | 2 +-
- src/cmd/link/internal/arm64/obj.go | 2 +-
- src/cmd/link/internal/mips/obj.go | 2 +-
- src/cmd/link/internal/mips64/obj.go | 2 +-
- src/cmd/link/internal/ppc64/obj.go | 2 +-
- src/cmd/link/internal/s390x/obj.go | 2 +-
- src/cmd/link/internal/x86/obj.go | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
- diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go
- index 23741eb..8e74576 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: "/lib64/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 45a406e..724d3e3 100644
- --- a/src/cmd/link/internal/arm/obj.go
- +++ b/src/cmd/link/internal/arm/obj.go
- @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) {
- Machoreloc1: machoreloc1,
- PEreloc1: pereloc1,
-
- - 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 7c66623..d8b1db1 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: "/usr/libexec/ld.so",
- diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go
- index 231e1ff..631dd7a 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 9604208..5ef3ffc 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: "/lib64/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 51d1791..b15da85 100644
- --- a/src/cmd/link/internal/ppc64/obj.go
- +++ b/src/cmd/link/internal/ppc64/obj.go
- @@ -63,7 +63,7 @@ func Init() (*sys.Arch, ld.Arch) {
- Xcoffreloc1: xcoffreloc1,
-
- // TODO(austin): ABI v1 uses /usr/lib/ld.so.1,
- - Linuxdynld: "/lib64/ld64.so.1",
- + Linuxdynld: "/lib64/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 3454476..42cc346 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: "/lib64/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 f1fad20..d2ca10c 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",
- --
- 2.17.1 (Apple Git-112)
|