From bfb87e33ab2006cc3ab23d18fd921425223337c5 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Sun, 11 Jan 2009 13:10:44 +0000 Subject: [PATCH] * win32-tdep.h, win32-tdep.c: New files. * i386-cygwin-tdep.h: Delete. * i386-cygwin-tdep.c: Include win32-tdep.h instead of i386-cygwin-tdep.h. (win32_xfer_shared_library): Delete. Moved to win32-tdep.c. * win32-nat.c: Likewise. * configure.tgt: Add win32-tdep.o to the list of target object files for i386-cygwin and i386-mingw targets. --- gdb/ChangeLog | 11 +++++++ gdb/configure.tgt | 4 +-- gdb/i386-cygwin-tdep.c | 20 +----------- gdb/win32-nat.c | 2 +- gdb/win32-tdep.c | 41 ++++++++++++++++++++++++ gdb/{i386-cygwin-tdep.h => win32-tdep.h} | 10 +++--- gdb/windows-nat.c | 2 +- gdb/windows-tdep.c | 41 ++++++++++++++++++++++++ gdb/windows-tdep.h | 27 ++++++++++++++++ 9 files changed, 129 insertions(+), 29 deletions(-) create mode 100644 gdb/win32-tdep.c rename gdb/{i386-cygwin-tdep.h => win32-tdep.h} (79%) create mode 100644 gdb/windows-tdep.c create mode 100644 gdb/windows-tdep.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 104d0d65364..d6b719e6038 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2009-10-11 Joel Brobecker + + * win32-tdep.h, win32-tdep.c: New files. + * i386-cygwin-tdep.h: Delete. + * i386-cygwin-tdep.c: Include win32-tdep.h instead of + i386-cygwin-tdep.h. + (win32_xfer_shared_library): Delete. Moved to win32-tdep.c. + * win32-nat.c: Likewise. + * configure.tgt: Add win32-tdep.o to the list of target object + files for i386-cygwin and i386-mingw targets. + 2009-10-11 Joel Brobecker * win32-nat.h: New file. diff --git a/gdb/configure.tgt b/gdb/configure.tgt index b9cd21bdc05..f2b8ffbb8fd 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -201,13 +201,13 @@ i[34567]86-*-gnu*) i[34567]86-*-cygwin*) # Target: Intel 386 running win32 gdb_target_obs="i386-tdep.o i386-cygwin-tdep.o i387-tdep.o \ - solib-target.o corelow.o" + solib-target.o corelow.o win32-tdep.o" build_gdbserver=yes ;; i[34567]86-*-mingw32*) # Target: Intel 386 running win32 gdb_target_obs="i386-tdep.o i386-cygwin-tdep.o i387-tdep.o \ - solib-target.o corelow.o" + solib-target.o corelow.o win32-tdep.o" build_gdbserver=yes ;; i[34567]86-*-*) diff --git a/gdb/i386-cygwin-tdep.c b/gdb/i386-cygwin-tdep.c index 3457cf2bec6..d639f5b2eba 100644 --- a/gdb/i386-cygwin-tdep.c +++ b/gdb/i386-cygwin-tdep.c @@ -21,7 +21,7 @@ #include "osabi.h" #include "gdb_string.h" #include "i386-tdep.h" -#include "i386-cygwin-tdep.h" +#include "win32-tdep.h" #include "regset.h" #include "gdb_obstack.h" #include "xml-support.h" @@ -111,24 +111,6 @@ i386_win32_regset_from_core_section (struct gdbarch *gdbarch, return NULL; } -void -win32_xfer_shared_library (const char* so_name, CORE_ADDR load_addr, - struct obstack *obstack) -{ - char *p; - obstack_grow_str (obstack, ""); -} - struct cpms_data { struct obstack *obstack; diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 286f1f92279..9a1a28cfd56 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -60,7 +60,7 @@ #include "i386-tdep.h" #include "i387-tdep.h" -#include "i386-cygwin-tdep.h" +#include "win32-tdep.h" #include "win32-nat.h" static struct target_ops win32_ops; diff --git a/gdb/win32-tdep.c b/gdb/win32-tdep.c new file mode 100644 index 00000000000..1a4bae8cbf0 --- /dev/null +++ b/gdb/win32-tdep.c @@ -0,0 +1,41 @@ +/* Copyright (C) 2008, 2009 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 3 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, see . */ + +#include "defs.h" +#include "win32-tdep.h" +#include "gdb_obstack.h" +#include "xml-support.h" + +void +win32_xfer_shared_library (const char* so_name, CORE_ADDR load_addr, + struct obstack *obstack) +{ + char *p; + obstack_grow_str (obstack, ""); +} + + diff --git a/gdb/i386-cygwin-tdep.h b/gdb/win32-tdep.h similarity index 79% rename from gdb/i386-cygwin-tdep.h rename to gdb/win32-tdep.h index f3d9997cf7b..a38aa3393af 100644 --- a/gdb/i386-cygwin-tdep.h +++ b/gdb/win32-tdep.h @@ -1,6 +1,4 @@ -/* Target-dependent code for Cygwin running on i386's, for GDB. - - Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2009 Free Software Foundation, Inc. This file is part of GDB. @@ -17,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef I386_CYGWIN_TDEP_H -#define I386_CYGWIN_TDEP_H +#ifndef WIN32_TDEP_H +#define WIN32_TDEP_H struct obstack; @@ -26,4 +24,4 @@ extern void win32_xfer_shared_library (const char* so_name, CORE_ADDR load_addr, struct obstack *obstack); -#endif /* I386_CYGWIN_TDEP_H */ +#endif diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 286f1f92279..9a1a28cfd56 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -60,7 +60,7 @@ #include "i386-tdep.h" #include "i387-tdep.h" -#include "i386-cygwin-tdep.h" +#include "win32-tdep.h" #include "win32-nat.h" static struct target_ops win32_ops; diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c new file mode 100644 index 00000000000..1a4bae8cbf0 --- /dev/null +++ b/gdb/windows-tdep.c @@ -0,0 +1,41 @@ +/* Copyright (C) 2008, 2009 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 3 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, see . */ + +#include "defs.h" +#include "win32-tdep.h" +#include "gdb_obstack.h" +#include "xml-support.h" + +void +win32_xfer_shared_library (const char* so_name, CORE_ADDR load_addr, + struct obstack *obstack) +{ + char *p; + obstack_grow_str (obstack, ""); +} + + diff --git a/gdb/windows-tdep.h b/gdb/windows-tdep.h new file mode 100644 index 00000000000..a38aa3393af --- /dev/null +++ b/gdb/windows-tdep.h @@ -0,0 +1,27 @@ +/* Copyright (C) 2008, 2009 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 3 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, see . */ + +#ifndef WIN32_TDEP_H +#define WIN32_TDEP_H + +struct obstack; + +extern void win32_xfer_shared_library (const char* so_name, + CORE_ADDR load_addr, + struct obstack *obstack); + +#endif -- 2.30.2