From c3402486afa8b6f98d6b0cc05cd229526bc7611f Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 4 Mar 2022 10:18:00 -0800 Subject: 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 --- gcc/go/gofrontend/MERGE | 2 +- libgo/mkruntimeinc.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 7778cd9..e68d2d9 100644 --- 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 61d830a..5ef3eca 100755 --- 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; -- cgit v1.1