summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Barker <pbarker@toganlabs.com>2017-10-13 19:25:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-16 22:52:44 (GMT)
commit001f8ee0adf703f0a9f90ae9e8f3674935a18c2c (patch)
tree4f94eb05e0fdc0b5c4d68fa1a35a275aec1cf6ed /meta
parent68e77cfb8ac40926eb09f982cc835a0378ad029a (diff)
downloadpoky-001f8ee0adf703f0a9f90ae9e8f3674935a18c2c.tar.gz
go: Export correct GO386 value for target
When compiling go code for the target we need to ensure that GO386 is exported and set appropriately. This controls whether sse/sse2 instructions are used to implement floating-point operations or not. (From OE-Core rev: eba5fd5f594d65d311fa7564fa4b243248cb212a) Signed-off-by: Paul Barker <pbarker@toganlabs.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/go/go-cross-canadian.inc1
-rw-r--r--meta/recipes-devtools/go/go-cross.inc2
-rw-r--r--meta/recipes-devtools/go/go-runtime.inc1
-rw-r--r--meta/recipes-devtools/go/go-target.inc1
4 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-devtools/go/go-cross-canadian.inc b/meta/recipes-devtools/go/go-cross-canadian.inc
index f3ab735..8afda6b 100644
--- a/meta/recipes-devtools/go/go-cross-canadian.inc
+++ b/meta/recipes-devtools/go/go-cross-canadian.inc
@@ -41,6 +41,7 @@ native_goroot=\`readlink -f \$here/../../lib/${TARGET_SYS}/go\`
41export GOARCH="${TARGET_GOARCH}" 41export GOARCH="${TARGET_GOARCH}"
42export GOOS="${TARGET_GOOS}" 42export GOOS="${TARGET_GOOS}"
43test -n "\$GOARM" || export GOARM="${TARGET_GOARM}" 43test -n "\$GOARM" || export GOARM="${TARGET_GOARM}"
44test -n "\$GO386" || export GO386="${TARGET_GO386}"
44export GOTOOLDIR="\$native_goroot/pkg/tool/${HOST_GOTUPLE}" 45export GOTOOLDIR="\$native_goroot/pkg/tool/${HOST_GOTUPLE}"
45test -n "\$GOROOT" || export GOROOT="\$OECORE_TARGET_SYSROOT/${target_libdir}/go" 46test -n "\$GOROOT" || export GOROOT="\$OECORE_TARGET_SYSROOT/${target_libdir}/go"
46\$here/../../lib/${TARGET_SYS}/go/bin/$1 "\$@" 47\$here/../../lib/${TARGET_SYS}/go/bin/$1 "\$@"
diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc
index dac0dfd..3ac7211 100644
--- a/meta/recipes-devtools/go/go-cross.inc
+++ b/meta/recipes-devtools/go/go-cross.inc
@@ -10,6 +10,7 @@ export GOHOSTARCH = "${BUILD_GOARCH}"
10export GOOS = "${TARGET_GOOS}" 10export GOOS = "${TARGET_GOOS}"
11export GOARCH = "${TARGET_GOARCH}" 11export GOARCH = "${TARGET_GOARCH}"
12export GOARM = "${TARGET_GOARM}" 12export GOARM = "${TARGET_GOARM}"
13export GO386 = "${TARGET_GO386}"
13export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" 14export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go"
14export GOROOT_FINAL = "${libdir}/go" 15export GOROOT_FINAL = "${libdir}/go"
15export CGO_ENABLED = "1" 16export CGO_ENABLED = "1"
@@ -37,6 +38,7 @@ here=\`dirname \$0\`
37export GOARCH="${TARGET_GOARCH}" 38export GOARCH="${TARGET_GOARCH}"
38export GOOS="${TARGET_GOOS}" 39export GOOS="${TARGET_GOOS}"
39export GOARM="\${GOARM:-${TARGET_GOARM}}" 40export GOARM="\${GOARM:-${TARGET_GOARM}}"
41export GO386="\${GO386:-${TARGET_GO386}}"
40\$here/../../lib/${CROSS_TARGET_SYS_DIR}/go/bin/$1 "\$@" 42\$here/../../lib/${CROSS_TARGET_SYS_DIR}/go/bin/$1 "\$@"
41END 43END
42 chmod +x ${D}${bindir}/$2 44 chmod +x ${D}${bindir}/$2
diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc
index f181dc7..29ae86e 100644
--- a/meta/recipes-devtools/go/go-runtime.inc
+++ b/meta/recipes-devtools/go/go-runtime.inc
@@ -7,6 +7,7 @@ export GOHOSTARCH = "${BUILD_GOARCH}"
7export GOOS = "${TARGET_GOOS}" 7export GOOS = "${TARGET_GOOS}"
8export GOARCH = "${TARGET_GOARCH}" 8export GOARCH = "${TARGET_GOARCH}"
9export GOARM = "${TARGET_GOARM}" 9export GOARM = "${TARGET_GOARM}"
10export GO386 = "${TARGET_GO386}"
10export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" 11export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go"
11export GOROOT_FINAL = "${libdir}/go" 12export GOROOT_FINAL = "${libdir}/go"
12export GO_TARGET_INSTALL = "std" 13export GO_TARGET_INSTALL = "std"
diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc
index b9689c0..cac5d78 100644
--- a/meta/recipes-devtools/go/go-target.inc
+++ b/meta/recipes-devtools/go/go-target.inc
@@ -7,6 +7,7 @@ export GOHOSTARCH = "${BUILD_GOARCH}"
7export GOOS = "${TARGET_GOOS}" 7export GOOS = "${TARGET_GOOS}"
8export GOARCH = "${TARGET_GOARCH}" 8export GOARCH = "${TARGET_GOARCH}"
9export GOARM = "${TARGET_GOARM}" 9export GOARM = "${TARGET_GOARM}"
10export GO386 = "${TARGET_GO386}"
10export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" 11export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go"
11export GOROOT_FINAL = "${libdir}/go" 12export GOROOT_FINAL = "${libdir}/go"
12export CGO_ENABLED = "1" 13export CGO_ENABLED = "1"