diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 14 | ||||
| -rw-r--r-- | gdb/Makefile.in | 20 | ||||
| -rw-r--r-- | gdb/alpha-tdep.c | 6 | ||||
| -rw-r--r-- | gdb/gnu-regex.c (renamed from gdb/regex.c) | 2 | ||||
| -rw-r--r-- | gdb/gnu-regex.h (renamed from gdb/regex.h) | 0 | ||||
| -rw-r--r-- | gdb/irix5-nat.c | 2 | ||||
| -rw-r--r-- | gdb/osfsolib.c | 2 | ||||
| -rw-r--r-- | gdb/symtab.c | 2 |
8 files changed, 31 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5a0e7a6..634e9ac 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +Thu Oct 26 15:21:32 1995 Brendan Kehoe <brendan@lisa.cygnus.com> + + * regex.h: Renamed to gnu-regex.h. + * regex.c: Renamed to gnu-regex.c. + * Makefile.in (POSSLIBS): Refer to gnu-regex.h and gnu-regex.c. + (REGEX, REGEX1): Change to gnu-regex.o instead of regex.o. + (regex.o): Renamed to gnu-regex.o; refer to gnu-regex.c. + (irix5-nat.o, osfsolib.o, gnu-regex.o, solib.o, source.o, symtab.o): + Likewise. + * irix5-nat.c, osfsolib.c, gnu-regex.c, solib.c, source.c, symtab.c): + Include "gnu-regex.h" instead of "regex.h". + * alpha-tdep.c (in_prologue): Rename to alpha_in_prologue, to + avoid conflicts with symtab.h. + Tue Oct 24 18:30:18 1995 Jason Molenda (crash@phydeaux.cygnus.com) * config/pa/hppahpux.mh: Remove hardcoding of X locations. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 693fb86..ff0ec64 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -148,7 +148,7 @@ ENABLE_OBS= @ENABLE_OBS@ # All the includes used for CFLAGS and for lint. # -I. for config files. -# -I$(srcdir) for gdb internal headers and possibly for regex.h also. +# -I$(srcdir) for gdb internal headers and possibly for gnu-regex.h also. # -I$(srcdir)/config for more generic config files. # It is also possible that you will need to add -I/usr/include/sys if @@ -186,8 +186,8 @@ INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) $(LDFLAGS) # We are using our own version of REGEX now to be consistent across # machines. -REGEX = regex.o -REGEX1 = regex.o +REGEX = gnu-regex.o +REGEX1 = gnu-regex.o # If your system is missing alloca(), or, more likely, it's there but # it doesn't work, then refer to libiberty. @@ -437,7 +437,7 @@ INFOFILES = gdb.info* REMOTE_EXAMPLES = m68k-stub.c i386-stub.c sparc-stub.c rem-multi.shar -POSSLIBS = regex.c regex.h +POSSLIBS = gnu-regex.c gnu-regex.h # {X,T,NAT}DEPFILES are something of a pain in that it's hard to # default their values the way we do for SER_HARDWIRE; in the future @@ -1213,7 +1213,7 @@ inftarg.o: inftarg.c $(wait_h) $(defs_h) $(gdbcore_h) $(inferior_h) \ irix4-nat.o: irix4-nat.c $(defs_h) $(inferior_h) irix5-nat.o: irix5-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) target.h \ - $(symtab_h) symfile.h objfiles.h $(command_h) $(frame_h) regex.h \ + $(symtab_h) symfile.h objfiles.h $(command_h) $(frame_h) gnu-regex.h \ language.h isi-xdep.o: isi-xdep.c @@ -1308,7 +1308,7 @@ objfiles.o: objfiles.c $(bfd_h) $(defs_h) objfiles.h symfile.h \ $(symtab_h) osfsolib.o: osfsolib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \ - objfiles.h regex.h symfile.h target.h language.h + objfiles.h gnu-regex.h symfile.h target.h language.h somread.o: somread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \ gdb-stabs.h objfiles.h symfile.h $(symtab_h) @@ -1332,7 +1332,7 @@ pyr-tdep.o: pyr-tdep.c $(defs_h) pyr-xdep.o: pyr-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h) -regex.o: regex.c regex.h $(defs_h) +gnu-regex.o: gnu-regex.c gnu-regex.h $(defs_h) remote-adapt.o: remote-adapt.c $(wait_h) $(defs_h) $(gdbcore_h) \ $(inferior_h) target.h terminal.h @@ -1424,10 +1424,10 @@ sh3-rom.o: sh3-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \ $(inferior_h) target.h serial.h terminal.h solib.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \ - objfiles.h regex.h symfile.h target.h + objfiles.h gnu-regex.h symfile.h target.h source.o: source.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \ - $(gdbcore_h) language.h objfiles.h regex.h symfile.h $(symtab_h) + $(gdbcore_h) language.h objfiles.h gnu-regex.h symfile.h $(symtab_h) sparc-nat.o: sparc-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h @@ -1459,7 +1459,7 @@ symmisc.o: symmisc.c $(bfd_h) $(breakpoint_h) $(command_h) $(defs_h) \ symtab.o: symtab.c call-cmds.h $(defs_h) $(expression_h) $(frame_h) \ $(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h objfiles.h \ - regex.h symfile.h $(symtab_h) target.h $(value_h) + gnu-regex.h symfile.h $(symtab_h) target.h $(value_h) tahoe-tdep.o: tahoe-tdep.c $(OP_INCLUDE)/tahoe.h $(defs_h) \ $(symtab_h) diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index 6ec6f6d..ce1c8ed 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -58,7 +58,7 @@ static void reinit_frame_cache_sfunc PARAMS ((char *, int, static CORE_ADDR after_prologue PARAMS ((CORE_ADDR pc, alpha_extra_func_info_t proc_desc)); -static int in_prologue PARAMS ((CORE_ADDR pc, +static int alpha_in_prologue PARAMS ((CORE_ADDR pc, alpha_extra_func_info_t proc_desc)); /* Heuristic_proc_start may hunt through the text section for a long @@ -444,7 +444,7 @@ after_prologue (pc, proc_desc) are definatly *not* in a function prologue. */ static int -in_prologue (pc, proc_desc) +alpha_in_prologue (pc, proc_desc) CORE_ADDR pc; alpha_extra_func_info_t proc_desc; { @@ -530,7 +530,7 @@ find_proc_desc (pc, next_frame) proc_desc = (alpha_extra_func_info_t)SYMBOL_VALUE(sym); if (next_frame == NULL) { - if (PROC_DESC_IS_DUMMY (proc_desc) || in_prologue (pc, proc_desc)) + if (PROC_DESC_IS_DUMMY (proc_desc) || alpha_in_prologue (pc, proc_desc)) { alpha_extra_func_info_t found_heuristic = heuristic_proc_desc (PROC_LOW_ADDR (proc_desc), diff --git a/gdb/regex.c b/gdb/gnu-regex.c index 62e4606..062fbc6 100644 --- a/gdb/regex.c +++ b/gdb/gnu-regex.c @@ -79,7 +79,7 @@ init_syntax_once () #endif /* SYNTAX_TABLE */ #endif /* not emacs */ -#include "regex.h" +#include "gnu-regex.h" /* Number of failure points to allocate space for initially, when matching. If this number is exceeded, more space is allocated, diff --git a/gdb/regex.h b/gdb/gnu-regex.h index 7b1a4af..7b1a4af 100644 --- a/gdb/regex.h +++ b/gdb/gnu-regex.h diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c index 3ba00b1..16e2906 100644 --- a/gdb/irix5-nat.c +++ b/gdb/irix5-nat.c @@ -196,7 +196,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr) #include "objfiles.h" #include "command.h" #include "frame.h" -#include "regex.h" +#include "gnu-regex.h" #include "inferior.h" #include "language.h" diff --git a/gdb/osfsolib.c b/gdb/osfsolib.c index d2b5530..79301e4 100644 --- a/gdb/osfsolib.c +++ b/gdb/osfsolib.c @@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "command.h" #include "target.h" #include "frame.h" -#include "regex.h" +#include "gnu-regex.h" #include "inferior.h" #include "language.h" diff --git a/gdb/symtab.c b/gdb/symtab.c index fa3d2e5..840efb0 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "objfiles.h" #include "gdbcmd.h" #include "call-cmds.h" -#include "regex.h" +#include "gnu-regex.h" #include "expression.h" #include "language.h" #include "demangle.h" |