diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-19 04:52:12 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-19 04:52:12 +0000 |
| commit | ddc606cef767f479a4ad8b1d05fd1049a755d06a (patch) | |
| tree | 4de34c3a39bbf4e725b5c372faa085641efbed69 | |
| parent | 674dddfe2db0280637f2f71211f9fd2018f555e8 (diff) | |
| download | gcc-ddc606cef767f479a4ad8b1d05fd1049a755d06a.zip gcc-ddc606cef767f479a4ad8b1d05fd1049a755d06a.tar.gz gcc-ddc606cef767f479a4ad8b1d05fd1049a755d06a.tar.bz2 | |
mksysinfo: force Passwd.Pw_[ug]id from int32 to uint32
Solaris 10 uses int32 for the Pw_uid and Pw_gid fields of Passwd,
but most systems, including Solaris 11, use uint32. Force uint32
for consistency and to fix the build.
Reviewed-on: https://go-review.googlesource.com/88195
From-SVN: r256875
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rwxr-xr-x | libgo/mksysinfo.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index be2cc54..9cc8188 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -8195b62d353026256037fa44409c4ad95762e6b7 +bce8720d4eb662f31026e9c7be6ce4d0aeb4ae3b 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 35ce141..a384e40 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -685,9 +685,13 @@ if ! grep "const EAI_OVERFLOW " ${OUT} >/dev/null 2>&1; then fi # The passwd struct. +# Force uid and gid from int32 to uint32 for consistency; they are +# int32 on Solaris 10 but uint32 everywhere else including Solaris 11. grep '^type _passwd ' gen-sysinfo.go | \ sed -e 's/_passwd/Passwd/' \ -e 's/ pw_/ Pw_/g' \ + -e 's/ Pw_uid int32/ Pw_uid uint32/' \ + -e 's/ Pw_gid int32/ Pw_gid uint32/' \ >> ${OUT} # The group struct. |