public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-7493] mkruntimeinc: skip _FILE
@ 2022-03-04 18:47 Ian Lance Taylor
0 siblings, 0 replies; only message in thread
From: Ian Lance Taylor @ 2022-03-04 18:47 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:c3402486afa8b6f98d6b0cc05cd229526bc7611f
commit r12-7493-gc3402486afa8b6f98d6b0cc05cd229526bc7611f
Author: Ian Lance Taylor <iant@golang.org>
Date: Fri Mar 4 10:18:00 2022 -0800
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:
---
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 7778cd91235..e68d2d967cc 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 61d830af876..5ef3eca25cc 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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-03-04 18:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-04 18:47 [gcc r12-7493] mkruntimeinc: skip _FILE Ian Lance Taylor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).