libgo: add runtime/pprof/internal/profile.gox to noinst_DATA

    Also add noinst_DATA to CHECK_DEPS; it's not needed in practice since
    `make` will build noinst_DATA, but it's logically required and will
    make a difference if any of the noinst_DATA sources change between
    `make` and `make check`.

    Tony Reix figured out why omitting packages from noinst_DATA didn't
    seem to matter: because if gccgo can't find foo.gox, it will fall back
    to reading the export data in foo.o, and foo.o will exist because
    these packages go into libgo.a.

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

From-SVN: r258606

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 6e4c73b161dc954993de23ce76e89ef7ae64260a..5efedb7fc5bea9e09a1786a550a1bdfc12b0b7b2 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-e4464efc767b8dee4f4c18ffaf6c891f7b9deee7
+e9c0e4d8fd3d951a367bb6a50e5cb546e01b81a8
 
 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 8f7acfe66fefcfbe8e3d2569973899b373fc611d..7558aab8b9360d5a7479c718e61adcb9a023fd4f 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -399,7 +399,8 @@ noinst_DATA = \
        internal/testenv.gox \
        internal/trace.gox \
        net/internal/socktest.gox \
-       os/signal/internal/pty.gox
+       os/signal/internal/pty.gox \
+       runtime/pprof/internal/profile.gox
 
 if LIBGO_IS_RTEMS
 rtems_task_variable_add_file = runtime/rtems-task-variable-add.c
@@ -1094,6 +1095,7 @@ CHECK_DEPS = \
        $(toolexeclibgotext_DATA) \
        $(toolexeclibgotexttemplate_DATA) \
        $(toolexeclibgounicode_DATA) \
+       $(noinst_DATA) \
        $(noinst_LIBRARIES)
 
 if GOC_IS_LLGO

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 70269c7085fad6809e078143c0698ecc2d3aa4cb..80c0b894053343fd1d75fb0a24fa32c05f4f6879 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -758,7 +758,8 @@ toolexeclibgounicode_DATA = \
 noinst_DATA = golang_org/x/net/internal/nettest.gox \
        golang_org/x/net/nettest.gox internal/testenv.gox \
        internal/trace.gox net/internal/socktest.gox \
-       os/signal/internal/pty.gox zstdpkglist.go zdefaultcc.go
+       os/signal/internal/pty.gox runtime/pprof/internal/profile.gox \
+       zstdpkglist.go zdefaultcc.go
 @LIBGO_IS_RTEMS_FALSE@rtems_task_variable_add_file = 
 @LIBGO_IS_RTEMS_TRUE@rtems_task_variable_add_file = runtime/rtems-task-variable-add.c
 @LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-none.c
@@ -1170,7 +1171,8 @@ CHECK_DEPS = $(toolexeclibgo_DATA) $(toolexeclibgoarchive_DATA) \
        $(toolexeclibgoruntime_DATA) $(toolexeclibgosync_DATA) \
        $(toolexeclibgotesting_DATA) $(toolexeclibgotext_DATA) \
        $(toolexeclibgotexttemplate_DATA) $(toolexeclibgounicode_DATA) \
-       $(noinst_LIBRARIES) $(am__append_3) $(am__append_4)
+       $(noinst_DATA) $(noinst_LIBRARIES) $(am__append_3) \
+       $(am__append_4)
 
 # Pass -ffp-contract=off, or 386-specific options, when building the
 # math package.  MATH_FLAG is defined in configure.ac.