From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27973 invoked by alias); 12 Jan 2009 01:11:18 -0000 Received: (qmail 27962 invoked by uid 22791); 12 Jan 2009 01:11:16 -0000 X-Spam-Check-By: sourceware.org Received: from pool-96-233-71-199.bstnma.fios.verizon.net (HELO cgf.cx) (96.233.71.199) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 12 Jan 2009 01:10:48 +0000 Received: from ednor.cgf.cx (ednor.casa.cgf.cx [192.168.187.5]) by cgf.cx (Postfix) with ESMTP id 6F7C213C028 for ; Sun, 11 Jan 2009 20:10:38 -0500 (EST) Received: by ednor.cgf.cx (Postfix, from userid 201) id 6F4BB2B385; Sun, 11 Jan 2009 20:10:38 -0500 (EST) Date: Mon, 12 Jan 2009 01:11:00 -0000 From: Christopher Faylor To: gdb-patches@sourceware.org Subject: Rename win32-* to windows-* Message-ID: <20090112011038.GA3142@ednor.casa.cgf.cx> Mail-Followup-To: gdb-patches@sourceware.org References: <20090110090843.GB29274@adacore.com> <20090110165031.GB24850@ednor.casa.cgf.cx> <20090111041848.GQ24105@adacore.com> <20090111042411.GA8509@ednor.casa.cgf.cx> <20090111132129.GS24105@adacore.com> <20090111155801.GA18734@host0.dyn.jankratochvil.net> <20090111183625.GA10501@ednor.casa.cgf.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090111183625.GA10501@ednor.casa.cgf.cx> User-Agent: Mutt/1.5.16 (2007-06-09) 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/msg00250.txt.bz2 I did the rename. I didn't have a mingw environment handy to test that this worked but I think I got all of the cases except for gdbserver. I had to make some minor changes to windows-nat.c to get this building under Cygwin which were apparently already there as a result of the DWORD -> PVOID change. Thanks to Daniel Jacobowitz for reminding me that it is best to remove the history from the copied CVS files. I always forget that part. cgf 2009-01-11 Jan Kratochvil Fix linking with --enable-targets=all: * Makefile.in (ALL_TARGET_OBS): Add windows-tdep.o. (HFILES_NO_SRCDIR): Add windows-tdep.h. (ALLDEPFILES): Add windows-tdep.c. 2009-01-11 Christopher Faylor * win32-tdep.h: Delete. * windows-tdep.h: Rename from win32-tdep.h. * win32-nat.h: Delete. * windows-nat.h: Rename from win32-nat.h. * win32-nat.c: Delete. * windows-nat.c: Rename from win32-nat.c. * win32-termcapt.c: Delete. * windows-termcap.c: Rename from win32-termcap.c. * amd64-windows-nat.c: Handle rename from win32-nat.h -> windows-nat.h. * configure.ac: Handle rename from win32-termcap.c -> windows-termcap.c. * configure: Regenerate. * gdb_curses.h: Change comment to reflect rename from win32-termcap.c -> windows-termcap.c. * i386-cygwin-tdep.c: Handle rename from win32-tdep.h -> windows-tdep.h. * i386-windows-nat.c: Refect rename from win32-nat.h -> windows-nat.h. * windows-nat.c: Ditto. Also reflect rename from from win32-tdep.h -> windows-tdep.h. (win32_make_so): Handle cygwin compiler warning due to change of load_addr from DWORD to LPVOID. (handle_load_dll): Use %p in format string to properly print address and avoid a compiler warning. (DEBUG_EXCEPTION_SIMPLE): Ditto. (handle_exception): Ditto. * windows-tdep.c: Handle rename from win32-tdep.h -> windows-tdep.h. * config/i386/cygwin.mh: Handle rename from win32-nat.o -> windows-nat.o. * config/i386/mingw.mh: Ditto. * config/i386/mingw64.mh: Ditto. Index: Makefile.in =================================================================== RCS file: /cvs/uberbaum/gdb/Makefile.in,v retrieving revision 1.1063 diff -d -u -r1.1063 Makefile.in --- Makefile.in 9 Jan 2009 21:15:10 -0000 1.1063 +++ Makefile.in 12 Jan 2009 01:04:58 -0000 @@ -515,7 +515,8 @@ xcoffread.o \ prologue-value.o \ symfile-mem.o \ - corelow.o + corelow.o \ + windows-tdep.o # Host-dependent makefile fragment comes in here. @host_makefile_frag@ @@ -727,7 +728,7 @@ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \ annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h \ remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \ -sentinel-frame.h bcache.h symfile.h +sentinel-frame.h bcache.h symfile.h windows-tdep.h # Header files that already have srcdir in them, or which are in objdir. @@ -1340,7 +1341,7 @@ spu-linux-nat.c spu-tdep.c \ v850-tdep.c \ vax-nat.c vax-tdep.c vaxbsd-nat.c vaxnbsd-tdep.c \ - win32-nat.c \ + windows-nat.c windows-tdep.c \ xcoffread.c xcoffsolib.c \ xstormy16-tdep.c \ xtensa-tdep.c xtensa-config.c \ Index: amd64-windows-nat.c =================================================================== RCS file: /cvs/uberbaum/gdb/amd64-windows-nat.c,v retrieving revision 1.1 diff -d -u -r1.1 amd64-windows-nat.c --- amd64-windows-nat.c 11 Jan 2009 13:15:56 -0000 1.1 +++ amd64-windows-nat.c 12 Jan 2009 01:04:58 -0000 @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include "defs.h" -#include "win32-nat.h" +#include "windows-nat.h" #include Index: configure =================================================================== RCS file: /cvs/uberbaum/gdb/configure,v retrieving revision 1.263 diff -d -u -r1.263 configure --- configure 9 Dec 2008 17:18:29 -0000 1.263 +++ configure 12 Jan 2009 01:04:59 -0000 @@ -10170,7 +10170,7 @@ ;; *mingw32*) ac_cv_search_tgetent="none required" - CONFIG_OBS="$CONFIG_OBS win32-termcap.o" + CONFIG_OBS="$CONFIG_OBS windows-termcap.o" ;; esac Index: configure.ac =================================================================== RCS file: /cvs/uberbaum/gdb/configure.ac,v retrieving revision 1.83 diff -d -u -r1.83 configure.ac --- configure.ac 9 Dec 2008 17:18:30 -0000 1.83 +++ configure.ac 12 Jan 2009 01:04:59 -0000 @@ -506,7 +506,7 @@ ;; *mingw32*) ac_cv_search_tgetent="none required" - CONFIG_OBS="$CONFIG_OBS win32-termcap.o" + CONFIG_OBS="$CONFIG_OBS windows-termcap.o" ;; esac Index: configure.tgt =================================================================== RCS file: /cvs/uberbaum/gdb/configure.tgt,v retrieving revision 1.208 diff -d -u -r1.208 configure.tgt --- configure.tgt 11 Jan 2009 13:15:56 -0000 1.208 +++ configure.tgt 12 Jan 2009 01:04:59 -0000 @@ -201,13 +201,13 @@ 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 win32-tdep.o" + solib-target.o corelow.o windows-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 win32-tdep.o" + solib-target.o corelow.o windows-tdep.o" build_gdbserver=yes ;; i[34567]86-*-*) @@ -526,7 +526,7 @@ # Target: MingW/amd64 gdb_target_obs="amd64-tdep.o amd64-windows-tdep.o \ i386-tdep.o i386-cygwin-tdep.o i387-tdep.o \ - solib-target.o win32-tdep.o" + solib-target.o windows-tdep.o" ;; x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu) # Target: NetBSD/amd64 Index: gdb_curses.h =================================================================== RCS file: /cvs/uberbaum/gdb/gdb_curses.h,v retrieving revision 1.10 diff -d -u -r1.10 gdb_curses.h --- gdb_curses.h 3 Jan 2009 05:57:51 -0000 1.10 +++ gdb_curses.h 12 Jan 2009 01:04:59 -0000 @@ -36,7 +36,7 @@ #include #else /* On MinGW, a real termcap library is usually not present. Stub versions - of the termcap functions will be built from win32-termcap.c. Readline + of the termcap functions will be built from windows-termcap.c. Readline provides its own extern declarations when there's no termcap.h; do the same here for the termcap functions used in GDB. */ extern int tgetnum (const char *); Index: i386-cygwin-tdep.c =================================================================== RCS file: /cvs/uberbaum/gdb/i386-cygwin-tdep.c,v retrieving revision 1.19 diff -d -u -r1.19 i386-cygwin-tdep.c --- i386-cygwin-tdep.c 11 Jan 2009 13:10:44 -0000 1.19 +++ i386-cygwin-tdep.c 12 Jan 2009 01:04:59 -0000 @@ -21,7 +21,7 @@ #include "osabi.h" #include "gdb_string.h" #include "i386-tdep.h" -#include "win32-tdep.h" +#include "windows-tdep.h" #include "regset.h" #include "gdb_obstack.h" #include "xml-support.h" Index: i386-windows-nat.c =================================================================== RCS file: /cvs/uberbaum/gdb/i386-windows-nat.c,v retrieving revision 1.1 diff -d -u -r1.1 i386-windows-nat.c --- i386-windows-nat.c 11 Jan 2009 04:13:55 -0000 1.1 +++ i386-windows-nat.c 12 Jan 2009 01:04:59 -0000 @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include "defs.h" -#include "win32-nat.h" +#include "windows-nat.h" #include Index: windows-nat.c =================================================================== RCS file: /cvs/uberbaum/gdb/windows-nat.c,v retrieving revision 1.175 diff -d -u -r1.175 windows-nat.c --- windows-nat.c 11 Jan 2009 13:10:44 -0000 1.175 +++ windows-nat.c 12 Jan 2009 01:05:00 -0000 @@ -60,8 +60,8 @@ #include "i386-tdep.h" #include "i387-tdep.h" -#include "win32-tdep.h" -#include "win32-nat.h" +#include "windows-tdep.h" +#include "windows-nat.h" static struct target_ops win32_ops; @@ -651,8 +651,8 @@ /* The symbols in a dll are offset by 0x1000, which is the the offset from 0 of the first byte in an image - because of the file header and the section alignment. */ - cygwin_load_start = load_addr + 0x1000; - cygwin_load_end = cygwin_load_start + bfd_section_size (abfd, text); + cygwin_load_start = (bfd_vma) ((char *) load_addr + 0x1000); + cygwin_load_end = (bfd_vma) ((char *) cygwin_load_start + bfd_section_size (abfd, text)); bfd_close (abfd); } @@ -727,7 +727,7 @@ solib_end->next = win32_make_so (dll_name, event->lpBaseOfDll); solib_end = solib_end->next; - DEBUG_EVENTS (("gdb: Loading dll \"%s\" at 0x%lx.\n", solib_end->so_name, + DEBUG_EVENTS (("gdb: Loading dll \"%s\" at %p.\n", solib_end->so_name, solib_end->lm_info->load_addr)); return 1; @@ -973,7 +973,7 @@ #define DEBUG_EXCEPTION_SIMPLE(x) if (debug_exceptions) \ - printf_unfiltered ("gdb: Target exception %s at 0x%08lx\n", x, \ + printf_unfiltered ("gdb: Target exception %s at %p\n", x, \ current_event.u.Exception.ExceptionRecord.ExceptionAddress) static int @@ -1086,7 +1086,7 @@ /* Treat unhandled first chance exceptions specially. */ if (current_event.u.Exception.dwFirstChance) return -1; - printf_unfiltered ("gdb: unknown target exception 0x%08lx at 0x%08lx\n", + printf_unfiltered ("gdb: unknown target exception 0x%08lx at %p\n", current_event.u.Exception.ExceptionRecord.ExceptionCode, current_event.u.Exception.ExceptionRecord.ExceptionAddress); ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN; Index: windows-tdep.c =================================================================== RCS file: /cvs/uberbaum/gdb/windows-tdep.c,v retrieving revision 1.1 diff -d -u -r1.1 windows-tdep.c --- windows-tdep.c 11 Jan 2009 13:10:44 -0000 1.1 +++ windows-tdep.c 12 Jan 2009 01:05:00 -0000 @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include "defs.h" -#include "win32-tdep.h" +#include "windows-tdep.h" #include "gdb_obstack.h" #include "xml-support.h" Index: config/i386/cygwin.mh =================================================================== RCS file: /cvs/uberbaum/gdb/config/i386/cygwin.mh,v retrieving revision 1.9 diff -d -u -r1.9 cygwin.mh --- config/i386/cygwin.mh 11 Jan 2009 04:13:57 -0000 1.9 +++ config/i386/cygwin.mh 12 Jan 2009 01:05:00 -0000 @@ -1,4 +1,4 @@ MH_CFLAGS= -NATDEPFILES= i386-nat.o win32-nat.o i386-windows-nat.o +NATDEPFILES= i386-nat.o windows-nat.o i386-windows-nat.o NAT_FILE=nm-cygwin.h XM_CLIBS= Index: config/i386/mingw.mh =================================================================== RCS file: /cvs/uberbaum/gdb/config/i386/mingw.mh,v retrieving revision 1.2 diff -d -u -r1.2 mingw.mh --- config/i386/mingw.mh 11 Jan 2009 04:13:57 -0000 1.2 +++ config/i386/mingw.mh 12 Jan 2009 01:05:00 -0000 @@ -1,4 +1,4 @@ MH_CFLAGS= -NATDEPFILES= i386-nat.o win32-nat.o i386-windows-nat.o +NATDEPFILES= i386-nat.o windows-nat.o i386-windows-nat.o NAT_FILE=nm-cygwin.h XM_CLIBS= Index: config/i386/mingw64.mh =================================================================== RCS file: /cvs/uberbaum/gdb/config/i386/mingw64.mh,v retrieving revision 1.1 diff -d -u -r1.1 mingw64.mh --- config/i386/mingw64.mh 11 Jan 2009 13:15:56 -0000 1.1 +++ config/i386/mingw64.mh 12 Jan 2009 01:05:00 -0000 @@ -1,2 +1,2 @@ -NATDEPFILES= i386-nat.o win32-nat.o amd64-windows-nat.o +NATDEPFILES= i386-nat.o windows-nat.o amd64-windows-nat.o NAT_FILE=nm-cygwin64.h