IRIX 6.5 bootstrap is broken
Jason Merrill
jason@cygnus.com
Thu Jan 13 16:26:00 GMT 2000
Does this fix the problem for you?
Index: fixincludes
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixincludes,v
retrieving revision 1.24
diff -c -p -r1.24 fixincludes
*** fixincludes 1999/10/15 06:00:29 1.24
--- fixincludes 2000/01/13 23:51:18
*************** if [ -r ${LIB}/$file ]; then
*** 1798,1811 ****
# Use __gnuc_va_list in arg types in place of va_list.
# On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the
# trailing parentheses and semicolon save all other systems from this.
! # Define __va_list__ (something harmless and unused) instead of va_list.
# Don't claim to have defined va_list.
sed -e 's@ va_list @ __gnuc_va_list @' \
-e 's@ va_list)@ __gnuc_va_list)@' \
-e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
! -e 's@ va_list@ __va_list__@' \
! -e 's@\*va_list@*__va_list__@' \
-e 's@ __va_list)@ __gnuc_va_list)@' \
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
--- 1798,1811 ----
# Use __gnuc_va_list in arg types in place of va_list.
# On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the
# trailing parentheses and semicolon save all other systems from this.
! # Define __not_va_list__ (something harmless and unused) instead of va_list.
# Don't claim to have defined va_list.
sed -e 's@ va_list @ __gnuc_va_list @' \
-e 's@ va_list)@ __gnuc_va_list)@' \
-e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
! -e 's@ va_list@ __not_va_list__@' \
! -e 's@\*va_list@*__not_va_list__@' \
-e 's@ __va_list)@ __gnuc_va_list)@' \
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
Index: fixinc/fixinc.irix
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixinc/fixinc.irix,v
retrieving revision 1.6
diff -c -p -r1.6 fixinc.irix
*** fixinc/fixinc.irix 1999/09/28 01:11:08 1.6
--- fixinc/fixinc.irix 2000/01/13 23:51:18
*************** if [ \! -z "$file_to_fix" ]; then
*** 255,262 ****
-e 's@ va_list)@ __gnuc_va_list)@' \
-e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
! -e 's@ va_list@ __va_list__@' \
! -e 's@\*va_list@*__va_list__@' \
-e 's@ __va_list)@ __gnuc_va_list)@' \
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
--- 255,262 ----
-e 's@ va_list)@ __gnuc_va_list)@' \
-e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
! -e 's@ va_list@ __not_va_list__@' \
! -e 's@\*va_list@*__not_va_list__@' \
-e 's@ __va_list)@ __gnuc_va_list)@' \
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
Index: fixinc/fixinc.ptx
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixinc/fixinc.ptx,v
retrieving revision 1.4
diff -c -p -r1.4 fixinc.ptx
*** fixinc/fixinc.ptx 1999/03/12 07:42:07 1.4
--- fixinc/fixinc.ptx 2000/01/13 23:51:18
*************** if [ -r ${LIB}/$file ]; then
*** 96,108 ****
# Use __gnuc_va_list in arg types in place of va_list.
# On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the
# trailing parentheses and semicolon save all other systems from this.
! # Define __va_list__ (something harmless and unused) instead of va_list.
# Don't claim to have defined va_list.
sed -e 's@ va_list @ __gnuc_va_list @' \
-e 's@ va_list)@ __gnuc_va_list)@' \
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
! -e 's@ va_list@ __va_list__@' \
! -e 's@\*va_list@*__va_list__@' \
-e 's@ __va_list)@ __gnuc_va_list)@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
-e 's@VA_LIST@DUMMY_VA_LIST@' \
--- 96,108 ----
# Use __gnuc_va_list in arg types in place of va_list.
# On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the
# trailing parentheses and semicolon save all other systems from this.
! # Define __not_va_list__ (something harmless and unused) instead of va_list.
# Don't claim to have defined va_list.
sed -e 's@ va_list @ __gnuc_va_list @' \
-e 's@ va_list)@ __gnuc_va_list)@' \
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
! -e 's@ va_list@ __not_va_list__@' \
! -e 's@\*va_list@*__not_va_list__@' \
-e 's@ __va_list)@ __gnuc_va_list)@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
-e 's@VA_LIST@DUMMY_VA_LIST@' \
Index: fixinc/inclhack.def
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixinc/inclhack.def,v
retrieving revision 1.43
diff -c -p -r1.43 inclhack.def
*** fixinc/inclhack.def 1999/11/29 14:33:50 1.43
--- fixinc/inclhack.def 2000/01/13 23:51:18
*************** fix = {
*** 1713,1719 ****
* Use __gnuc_va_list in arg types in place of va_list.
* On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the
* trailing parentheses and semicolon save all other systems from this.
! * Define __va_list__ (something harmless and unused) instead of va_list.
* Don't claim to have defined va_list.
*/
shell =
--- 1713,1719 ----
* Use __gnuc_va_list in arg types in place of va_list.
* On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the
* trailing parentheses and semicolon save all other systems from this.
! * Define __not_va_list__ (something harmless and unused) instead of va_list.
* Don't claim to have defined va_list.
*/
shell =
*************** fix = {
*** 1728,1735 ****
-e 's@ va_list)@ __gnuc_va_list)@' \\
-e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \\
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\
! -e 's@ va_list@ __va_list__@' \\
! -e 's@\\*va_list@*__va_list__@' \\
-e 's@ __va_list)@ __gnuc_va_list)@' \\
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\
--- 1728,1735 ----
-e 's@ va_list)@ __gnuc_va_list)@' \\
-e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \\
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\
! -e 's@ va_list@ __not_va_list__@' \\
! -e 's@\\*va_list@*__not_va_list__@' \\
-e 's@ __va_list)@ __gnuc_va_list)@' \\
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\
Index: fixinc/inclhack.sh
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixinc/inclhack.sh,v
retrieving revision 1.49
diff -c -p -r1.49 inclhack.sh
*** fixinc/inclhack.sh 1999/11/29 14:35:50 1.49
--- fixinc/inclhack.sh 2000/01/13 23:51:18
*************** fixinc/inclhack.sh regmatch_t;
*** 2404,2411 ****
-e 's@ va_list)@ __gnuc_va_list)@' \
-e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
! -e 's@ va_list@ __va_list__@' \
! -e 's@\*va_list@*__va_list__@' \
-e 's@ __va_list)@ __gnuc_va_list)@' \
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
--- 2404,2411 ----
-e 's@ va_list)@ __gnuc_va_list)@' \
-e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \
-e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
! -e 's@ va_list@ __not_va_list__@' \
! -e 's@\*va_list@*__not_va_list__@' \
-e 's@ __va_list)@ __gnuc_va_list)@' \
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
More information about the Gcc-bugs
mailing list