<div dir="ltr">The patches have no header, upstream-status, or signed-off-by.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 14 October 2017 at 16:48, Khem Raj <span dir="ltr"><<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
---<br>
meta/recipes-devtools/go/go-1.<wbr>9.inc | 3 +<br>
.../go/go-1.9/default-<wbr>buildmode-pie.patch | 13 +++<br>
.../go/go-1.9/set-external-<wbr>linker.patch | 104 +++++++++++++++++++++<br>
3 files changed, 120 insertions(+)<br>
create mode 100644 meta/recipes-devtools/go/go-1.<wbr>9/default-buildmode-pie.patch<br>
create mode 100644 meta/recipes-devtools/go/go-1.<wbr>9/set-external-linker.patch<br>
<br>
diff --git a/meta/recipes-devtools/go/go-<wbr>1.9.inc b/meta/recipes-devtools/go/go-<wbr>1.9.inc<br>
index 65adaa8d72..f52abb5735 100644<br>
--- a/meta/recipes-devtools/go/go-<wbr>1.9.inc<br>
+++ b/meta/recipes-devtools/go/go-<wbr>1.9.inc<br>
@@ -15,6 +15,9 @@ SRC_URI += "\<br>
file://0007-ld-add-soname-to-<wbr>shareable-objects.patch \<br>
file://0008-make.bash-add-<wbr>GOHOSTxx-indirection-for-<wbr>cross-canadia.patch \<br>
file://0009-cmd-go-buildmode-<wbr>pie-forces-external-linking-<wbr>mode-on.patch \<br>
+ file://default-buildmode-pie.<wbr>patch \<br>
"<br>
+SRC_URI_append_libc-musl = " file://set-external-linker.<wbr>patch"<br>
+<br>
SRC_URI[main.md5sum] = "<wbr>da2d44ea384076efec43ee1f8b7d45<wbr>d2"<br>
SRC_URI[main.sha256sum] = "<wbr>a4ab229028ed167ba1986825751463<wbr>605264e44868362ca8e7accc8be057<wbr>e993"<br>
diff --git a/meta/recipes-devtools/go/go-<wbr>1.9/default-buildmode-pie.<wbr>patch b/meta/recipes-devtools/go/go-<wbr>1.9/default-buildmode-pie.<wbr>patch<br>
new file mode 100644<br>
index 0000000000..cc8aef0ad0<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-<wbr>1.9/default-buildmode-pie.<wbr>patch<br>
@@ -0,0 +1,13 @@<br>
+diff -upr src/go.orig/src/cmd/go/<wbr>internal/work/build.go src/go/src/cmd/go/internal/<wbr>work/build.go<br>
+--- go.orig/src/cmd/go/internal/<wbr>work/build.go 2017-08-27 17:38:26.354750979 +0200<br>
++++ go/src/cmd/go/internal/work/<wbr>build.go 2017-08-27 17:40:27.555130105 +0200<br>
+@@ -304,7 +304,8 @@ func BuildModeInit() {<br>
+ ldBuildmode = "c-shared"<br>
+ case "default":<br>
+ switch platform {<br>
+- case "android/arm", "android/arm64", "android/amd64", "android/386":<br>
++ case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/s390x",<br>
++ "android/arm", "android/arm64", "android/amd64", "android/386":<br>
+ codegenArg = "-shared"<br>
+ ldBuildmode = "pie"<br>
+ case "darwin/arm", "darwin/arm64":<br>
diff --git a/meta/recipes-devtools/go/go-<wbr>1.9/set-external-linker.patch b/meta/recipes-devtools/go/go-<wbr>1.9/set-external-linker.patch<br>
new file mode 100644<br>
index 0000000000..79eaff7205<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-<wbr>1.9/set-external-linker.patch<br>
@@ -0,0 +1,104 @@<br>
+Index: go/src/cmd/link/internal/<wbr>amd64/obj.go<br>
+=============================<wbr>==============================<wbr>========<br>
+--- go.orig/src/cmd/link/internal/<wbr>amd64/obj.go<br>
++++ go/src/cmd/link/internal/<wbr>amd64/obj.go<br>
+@@ -67,7 +67,7 @@ func Init() {<br>
+ ld.Thearch.Append64 = ld.Append64l<br>
+ ld.Thearch.TLSIEtoLE = tlsIEtoLE<br>
+<br>
+- ld.Thearch.Linuxdynld = "/lib64/ld-linux-x86-64.so.2"<br>
++ ld.Thearch.Linuxdynld = "/lib/ld-musl-x86_64.so.1"<br>
+ ld.Thearch.Freebsddynld = "/libexec/ld-elf.so.1"<br>
+ ld.Thearch.Openbsddynld = "/usr/libexec/ld.so"<br>
+ ld.Thearch.Netbsddynld = "/libexec/ld.elf_so"<br>
+Index: go/src/cmd/link/internal/arm/<wbr>obj.go<br>
+=============================<wbr>==============================<wbr>========<br>
+--- go.orig/src/cmd/link/internal/<wbr>arm/obj.go<br>
++++ go/src/cmd/link/internal/arm/<wbr>obj.go<br>
+@@ -63,7 +63,7 @@ func Init() {<br>
+ ld.Thearch.Append32 = ld.Append32l<br>
+ ld.Thearch.Append64 = ld.Append64l<br>
+<br>
+- ld.Thearch.Linuxdynld = "/lib/ld-linux.so.3" // 2 for OABI, 3 for EABI<br>
++ ld.Thearch.Linuxdynld = "/lib/ld-musl-armhf.so.1"<br>
+ ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1"<br>
+ ld.Thearch.Openbsddynld = "/usr/libexec/ld.so"<br>
+ ld.Thearch.Netbsddynld = "/libexec/ld.elf_so"<br>
+Index: go/src/cmd/link/internal/<wbr>arm64/obj.go<br>
+=============================<wbr>==============================<wbr>========<br>
+--- go.orig/src/cmd/link/internal/<wbr>arm64/obj.go<br>
++++ go/src/cmd/link/internal/<wbr>arm64/obj.go<br>
+@@ -62,7 +62,7 @@ func Init() {<br>
+ ld.Thearch.Append32 = ld.Append32l<br>
+ ld.Thearch.Append64 = ld.Append64l<br>
+<br>
+- ld.Thearch.Linuxdynld = "/lib/ld-linux-aarch64.so.1"<br>
++ ld.Thearch.Linuxdynld = "/lib/ld-musl-aarch64.so.1"<br>
+<br>
+ ld.Thearch.Freebsddynld = "XXX"<br>
+ ld.Thearch.Openbsddynld = "XXX"<br>
+Index: go/src/cmd/link/internal/mips/<wbr>obj.go<br>
+=============================<wbr>==============================<wbr>========<br>
+--- go.orig/src/cmd/link/internal/<wbr>mips/obj.go<br>
++++ go/src/cmd/link/internal/mips/<wbr>obj.go<br>
+@@ -77,7 +77,7 @@ func Init() {<br>
+ ld.Thearch.Append64 = ld.Append64b<br>
+ }<br>
+<br>
+- ld.Thearch.Linuxdynld = "/lib/ld.so.1"<br>
++ ld.Thearch.Linuxdynld = "/lib/ld-musl-mipsle.so.1"<br>
+<br>
+ ld.Thearch.Freebsddynld = "XXX"<br>
+ ld.Thearch.Openbsddynld = "XXX"<br>
+Index: go/src/cmd/link/internal/<wbr>mips64/obj.go<br>
+=============================<wbr>==============================<wbr>========<br>
+--- go.orig/src/cmd/link/internal/<wbr>mips64/obj.go<br>
++++ go/src/cmd/link/internal/<wbr>mips64/obj.go<br>
+@@ -75,7 +75,7 @@ func Init() {<br>
+ ld.Thearch.Append64 = ld.Append64b<br>
+ }<br>
+<br>
+- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"<br>
++ ld.Thearch.Linuxdynld = "/lib64/ld-musl-mips64le.so.1"<br>
+<br>
+ ld.Thearch.Freebsddynld = "XXX"<br>
+ ld.Thearch.Openbsddynld = "XXX"<br>
+Index: go/src/cmd/link/internal/<wbr>ppc64/obj.go<br>
+=============================<wbr>==============================<wbr>========<br>
+--- go.orig/src/cmd/link/internal/<wbr>ppc64/obj.go<br>
++++ go/src/cmd/link/internal/<wbr>ppc64/obj.go<br>
+@@ -77,7 +77,7 @@ func Init() {<br>
+ }<br>
+<br>
+ // TODO(austin): ABI v1 uses /usr/lib/ld.so.1<br>
+- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"<br>
++ ld.Thearch.Linuxdynld = "/lib/ld-musl-powerpc64le.so.<wbr>1"<br>
+<br>
+ ld.Thearch.Freebsddynld = "XXX"<br>
+ ld.Thearch.Openbsddynld = "XXX"<br>
+Index: go/src/cmd/link/internal/<wbr>s390x/obj.go<br>
+=============================<wbr>==============================<wbr>========<br>
+--- go.orig/src/cmd/link/internal/<wbr>s390x/obj.go<br>
++++ go/src/cmd/link/internal/<wbr>s390x/obj.go<br>
+@@ -62,7 +62,7 @@ func Init() {<br>
+ ld.Thearch.Append32 = ld.Append32b<br>
+ ld.Thearch.Append64 = ld.Append64b<br>
+<br>
+- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"<br>
++ ld.Thearch.Linuxdynld = "/lib/ld-musl-s390x.so.1"<br>
+<br>
+ // not relevant for s390x<br>
+ ld.Thearch.Freebsddynld = "XXX"<br>
+Index: go/src/cmd/link/internal/x86/<wbr>obj.go<br>
+=============================<wbr>==============================<wbr>========<br>
+--- go.orig/src/cmd/link/internal/<wbr>x86/obj.go<br>
++++ go/src/cmd/link/internal/x86/<wbr>obj.go<br>
+@@ -63,7 +63,7 @@ func Init() {<br>
+ ld.Thearch.Append32 = ld.Append32l<br>
+ ld.Thearch.Append64 = ld.Append64l<br>
+<br>
+- ld.Thearch.Linuxdynld = "/lib/ld-linux.so.2"<br>
++ ld.Thearch.Linuxdynld = "/lib/ld-musl-i386.so.1"<br>
+ ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1"<br>
+ ld.Thearch.Openbsddynld = "/usr/libexec/ld.so"<br>
+ ld.Thearch.Netbsddynld = "/usr/libexec/ld.elf_so"<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.14.2<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>