diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-03-06 14:19:56 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-03-06 14:19:56 +0000 |
| commit | 0e1a6d27009cf81ff7114f8ca4b8c71f122774b4 (patch) | |
| tree | cbdae07073c8d25b7614ba96bc42c686f292e745 | |
| parent | f29a1ef2d8efb9423b878c9d5da1961527fce707 (diff) | |
| download | gcc-0e1a6d27009cf81ff7114f8ca4b8c71f122774b4.zip gcc-0e1a6d27009cf81ff7114f8ca4b8c71f122774b4.tar.gz gcc-0e1a6d27009cf81ff7114f8ca4b8c71f122774b4.tar.bz2 | |
mksysinfo: actually use modified Statfs_t value
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/165737
From-SVN: r269424
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rwxr-xr-x | libgo/mksysinfo.sh | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 487548a..a93dedb 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 e0ae30f..418ba2c 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/' \ |