diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-12 00:15:34 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-12 00:15:34 +0000 |
| commit | 42ee82045d2430c2b1a10d8cf07ab6052302cf14 (patch) | |
| tree | 61378dae3f5ff4aab43c605f2ca636cfe5524e3b | |
| parent | 0df9962aa8165580b1c61de81429ab6d3cde0b58 (diff) | |
| download | gcc-42ee82045d2430c2b1a10d8cf07ab6052302cf14.zip gcc-42ee82045d2430c2b1a10d8cf07ab6052302cf14.tar.gz gcc-42ee82045d2430c2b1a10d8cf07ab6052302cf14.tar.bz2 | |
mksysinfo: remove incorrect quotes in st_fsid handling for Hurd
Also stop converting st_dev on Hurd; it shouldn't appear, but if it
somehow does we don't want to convert it.
Reviewed-on: https://go-review.googlesource.com/c/161961
From-SVN: r268785
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rwxr-xr-x | libgo/mksysinfo.sh | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 398a851..1339d9f 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -9b66264ed6adcf3fd215dbfd125c12b022b7280e +fc8aa5a46433d6ecba9fd1cd0bee4290c314ca06 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 6a58e76..1273d9b 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -486,9 +486,9 @@ grep '^type _st_timespec ' gen-sysinfo.go | \ # Special treatment of struct stat st_dev for GNU/Hurd # /usr/include/i386-gnu/bits/stat.h: #define st_dev st_fsid -fsid_to_dev= +st_dev='-e s/st_dev/Dev/' if grep 'define st_dev st_fsid' gen-sysinfo.go > /dev/null 2>&1; then - fsid_to_dev="-e 's/st_fsid/Dev/'" + st_dev='-e s/st_fsid/Dev/' fi # The stat type. @@ -500,8 +500,7 @@ else grep '^type _stat ' gen-sysinfo.go fi | sed -e 's/type _stat64/type Stat_t/' \ -e 's/type _stat/type Stat_t/' \ - -e 's/st_dev/Dev/' \ - ${fsid_to_dev} \ + ${st_dev} \ -e 's/st_ino/Ino/g' \ -e 's/st_nlink/Nlink/' \ -e 's/st_mode/Mode/' \ |