libgo: rebuild runtime.inc if mkruntimeinc.sh changes

    The Makefile was missing a dependency.

    Also remove runtime.inc.raw in mostlyclean.

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/191958

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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 4f08f2320d8a059699ad74eaacc80b443b716ac5..18127de31ac3e9d2a3cbef2af64081401ad74ffe 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-58c0fc64d91edc53ef9828b85cf3dc86aeb94e12
+a6ddd0e1208a7d229c10be630c1110b3914038f5
 
 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 88f885b6675127614a67df8312d79619d803dde0..9348af948635b55068004591245206d3401685e6 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -612,7 +612,7 @@ s-zdefaultcc: Makefile
 # compiling runtime) to prune out certain types that should not be
 # exported back to C. See comments in mkruntimeinc.sh for more details.
 runtime.inc: s-runtime-inc; @true
-s-runtime-inc: runtime.lo Makefile
+s-runtime-inc: runtime.lo mkruntimeinc.sh Makefile
        $(SHELL) $(srcdir)/mkruntimeinc.sh
        $(SHELL) $(srcdir)/mvifdiff.sh tmp-runtime.inc runtime.inc
        $(STAMP) $@
@@ -1205,7 +1205,8 @@ MOSTLYCLEANFILES = \
        s-libcalls s-libcalls-list s-syscall_arch s-gen-sysinfo s-sysinfo \
        s-errno s-epoll \
        libgo.head libgo.sum.sep libgo.log.sep libgo.var \
-       libcalls-list runtime.inc runtime.inc.tmp2 runtime.inc.tmp3
+       libcalls-list \
+       runtime.inc runtime.inc.tmp2 runtime.inc.tmp3 runtime.inc.raw
 
 mostlyclean-local:
        find . -name '*.lo' -print | xargs $(LIBTOOL) --mode=clean rm -f

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index f53ca3f4b12810cf1aa46eefc1f24d8e802067e0..153bc95530e01ee0309836ef7874f7e5d173ef3c 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1156,7 +1156,8 @@ MOSTLYCLEANFILES = \
        s-libcalls s-libcalls-list s-syscall_arch s-gen-sysinfo s-sysinfo \
        s-errno s-epoll \
        libgo.head libgo.sum.sep libgo.log.sep libgo.var \
-       libcalls-list runtime.inc runtime.inc.tmp2 runtime.inc.tmp3
+       libcalls-list \
+       runtime.inc runtime.inc.tmp2 runtime.inc.tmp3 runtime.inc.raw
 
 CLEANFILES = *.go *.c s-* libgo.sum libgo.log runtime.inc
 MULTISRCTOP = 
@@ -2728,7 +2729,7 @@ s-zdefaultcc: Makefile
 # compiling runtime) to prune out certain types that should not be
 # exported back to C. See comments in mkruntimeinc.sh for more details.
 runtime.inc: s-runtime-inc; @true
-s-runtime-inc: runtime.lo Makefile
+s-runtime-inc: runtime.lo mkruntimeinc.sh Makefile
        $(SHELL) $(srcdir)/mkruntimeinc.sh
        $(SHELL) $(srcdir)/mvifdiff.sh tmp-runtime.inc runtime.inc
        $(STAMP) $@