mkruntimeinc: skip _FILE

We don't need it, and it breaks uclibc.

	PR go/101246

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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 7778cd912353b428bf0141370b75c92ff22a943a..e68d2d967ccdded81b54896d891f8c5b4978a4f7 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-943b95876ca0f14c3cea7067d33170ba76cf0fab
+787fd4475f9d9101bc138d0b9763b0f5ecca89a9
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/mkruntimeinc.sh b/libgo/mkruntimeinc.sh
index 61d830af876edcd2c8cd15ba1ccdc1ebfc6a3b95..5ef3eca25cc6121afeec01b7eb756a49146bcef8 100755 (executable)
--- a/libgo/mkruntimeinc.sh
+++ b/libgo/mkruntimeinc.sh
@@ -18,13 +18,14 @@ rm -f runtime.inc.tmp2 runtime.inc.tmp3
 # sigset conflicts with system type sigset on AIX, so we need to rename it.
 # boundsError has a field name that is a C keyword, and we don't need it.
 # mSpanInuse is both a constant and a field name, and we don't need it.
+# _FILE has incomplete __lock and __state fields on uclibc-ng.
 
 grep -v "#define _" ${IN} | grep -v "#define [cm][012345] " | grep -v "#define empty " | grep -v "#define \\$" | grep -v "#define mSpanInUse " > runtime.inc.tmp2
 for pattern in '_[GP][a-z]' _Max _Lock _Sig _Trace _MHeap _Num
 do
   grep "#define $pattern" ${IN} >> runtime.inc.tmp2
 done
-TYPES="_Complex_lock _Reader_lock semt boundsError"
+TYPES="_Complex_lock _Reader_lock semt boundsError _FILE"
 for TYPE in $TYPES
 do
   sed -e '/struct '${TYPE}' {/,/^}/s/^.*$//' runtime.inc.tmp2 > runtime.inc.tmp3;