Revert "go: Fix build with PIE on musl"

This reverts commit d6fcf91c06a3d118e8741273fac6903100141db4.

This commit was included on the rocko update by mistake. It ended
being dropped from master merge queue but forgotten in rocko one.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/go/go-1.9.inc b/meta/recipes-devtools/go/go-1.9.inc
index f52abb573584c9212c2ccf8bb0e30131841e4e77..65adaa8d722fbf7347136ba1de1a53b8b0b89b01 100644 (file)
--- a/meta/recipes-devtools/go/go-1.9.inc
+++ b/meta/recipes-devtools/go/go-1.9.inc
@@ -15,9 +15,6 @@ SRC_URI += "\
         file://0007-ld-add-soname-to-shareable-objects.patch \
         file://0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch \
         file://0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch \
-        file://default-buildmode-pie.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/default-buildmode-pie.patch b/meta/recipes-devtools/go/go-1.9/default-buildmode-pie.patch
deleted file mode 100644 (file)
index a7933bd..0000000
--- a/meta/recipes-devtools/go/go-1.9/default-buildmode-pie.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Default to PIE on linux platforms
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-diff -upr src/go.orig/src/cmd/go/internal/work/build.go src/go/src/cmd/go/internal/work/build.go
---- go.orig/src/cmd/go/internal/work/build.go  2017-08-27 17:38:26.354750979 +0200
-+++ go/src/cmd/go/internal/work/build.go       2017-08-27 17:40:27.555130105 +0200
-@@ -304,7 +304,8 @@ func BuildModeInit() {
-               ldBuildmode = "c-shared"
-       case "default":
-               switch platform {
--              case "android/arm", "android/arm64", "android/amd64", "android/386":
-+              case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/s390x",
-+                      "android/arm", "android/arm64", "android/amd64", "android/386":
-                       codegenArg = "-shared"
-                       ldBuildmode = "pie"
-               case "darwin/arm", "darwin/arm64":

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
deleted file mode 100644 (file)
index d6bd7fa..0000000
--- a/meta/recipes-devtools/go/go-1.9/set-external-linker.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-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"