diff options
| author | Paul Barker <pbarker@toganlabs.com> | 2017-10-13 19:25:29 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-10-16 23:52:44 +0100 |
| commit | 001f8ee0adf703f0a9f90ae9e8f3674935a18c2c (patch) | |
| tree | 4f94eb05e0fdc0b5c4d68fa1a35a275aec1cf6ed | |
| parent | 68e77cfb8ac40926eb09f982cc835a0378ad029a (diff) | |
| download | poky-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>
| -rw-r--r-- | meta/recipes-devtools/go/go-cross-canadian.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-cross.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-runtime.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-target.inc | 1 |
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 f3ab7351db..8afda6b2ce 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\` | |||
| 41 | export GOARCH="${TARGET_GOARCH}" | 41 | export GOARCH="${TARGET_GOARCH}" |
| 42 | export GOOS="${TARGET_GOOS}" | 42 | export GOOS="${TARGET_GOOS}" |
| 43 | test -n "\$GOARM" || export GOARM="${TARGET_GOARM}" | 43 | test -n "\$GOARM" || export GOARM="${TARGET_GOARM}" |
| 44 | test -n "\$GO386" || export GO386="${TARGET_GO386}" | ||
| 44 | export GOTOOLDIR="\$native_goroot/pkg/tool/${HOST_GOTUPLE}" | 45 | export GOTOOLDIR="\$native_goroot/pkg/tool/${HOST_GOTUPLE}" |
| 45 | test -n "\$GOROOT" || export GOROOT="\$OECORE_TARGET_SYSROOT/${target_libdir}/go" | 46 | test -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 dac0dfd137..3ac7211bc3 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}" | |||
| 10 | export GOOS = "${TARGET_GOOS}" | 10 | export GOOS = "${TARGET_GOOS}" |
| 11 | export GOARCH = "${TARGET_GOARCH}" | 11 | export GOARCH = "${TARGET_GOARCH}" |
| 12 | export GOARM = "${TARGET_GOARM}" | 12 | export GOARM = "${TARGET_GOARM}" |
| 13 | export GO386 = "${TARGET_GO386}" | ||
| 13 | export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" | 14 | export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" |
| 14 | export GOROOT_FINAL = "${libdir}/go" | 15 | export GOROOT_FINAL = "${libdir}/go" |
| 15 | export CGO_ENABLED = "1" | 16 | export CGO_ENABLED = "1" |
| @@ -37,6 +38,7 @@ here=\`dirname \$0\` | |||
| 37 | export GOARCH="${TARGET_GOARCH}" | 38 | export GOARCH="${TARGET_GOARCH}" |
| 38 | export GOOS="${TARGET_GOOS}" | 39 | export GOOS="${TARGET_GOOS}" |
| 39 | export GOARM="\${GOARM:-${TARGET_GOARM}}" | 40 | export GOARM="\${GOARM:-${TARGET_GOARM}}" |
| 41 | export GO386="\${GO386:-${TARGET_GO386}}" | ||
| 40 | \$here/../../lib/${CROSS_TARGET_SYS_DIR}/go/bin/$1 "\$@" | 42 | \$here/../../lib/${CROSS_TARGET_SYS_DIR}/go/bin/$1 "\$@" |
| 41 | END | 43 | END |
| 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 f181dc7a29..29ae86e4ee 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}" | |||
| 7 | export GOOS = "${TARGET_GOOS}" | 7 | export GOOS = "${TARGET_GOOS}" |
| 8 | export GOARCH = "${TARGET_GOARCH}" | 8 | export GOARCH = "${TARGET_GOARCH}" |
| 9 | export GOARM = "${TARGET_GOARM}" | 9 | export GOARM = "${TARGET_GOARM}" |
| 10 | export GO386 = "${TARGET_GO386}" | ||
| 10 | export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" | 11 | export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" |
| 11 | export GOROOT_FINAL = "${libdir}/go" | 12 | export GOROOT_FINAL = "${libdir}/go" |
| 12 | export GO_TARGET_INSTALL = "std" | 13 | export GO_TARGET_INSTALL = "std" |
diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index b9689c03c4..cac5d78227 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}" | |||
| 7 | export GOOS = "${TARGET_GOOS}" | 7 | export GOOS = "${TARGET_GOOS}" |
| 8 | export GOARCH = "${TARGET_GOARCH}" | 8 | export GOARCH = "${TARGET_GOARCH}" |
| 9 | export GOARM = "${TARGET_GOARM}" | 9 | export GOARM = "${TARGET_GOARM}" |
| 10 | export GO386 = "${TARGET_GO386}" | ||
| 10 | export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" | 11 | export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" |
| 11 | export GOROOT_FINAL = "${libdir}/go" | 12 | export GOROOT_FINAL = "${libdir}/go" |
| 12 | export CGO_ENABLED = "1" | 13 | export CGO_ENABLED = "1" |
