[oe-commits] [openembedded-core] 39/50: go: Remove mips32r2 from march to get cgo working

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 69aa554d1ff582a76e4478b654b9367ba3e4561d
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Thu Sep 21 10:42:16 2017 -0700

    go: Remove mips32r2 from march to get cgo working
    
    on mips, cgo used mips32r1 and that conflicts with mips32r2
    lets remove it for now and work go upstream to make it work
    for golang as well
    
    Fixes
    | # runtime/cgo
    | cc1: error: '-mips32r2' conflicts with the other architecture options, which specify a mips32 processor
    
    Fixes [YOCTO #12108]
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/go/go-common.inc | 4 ++++
 meta/recipes-devtools/go/go_1.9.bb     | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/go/go-common.inc b/meta/recipes-devtools/go/go-common.inc
index ce1eb86..41f661b 100644
--- a/meta/recipes-devtools/go/go-common.inc
+++ b/meta/recipes-devtools/go/go-common.inc
@@ -20,3 +20,7 @@ B = "${S}"
 
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 SSTATE_SCAN_CMD = "true"
+
+TUNE_CCARGS_remove = "-march=mips32r2"
+SECURITY_CFLAGS = "${SECURITY_NOPIE_CFLAGS}"
+SECURITY_LDFLAGS = ""
diff --git a/meta/recipes-devtools/go/go_1.9.bb b/meta/recipes-devtools/go/go_1.9.bb
index 08ab793..c67e2cb 100644
--- a/meta/recipes-devtools/go/go_1.9.bb
+++ b/meta/recipes-devtools/go/go_1.9.bb
@@ -1,4 +1,2 @@
 require go-${PV}.inc
 require go-target.inc
-TUNE_CCARGS_remove = "-march=mips32r2"
-SECURITY_PIE_CFLAGS_remove = "-fPIE -pie"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.