go: Use right dynamic linker on musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-devtools/go/go-1.9.inc b/meta/recipes-devtools/go/go-1.9.inc
index 65adaa8d722fbf7347136ba1de1a53b8b0b89b01..60292651df0100f550449c4934ffde0de8ec1e3a 100644 (file)
--- a/meta/recipes-devtools/go/go-1.9.inc
+++ b/meta/recipes-devtools/go/go-1.9.inc
@@ -16,5 +16,7 @@ SRC_URI += "\
         file://0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch \
         file://0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch \
 "
+SRC_URI_append_libc-musl = " file://set-external-linker.patch"
+
 SRC_URI[main.md5sum] = "da2d44ea384076efec43ee1f8b7d45d2"
 SRC_URI[main.sha256sum] = "a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993"

diff --git a/meta/recipes-devtools/go/go-1.9/set-external-linker.patch b/meta/recipes-devtools/go/go-1.9/set-external-linker.patch
new file mode 100644 (file)
index 0000000..d6bd7fa
--- /dev/null
+++ b/meta/recipes-devtools/go/go-1.9/set-external-linker.patch
@@ -0,0 +1,111 @@
+Change the dynamic linker hardcoding to use musl when not using glibc
+this should be applied conditional to musl being the system C library
+
+Upstream-Status: Inappropriate [Real Fix should be portable across libcs]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: go/src/cmd/link/internal/amd64/obj.go
+===================================================================
+--- go.orig/src/cmd/link/internal/amd64/obj.go
++++ go/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"
+Index: go/src/cmd/link/internal/arm/obj.go
+===================================================================
+--- go.orig/src/cmd/link/internal/arm/obj.go
++++ go/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"
+Index: go/src/cmd/link/internal/arm64/obj.go
+===================================================================
+--- go.orig/src/cmd/link/internal/arm64/obj.go
++++ go/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"
+Index: go/src/cmd/link/internal/mips/obj.go
+===================================================================
+--- go.orig/src/cmd/link/internal/mips/obj.go
++++ go/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"
+Index: go/src/cmd/link/internal/mips64/obj.go
+===================================================================
+--- go.orig/src/cmd/link/internal/mips64/obj.go
++++ go/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"
+Index: go/src/cmd/link/internal/ppc64/obj.go
+===================================================================
+--- go.orig/src/cmd/link/internal/ppc64/obj.go
++++ go/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"
+Index: go/src/cmd/link/internal/s390x/obj.go
+===================================================================
+--- go.orig/src/cmd/link/internal/s390x/obj.go
++++ go/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"
+Index: go/src/cmd/link/internal/x86/obj.go
+===================================================================
+--- go.orig/src/cmd/link/internal/x86/obj.go
++++ go/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"