From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 14 Sep 2018 19:42:01 +0000 (+0000)
Subject:     cmd/go: correct gccgo buildid file on ARM
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1baae308bbdce53479c0df1d464930d7c09757b;p=thirdparty%2Fgcc.git

cmd/go: correct gccgo buildid file on ARM

    Bring in https://golang.org/cl/135297 from the gc repository to fix a
    GCC bug report.

    Original CL description:

        The GNU assembler for ARM treats @ as a comment character, so section
        types must be written using % instead.

        Fixes https://gcc.gnu.org/PR87260.

    Reviewed-on: https://go-review.googlesource.com/135360


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@264330 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d801077bf0cc..3af5bd412675 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-3fd61802286c81e5fb672f682d9e661181184d1f
+92a14213215fd93df7240fa9d376a1213b1d5a74
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/cmd/go/internal/work/buildid.go b/libgo/go/cmd/go/internal/work/buildid.go
index 733938e0adeb..c7c07ed01869 100644
--- a/libgo/go/cmd/go/internal/work/buildid.go
+++ b/libgo/go/cmd/go/internal/work/buildid.go
@@ -337,8 +337,12 @@ func (b *Builder) gccgoBuildIDELFFile(a *Action) (string, error) {
 	}
 	fmt.Fprintf(&buf, "\n")
 	if cfg.Goos != "solaris" {
-		fmt.Fprintf(&buf, "\t"+`.section .note.GNU-stack,"",@progbits`+"\n")
-		fmt.Fprintf(&buf, "\t"+`.section .note.GNU-split-stack,"",@progbits`+"\n")
+		secType := "@progbits"
+		if cfg.Goarch == "arm" {
+			secType = "%progbits"
+		}
+		fmt.Fprintf(&buf, "\t"+`.section .note.GNU-stack,"",%s`+"\n", secType)
+		fmt.Fprintf(&buf, "\t"+`.section .note.GNU-split-stack,"",%s`+"\n", secType)
 	}
 
 	if cfg.BuildN || cfg.BuildX {