From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 6 Mar 2019 14:19:56 +0000 (+0000)
Subject:     mksysinfo: actually use modified Statfs_t value
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad0ce1a5e76e19a5222cb0a529a245d8a7991114;p=thirdparty%2Fgcc.git

mksysinfo: actually use modified Statfs_t value

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@269424 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 487548a3b934..a93dedb7aaf4 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9b1374ded3d5e352a655d96bfe1bfb6aa1491a98
+13c98c3477647888fc7a186e9055793b0961e806
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index e0ae30f6ba2d..418ba2cfdef0 100755
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -1115,14 +1115,13 @@ grep '^const _FALLOC_' gen-sysinfo.go |
 # Prefer largefile variant if available.
 # CentOS 5 does not have f_flags, so pull from f_spare.
 statfs=`grep '^type _statfs64 ' gen-sysinfo.go || true`
+if test "$statfs" == ""; then
+  statfs=`grep '^type _statfs ' gen-sysinfo.go || true`
+fi
 if ! echo "$statfs" | grep f_flags; then
   statfs=`echo "$statfs" | sed -e 's/f_spare \[4+1\]\([^ ;]*\)/f_flags \1; f_spare [3+1]\1/'`
 fi
-if test "$statfs" != ""; then
-  grep '^type _statfs64 ' gen-sysinfo.go
-else
-  grep '^type _statfs ' gen-sysinfo.go
-fi | sed -e 's/type _statfs64/type Statfs_t/' \
+echo "$statfs" | sed -e 's/type _statfs64/type Statfs_t/' \
 	 -e 's/type _statfs/type Statfs_t/' \
 	 -e 's/f_type/Type/' \
 	 -e 's/f_bsize/Bsize/' \