From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22014 invoked by alias); 10 Jan 2009 09:09:26 -0000 Received: (qmail 22005 invoked by uid 22791); 10 Jan 2009 09:09:25 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 10 Jan 2009 09:08:54 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 264DE2A9652 for ; Sat, 10 Jan 2009 04:08:52 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id xrKq3747mbFX for ; Sat, 10 Jan 2009 04:08:52 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 6F7FA2A9640 for ; Sat, 10 Jan 2009 04:08:50 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id 73929E7ACD; Sat, 10 Jan 2009 13:08:43 +0400 (RET) Date: Sat, 10 Jan 2009 09:09:00 -0000 From: Joel Brobecker To: gdb-patches@sourceware.org Subject: [RFA/win32] move win32_xfer_shared_library to (new) win32-tdep... Message-ID: <20090110090843.GB29274@adacore.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="i9LlY+UWpKt15+FH" Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-01/txt/msg00219.txt.bz2 --i9LlY+UWpKt15+FH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 758 Hello, This patch moves the win32_xfer_shared_library function to a file that is not specific to the target CPU. I introduced win32-tdep, to follow the naming scheme used by win32-nat, even though these file can also work on 64bit windows. 2009-01-10 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. Tested on x86-windows. OK to apply? Thank you, -- Joel --i9LlY+UWpKt15+FH Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="solib_ops.diff" Content-length: 6051 diff --git a/gdb/configure.tgt b/gdb/configure.tgt index b9cd21b..f2b8ffb 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 3457cf2..d639f5b 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/i386-cygwin-tdep.h b/gdb/i386-cygwin-tdep.h deleted file mode 100644 index f3d9997..0000000 --- a/gdb/i386-cygwin-tdep.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Target-dependent code for Cygwin running on i386's, for GDB. - - Copyright (C) 2007, 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 I386_CYGWIN_TDEP_H -#define I386_CYGWIN_TDEP_H - -struct obstack; - -extern void win32_xfer_shared_library (const char* so_name, - CORE_ADDR load_addr, - struct obstack *obstack); - -#endif /* I386_CYGWIN_TDEP_H */ diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 286f1f9..9a1a28c 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 0000000..1a4bae8 --- /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/win32-tdep.h b/gdb/win32-tdep.h new file mode 100644 index 0000000..a38aa33 --- /dev/null +++ b/gdb/win32-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 --i9LlY+UWpKt15+FH--