From: Mark Kettenis Date: Sun, 30 Jun 2002 17:19:54 +0000 (+0000) Subject: * configure.tgt (i[3456]86-*-openbsd*): Fold into X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=482e577bab34d40a9d35e5424f6b62b293b53c08;p=binutils-gdb.git * configure.tgt (i[3456]86-*-openbsd*): Fold into i[3456]86-*-netbsd* case. * config/i386/tm-obsd.h: Removed. * config/i386/obsd.mt: Removed. * config/i386/obsd.mh (NATDEPFILES): Remove corelow.o and core-aout.o. (MH_CFLAGS): Add -DYYDEBUG=0. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cf04b030331..2f85ce2e2ad 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2002-06-30 Mark Kettenis + * configure.tgt (i[3456]86-*-openbsd*): Fold into + i[3456]86-*-netbsd* case. + * config/i386/tm-obsd.h: Removed. + * config/i386/obsd.mt: Removed. + * config/i386/obsd.mh (NATDEPFILES): Remove corelow.o and + core-aout.o. + (MH_CFLAGS): Add -DYYDEBUG=0. + * i386bsd-nat.c (_initialize_i386bsd_nat): Define SC_PC_OFFSET to i386nbsd_sc_pc_offset on OpenBSD too. diff --git a/gdb/config/i386/obsd.mh b/gdb/config/i386/obsd.mh index d9593ceb846..8a4000173af 100644 --- a/gdb/config/i386/obsd.mh +++ b/gdb/config/i386/obsd.mh @@ -3,5 +3,9 @@ XM_FILE= xm-i386.h NAT_FILE= nm-obsd.h -# NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make. -NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-sunos.o corelow.o core-aout.o i386-nat.o i386bsd-nat.o +NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o \ + solib.o solib-sunos.o + +# The OpenBSD yacc generates yyname and yyrule tables that conflict at +# link time if we define YYDEBUG to a non-zero value. +MH_CFLAGS= -DYYDEBUG=0 diff --git a/gdb/config/i386/obsd.mt b/gdb/config/i386/obsd.mt deleted file mode 100644 index 5c96426b96d..00000000000 --- a/gdb/config/i386/obsd.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Intel 386 running OpenBSD -TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o -TM_FILE= tm-obsd.h diff --git a/gdb/config/i386/tm-obsd.h b/gdb/config/i386/tm-obsd.h deleted file mode 100644 index f3b111adcaa..00000000000 --- a/gdb/config/i386/tm-obsd.h +++ /dev/null @@ -1,76 +0,0 @@ -/* Target-dependent definitions for OpenBSD/i386. - Copyright 2001 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef TM_OBSD_H -#define TM_OBSD_H - -#include "i386/tm-i386.h" - -/* OpenBSD uses the old gcc convention for struct returns. */ - -#define USE_STRUCT_CONVENTION(gcc_p, type) \ - generic_use_struct_convention (1, type) - - -/* Support for longjmp. */ - -/* Details about jmp_buf. It's supposed to be an array of integers. */ - -#define JB_ELEMENT_SIZE 4 /* Size of elements in jmp_buf. */ -#define JB_PC 0 /* Array index of saved PC. */ - -/* Figure out where the longjmp will land. Store the address that - longjmp will jump to in *ADDR, and return non-zero if successful. */ - -#define GET_LONGJMP_TARGET(addr) get_longjmp_target (addr) -extern int get_longjmp_target (CORE_ADDR *addr); - - -/* Support for signal handlers. */ - -#define IN_SIGTRAMP(pc, name) i386bsd_in_sigtramp (pc, name) -extern int i386bsd_in_sigtramp (CORE_ADDR pc, char *name); - -/* These defines allow the recognition of sigtramps as a function name - . - - FIXME: kettenis/2001-07-13: These should be added to the target - vector and turned into functions when we go "multi-arch". */ - -#define SIGTRAMP_START(pc) i386bsd_sigtramp_start -#define SIGTRAMP_END(pc) i386bsd_sigtramp_end -extern CORE_ADDR i386bsd_sigtramp_start; -extern CORE_ADDR i386bsd_sigtramp_end; - -/* Override FRAME_SAVED_PC to enable the recognition of signal handlers. */ - -#undef FRAME_SAVED_PC -#define FRAME_SAVED_PC(frame) i386bsd_frame_saved_pc (frame) -extern CORE_ADDR i386bsd_frame_saved_pc (struct frame_info *frame); - - -/* Shared library support. */ - -/* Return non-zero if we are in a shared library trampoline code stub. */ - -#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) \ - (name && !strcmp(name, "_DYNAMIC")) - -#endif /* tm-obsd.h */ diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 02c65812281..8e3cf6daf9d 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -94,12 +94,12 @@ i[3456]86-*-aix*) gdb_target=i386aix ;; i[3456]86-*-bsd*) gdb_target=i386bsd ;; i[3456]86-*-freebsd*) gdb_target=fbsd ;; i[3456]86-*-netbsdelf*) gdb_target=nbsdelf ;; -i[3456]86-*-netbsd*) gdb_target=nbsdaout ;; +i[3456]86-*-netbsd* | i[3456]86-*-openbsd*) + gdb_target=nbsdaout ;; i[3456]86-*-os9k) gdb_target=i386os9k ;; i[3456]86-*-go32*) gdb_target=i386aout ;; i[3456]86-*-msdosdjgpp*) gdb_target=go32 ;; i[3456]86-*-lynxos*) gdb_target=i386lynx ;; -i[3456]86-*-openbsd*) gdb_target=obsd ;; i[3456]86-*-solaris*) gdb_target=i386sol2 ;; i[3456]86-*-sysv4.2*) gdb_target=i386v42mp ;; i[3456]86-*-sysv4*) gdb_target=i386v4 ;;