libgo: minor Makefile improvements

    Suggested by Ralph Corderoy.

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

From-SVN: r241741

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ace3c2f755095371845901fd673f0e75b1bd67d9..d5240a919411d8877937576d6ad0d78fa98500a5 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-919ef699fe56a9b40c2bd0df07ac1378ce4a7fab
+9ee8ad540d6f2f77af1821bfd977dc1820e1be8f
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index d9f84a009b325e455c8a36b6baacc2dae5d5d17b..0356de8a71ff38d3e227d43ea7053580e40aa093 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -575,8 +575,8 @@ s-runtime_sysinfo: $(srcdir)/mkrsysinfo.sh gen-sysinfo.go
 runtime.inc: s-runtime-inc; @true
 s-runtime-inc: runtime.lo Makefile
        rm -f runtime.inc.tmp2
-       grep -v "#define _" runtime.inc.tmp | grep -v "#define c0 " | grep -v "#define c1 " > runtime.inc.tmp2
-       for pattern in '_G[a-z]' '_P[a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
+       grep -v "#define _" runtime.inc.tmp | grep -v "#define c[01] " > runtime.inc.tmp2
+       for pattern in '_[GP][a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
          grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
        done
        $(SHELL) $(srcdir)/mvifdiff.sh runtime.inc.tmp2 runtime.inc
@@ -591,7 +591,7 @@ s-zstdpkglist: Makefile
        echo 'package main' > zstdpkglist.go.tmp
        echo "" >> zstdpkglist.go.tmp
        echo 'var stdpkg = map[string]bool{' >> zstdpkglist.go.tmp
-       echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's/\.lo /\": true,\n/g' | sed 's/\.lo/\": true,/' | grep -v _c | sed 's/^/\t\"/' | sort | uniq >> zstdpkglist.go.tmp
+       echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's/\.lo /\": true,\n/g' | grep -v _c | sed 's/\.lo/\": true,/' | sed 's/^/\t\"/' | sort -u >> zstdpkglist.go.tmp
        echo '}' >> zstdpkglist.go.tmp
        $(SHELL) $(srcdir)/mvifdiff.sh zstdpkglist.go.tmp zstdpkglist.go
        $(STAMP) $@

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index ff5d9ff107b1ad5a9ea0c1df5b66749db12337d9..140cfdf2aebcf6847eb33956f51244cf6f0e8811 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -3247,8 +3247,8 @@ s-runtime_sysinfo: $(srcdir)/mkrsysinfo.sh gen-sysinfo.go
 runtime.inc: s-runtime-inc; @true
 s-runtime-inc: runtime.lo Makefile
        rm -f runtime.inc.tmp2
-       grep -v "#define _" runtime.inc.tmp | grep -v "#define c0 " | grep -v "#define c1 " > runtime.inc.tmp2
-       for pattern in '_G[a-z]' '_P[a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
+       grep -v "#define _" runtime.inc.tmp | grep -v "#define c[01] " > runtime.inc.tmp2
+       for pattern in '_[GP][a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
          grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
        done
        $(SHELL) $(srcdir)/mvifdiff.sh runtime.inc.tmp2 runtime.inc
@@ -3261,7 +3261,7 @@ s-zstdpkglist: Makefile
        echo 'package main' > zstdpkglist.go.tmp
        echo "" >> zstdpkglist.go.tmp
        echo 'var stdpkg = map[string]bool{' >> zstdpkglist.go.tmp
-       echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's/\.lo /\": true,\n/g' | sed 's/\.lo/\": true,/' | grep -v _c | sed 's/^/\t\"/' | sort | uniq >> zstdpkglist.go.tmp
+       echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's/\.lo /\": true,\n/g' | grep -v _c | sed 's/\.lo/\": true,/' | sed 's/^/\t\"/' | sort -u >> zstdpkglist.go.tmp
        echo '}' >> zstdpkglist.go.tmp
        $(SHELL) $(srcdir)/mvifdiff.sh zstdpkglist.go.tmp zstdpkglist.go
        $(STAMP) $@