Patchwork Go patch committed: Update libgo to Go release r60

login
register
mail settings
Submitter Rainer Orth
Date Sept. 28, 2011, 10:30 a.m.
Message ID <yddsjnh3qnu.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/116747/
State New
Headers show

Comments

Rainer Orth - Sept. 28, 2011, 10:30 a.m.
Ian Lance Taylor <iant@google.com> writes:

> Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:
>
>> Solaris 8 and 9 suffer from the same problem.  The following patch
>> allowed the bootstrap to complete.  An IRIX bootstrap is currently
>> running, but will take some time to complete.
>>
>> 	Rainer
>>
>>
>> 2011-09-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
>>
>> 	* mksysinfo.sh: Provide TIOCSCTTY if missing.
>
> Thanks.  I committed this patch, though I moved the new lines farther
> down in the script next to the handling of the ioctl constants.

Thanks, I'd missed that.  It turned out that IRIX 6 needs one more
change to return to bootstrap land: <sys/termios.h> only defines
TIOCNOTTY if !_XOPEN_SOURCE, which we need for other stuff
(cf. configure.ac).  I've cheated and use <sys/ttold.h> instead, which
doesn't have this check.  With this patch, a Go-only IRIX 6.5 bootstrap
completed successfully.

	Rainer


2011-09-28  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* mksysinfo.sh [__sgi__]: Include <sys/ttold.h>.
Ian Taylor - Sept. 28, 2011, 1:14 p.m.
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:

> Thanks, I'd missed that.  It turned out that IRIX 6 needs one more
> change to return to bootstrap land: <sys/termios.h> only defines
> TIOCNOTTY if !_XOPEN_SOURCE, which we need for other stuff
> (cf. configure.ac).  I've cheated and use <sys/ttold.h> instead, which
> doesn't have this check.  With this patch, a Go-only IRIX 6.5 bootstrap
> completed successfully.

Thanks.  Committed to mainline.

Ian

Patch

# HG changeset patch
# Parent 4530aeaf12a2b1576a7bf67de9cf5569719107c6
Provide TIOCNOTTY on IRIX 6

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -36,9 +36,12 @@  cat > sysinfo.c <<EOF
 #include <netinet/in.h>
 /* <netinet/tcp.h> needs u_char/u_short, but <sys/bsd_types> is only
    included by <netinet/in.h> if _SGIAPI (i.e. _SGI_SOURCE
-   && !_XOPEN_SOURCE.  */
+   && !_XOPEN_SOURCE.
+   <sys/termios.h> only defines TIOCNOTTY if !_XOPEN_SOURCE, while
+   <sys/ttold.h> does so unconditionally.  */
 #ifdef __sgi__
 #include <sys/bsd_types.h>
+#include <sys/ttold.h>
 #endif
 #include <netinet/tcp.h>
 #include <signal.h>