Fix IRIX 6.5 compile problems (GCC only).

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index eb09f776c917f8ddcc0d9295efcb6738121560fb..c2541d129500dee9ad2f1828bf19057a8f818aa6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+Mon May  8 14:49:51 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       From Michael Paddon <mmpp@esec.com.au>:
+       * configure.in (AC_CHECK_HEADERS): Check for <sys/user.h>.
+       * configure: Re-generate.
+       * proc-api.c: Only include <sys/user.h> when available.
+       (ioctl_table): Check that PIOCGETPR and PIOCGETU are defined.
+
+       * TODO, README: Update.  Mention that GDB 5 needs GCC on IRIX.
+
 2000-05-08  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * config/djgpp/djconfig.sh: Use more warning switches.

diff --git a/gdb/README b/gdb/README
index bb3e0e13e43c8c9f36dff74a902e85dc76b6c1df..467e89884ea808cf3b75b821d76cd3ab5c2767ae 100644 (file)
--- a/gdb/README
+++ b/gdb/README
@@ -531,6 +531,9 @@ Known bugs:
     subsystem that is on the IDO CD, otherwise you will get complaints
     that certain files such as `/usr/include/syms.h' cannot be found.
 
+  * Under Irix 6 you must build with GCC.  The vendor compiler reports
+    as errors certain assignments that GCC considers to be warnings.
+
   * Notes for BSD/386:
     To compile gdb-4.18 on BSD/386, you must run the configure script and
     its subscripts with bash.  Here is an easy way to do this:
@@ -539,6 +542,8 @@ Known bugs:
 
     (configure will report i386-unknown-bsd).  Then, compile with the
     standard "make" command.
+  
+  * See, also the file TODO for other minor problems.
 
 GDB can produce warnings about symbols that it does not understand.  By
 default, these warnings are disabled.  You can enable them by executing

diff --git a/gdb/TODO b/gdb/TODO
index 300477f0c81dd559d3b65af0449a190ebda98c53..904604869788650880df53c6075eccc25fc22bce 100644 (file)
--- a/gdb/TODO
+++ b/gdb/TODO
@@ -15,16 +15,12 @@ release.
 
 --
 
-GDB doesn't build under IRIX6.4
+GDB requires GCC to build under IRIX
 
-Benjamin Gamsa wrote:
+IRIX, being more pedantic than GCC reports as errors certain
+assignments that GCC treats as warnings.
 
-Has anyone successfully built the latest (from cvs) gdb on IRIX6.4 or
-later?  The first problem I hit is that proc-api.c includes
-sys/user.h, which no longer exists under IRIX6.4.  If I comment out
-that include, the next problem I hit is that PIOCGETPR and PIOCGETU
-are no longer defined in IRIX6.4 (presumably related to the
-disappearance of user.h).
+This can be worked around by building GDB with the GCC compiler.
 
 --
 

diff --git a/gdb/configure b/gdb/configure
index b97ea9248921b33bf3d69d744816e4801b6b82f8..791ddb2c1845cb190d416781e7ff604d61b7cc5f 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -3293,7 +3293,7 @@ for ac_hdr in ctype.h curses.h endian.h link.h thread_db.h proc_service.h \
        string.h sys/procfs.h sys/ptrace.h sys/reg.h stdint.h \
        term.h termio.h termios.h unistd.h wait.h sys/wait.h \
        wchar.h wctype.h asm/debugreg.h sys/debugreg.h sys/select.h \
-       time.h sys/ioctl.h
+       time.h sys/ioctl.h sys/user.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/gdb/configure.in b/gdb/configure.in
index 8e95c78f77b896fbf93e20d39000ab868d525a7d..8104bcba8cd882213c6e0a6e50001763a46d6b3a 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -102,7 +102,7 @@ AC_CHECK_HEADERS(ctype.h curses.h endian.h link.h thread_db.h proc_service.h \
        string.h sys/procfs.h sys/ptrace.h sys/reg.h stdint.h \
        term.h termio.h termios.h unistd.h wait.h sys/wait.h \
        wchar.h wctype.h asm/debugreg.h sys/debugreg.h sys/select.h \
-       time.h sys/ioctl.h)
+       time.h sys/ioctl.h sys/user.h)
 AC_HEADER_STAT
 
 AC_C_CONST

diff --git a/gdb/proc-api.c b/gdb/proc-api.c
index a3629d747a5642636f06c1067a58ef434a000291..04f99f74260f04f19edf28394ea2a1eb273c5aeb 100644 (file)
--- a/gdb/proc-api.c
+++ b/gdb/proc-api.c
@@ -36,7 +36,9 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/types.h>
 #include <sys/procfs.h>
 #include <sys/proc.h>  /* for struct proc */
+#ifdef HAVE_SYS_USER_H
 #include <sys/user.h>  /* for struct user */
+#endif
 #include <fcntl.h>     /* for O_RDWR etc. */
 #include <sys/wait.h>
 
@@ -110,8 +112,12 @@ static struct trans ioctl_table[] = {
   { PIOCGETPTIMER,   "PIOCGETPTIMER",   "get process timers" },
 #endif /* irix event counters */
   { PIOCGENTRY,    "PIOCGENTRY",   "get traced syscall entry set" },
+#if defined (PIOCGETPR)
   { PIOCGETPR,     "PIOCGETPR",    "read struct proc" },
+#endif
+#if defined (PIOCGETU)
   { PIOCGETU,      "PIOCGETU",     "read user area" },
+#endif
 #if defined (PIOCGETUTK) && (defined(KERNEL) || defined(SHOW_UTT)) /* osf */
   { PIOCGETUTK,  "PIOCGETUTK", "get the utask struct" },
 #endif