From a80163397d548b79620836b33babd525fdbe28c6 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 29 Jun 2001 01:19:23 +0000 Subject: [PATCH] * rdi-share/unixcomm.c (SERIAL_PREFIX): Always provide a default. * rdi-share/hostchan.h (__unix): Hack, provide a default value. * rdi-share/host.h (__unix): Hack, define when __NetBSD__. * TODO: Update. * MAINTAINERS: Update. arm-elf builds. --- gdb/ChangeLog | 8 ++++++++ gdb/MAINTAINERS | 2 +- gdb/TODO | 20 -------------------- gdb/rdi-share/host.h | 5 +++-- gdb/rdi-share/hostchan.h | 7 +++++++ gdb/rdi-share/unixcomm.c | 18 +++++++++--------- 6 files changed, 28 insertions(+), 32 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 73480ebb61d..77e6368a819 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2001-06-28 Andrew Cagney + + * rdi-share/unixcomm.c (SERIAL_PREFIX): Always provide a default. + * rdi-share/hostchan.h (__unix): Hack, provide a default value. + * rdi-share/host.h (__unix): Hack, define when __NetBSD__. + * TODO: Update. + * MAINTAINERS: Update. arm-elf builds. + 2001-06-28 Jim Blandy * d10v-tdep.c (d10v_ts2_dmap_register): Doc fix. diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS index ed8aa687208..5597550a3c3 100644 --- a/gdb/MAINTAINERS +++ b/gdb/MAINTAINERS @@ -57,7 +57,7 @@ maintainer works with the native maintainer when resolving API issues. arc --target=arc-elf ,-Werror Maintenance only - arm (--target=arm-coff,arm-elf,arm-pe broken) + arm --target=arm-coff,arm-elf,arm-pe -w Fernando Nasser fnasser@cygnus.com Scott Bambrough scottb@netwinder.org diff --git a/gdb/TODO b/gdb/TODO index a8b2f53bc08..fbced52a94e 100644 --- a/gdb/TODO +++ b/gdb/TODO @@ -133,14 +133,6 @@ patch has been submitted. The following code cleanups will hopefully be applied to GDB 5.1. --- 2001-03-26 - -Resolve the build status of all broken targets as identified by the -MAINTAINERS file. - - o arm-* vs NetBSD's lack of ``unix'' - o arm-* vs IRIX (see below) - -- Fix copyright notices. @@ -341,18 +333,6 @@ Rename read_register{,_pid}() to read_unsigned_register{,_pid}(). -- -Can't build IRIX -> arm GDB. -http://sourceware.cygnus.com/ml/gdb-patches/2000-04/msg00356.html - -David Whedon writes: -> Now I'm building for an embedded arm target. If there is a way of turning -> remote-rdi off, I couldn't find it. It looks like it gets built by default -> in gdb/configure.tgt(line 58) Anyway, the build dies in -> gdb/rdi-share/unixcomm.c. SERPORT1 et. al. never get defined because we -> aren't one of the architectures supported. - --- - Problem with weak functions http://sourceware.cygnus.com/ml/gdb/2000-05/msg00060.html diff --git a/gdb/rdi-share/host.h b/gdb/rdi-share/host.h index 3c1565b8f11..53b65681b8a 100644 --- a/gdb/rdi-share/host.h +++ b/gdb/rdi-share/host.h @@ -37,13 +37,14 @@ #endif #endif -#ifdef unix /* A temporary sop to older compilers */ +/* A temporary sop to older compilers */ +#if defined (__NetBSD__) || defined (unix) # ifndef __unix /* (good for long-term portability?) */ # define __unix 1 # endif #endif -#ifdef __unix +#if defined(__unix) /* Generic unix -- hopefully a split into other variants will not be */ /* needed. However, beware the 'bsd' test above and safe_toupper etc. */ /* which cope with backwards (pre-posix/X/open) unix compatility. */ diff --git a/gdb/rdi-share/hostchan.h b/gdb/rdi-share/hostchan.h index b9acb77919d..3e6d26fd792 100644 --- a/gdb/rdi-share/hostchan.h +++ b/gdb/rdi-share/hostchan.h @@ -23,6 +23,13 @@ #endif #endif +/* A temporary sop to older compilers */ +#if defined (__NetBSD__) || defined (unix) +# ifndef __unix /* (good for long-term portability?) */ +# define __unix 1 +# endif +#endif + /* struct timeval */ #if defined(__unix) || defined(__CYGWIN32__) # include diff --git a/gdb/rdi-share/unixcomm.c b/gdb/rdi-share/unixcomm.c index 6891c0d84e2..0abd4115a29 100644 --- a/gdb/rdi-share/unixcomm.c +++ b/gdb/rdi-share/unixcomm.c @@ -96,15 +96,6 @@ #define PARPORT2 "/dev/par1" #endif -#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (bsdi) -#define SERIAL_PREFIX "/dev/cuaa" -#define SERPORT1 "/dev/cuaa0" -#define SERPORT2 "/dev/cuaa1" -#define PARPORT1 "/dev/lpt0" -#define PARPORT2 "/dev/lpt1" -#endif - - #if defined(_WIN32) || defined (__CYGWIN32__) #define SERIAL_PREFIX "com" #define SERPORT1 "com1" @@ -113,6 +104,15 @@ #define PARPORT2 "lpt2" #endif +#if !defined (SERIAL_PREFIX) +#define SERIAL_PREFIX "/dev/cuaa" +#define SERPORT1 "/dev/cuaa0" +#define SERPORT2 "/dev/cuaa1" +#define PARPORT1 "/dev/lpt0" +#define PARPORT2 "/dev/lpt1" +#endif + + /* -- 2.30.2