This libgo patch adds internal/trace to noinst_DATA.  The
internal/trace package is only imported by tests (specifically the
tests in runtime/trace) so it must be in noinst_DATA to ensure that it
is built before running the tests.  This was mostly working because
internal/trace has tests itself, and is listed in check-packages.txt
before runtime/trace, so typical invocations of make would build
internal/trace for checking purposes before checking runtime/trace.
But we need this change to make that reliable.  Bootstrapped on
x86_64-pc-linux-gnu.  Committed to mainline.

Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE     (revision 258337)
+++ gcc/go/gofrontend/MERGE     (working copy)
@@ -1,4 +1,4 @@
-112623c89ee42b42bc748f12d9c704615634501b
+ce28919112dbb234366816ab39ce060ad45e8ca9
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: libgo/Makefile.am
===================================================================
--- libgo/Makefile.am   (revision 257914)
+++ libgo/Makefile.am   (working copy)
@@ -397,6 +397,7 @@ 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
 

Reply via email to