git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mksysinfo: backport patches from trunk 

Backports the following changes from trunk:
    https://golang.org/cl/17893
    https://golang.org/cl/16588
    https://golang.org/cl/16580
    https://golang.org/cl/16534
    https://golang.org/cl/14858

The patch was put together by Lynn Boger.

From-SVN: r232849
This commit is contained in:
Ian Lance Taylor 2016-01-26 21:43:49 +00:00
parent 3def2f0042
commit 8243ae892c
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libgo/mksysinfo.sh
View File

@ -183,6 +183,12 @@ enum {
#ifdef TIOCSCTTY #ifdef TIOCSCTTY
TIOCSCTTY_val = TIOCSCTTY, TIOCSCTTY_val = TIOCSCTTY,
#endif #endif
#ifdef TIOCGPGRP
TIOCGPGRP_val = TIOCGPGRP,
#endif
#ifdef TIOCSPGRP
TIOCSPGRP_val = TIOCSPGRP,
#endif
#ifdef TIOCGPTN #ifdef TIOCGPTN
TIOCGPTN_val = TIOCGPTN, TIOCGPTN_val = TIOCGPTN,
#endif #endif
@ -534,7 +540,7 @@ upcase_fields () {
# GNU/Linux specific; it should do no harm if there is no # GNU/Linux specific; it should do no harm if there is no
# _user_regs_struct. # _user_regs_struct.
regs=`grep '^type _user_regs_struct struct' gen-sysinfo.go || true` regs=`grep '^type _user_regs_struct struct' gen-sysinfo.go || true`
if test "$regs" == ""; then if test "$regs" = ""; then
# s390 # s390
regs=`grep '^type __user_regs_struct struct' gen-sysinfo.go || true` regs=`grep '^type __user_regs_struct struct' gen-sysinfo.go || true`
if test "$regs" != ""; then if test "$regs" != ""; then
@ -878,11 +884,13 @@ grep '^type _addrinfo ' gen-sysinfo.go | \
-e 's/ ai_/ Ai_/g' \ -e 's/ ai_/ Ai_/g' \
>> ${OUT} >> ${OUT}
# The addrinfo flags and errors. # The addrinfo and nameinfo flags and errors.
grep '^const _AI_' gen-sysinfo.go | \ grep '^const _AI_' gen-sysinfo.go | \
sed -e 's/^\(const \)_\(AI_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} sed -e 's/^\(const \)_\(AI_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
grep '^const _EAI_' gen-sysinfo.go | \ grep '^const _EAI_' gen-sysinfo.go | \
sed -e 's/^\(const \)_\(EAI_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} sed -e 's/^\(const \)_\(EAI_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
grep '^const _NI_' gen-sysinfo.go | \
sed -e 's/^\(const \)_\(NI_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
# The passwd struct. # The passwd struct.
grep '^type _passwd ' gen-sysinfo.go | \ grep '^type _passwd ' gen-sysinfo.go | \
@ -918,6 +926,16 @@ if ! grep '^const TIOCSCTTY' ${OUT} >/dev/null 2>&1; then
echo 'const TIOCSCTTY = _TIOCSCTTY_val' >> ${OUT} echo 'const TIOCSCTTY = _TIOCSCTTY_val' >> ${OUT}
fi fi
fi fi
if ! grep '^const TIOCGPGRP' ${OUT} >/dev/null 2>&1; then
if grep '^const _TIOCGPGRP_val' ${OUT} >/dev/null 2>&1; then
echo 'const TIOCGPGRP = _TIOCGPGRP_val' >> ${OUT}
fi
fi
if ! grep '^const TIOCSPGRP' ${OUT} >/dev/null 2>&1; then
if grep '^const _TIOCSPGRP_val' ${OUT} >/dev/null 2>&1; then
echo 'const TIOCSPGRP = _TIOCSPGRP_val' >> ${OUT}
fi
fi
if ! grep '^const TIOCGPTN' ${OUT} >/dev/null 2>&1; then if ! grep '^const TIOCGPTN' ${OUT} >/dev/null 2>&1; then
if grep '^const _TIOCGPTN_val' ${OUT} >/dev/null 2>&1; then if grep '^const _TIOCGPTN_val' ${OUT} >/dev/null 2>&1; then
echo 'const TIOCGPTN = _TIOCGPTN_val' >> ${OUT} echo 'const TIOCGPTN = _TIOCGPTN_val' >> ${OUT}
@ -1433,6 +1451,11 @@ grep '^type _inotify_event ' gen-sysinfo.go | \
# The GNU/Linux CLONE flags. # The GNU/Linux CLONE flags.
grep '^const _CLONE_' gen-sysinfo.go | \ grep '^const _CLONE_' gen-sysinfo.go | \
sed -e 's/^\(const \)_\(CLONE_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} sed -e 's/^\(const \)_\(CLONE_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
# We need some CLONE constants that are not defined in older versions
# of glibc.
if ! grep '^const CLONE_NEWUSER ' ${OUT} > /dev/null 2>&1; then
echo "const CLONE_NEWUSER = 0x10000000" >> ${OUT}
fi
# Struct sizes. # Struct sizes.
set cmsghdr Cmsghdr ip_mreq IPMreq ip_mreqn IPMreqn ipv6_mreq IPv6Mreq \ set cmsghdr Cmsghdr ip_mreq IPMreq ip_mreqn IPMreqn ipv6_mreq IPv6Mreq \