S/390: Rename source files to *-linux-*

As suggested before, rename the S/390-related source files (tdep and nat)
such that "-linux-" occurs in the file name, like with other GNU/Linux
targets.  Since no other operating system is currently supported by GDB
on this architecture, this isn't strictly necessary.  But the old names
sometimes caused GDB contributors to miss these files when performing a
change that affects all GNU/Linux targets.  The latest such incident was
observed here:

    https://sourceware.org/ml/gdb-patches/2013-09/msg00619.html

gdb/
2013-10-30  Andreas Arnez  <arnez@linux.vnet.ibm.com>

	* s390-tdep.h: Rename to...
	* s390-linux-tdep.h: ...here.
	* s390-tdep.c: Rename to...
	* s390-linux-tdep.c: ...here.  Adjust #include.
	* s390-nat.c: Rename to...
	* s390-linux-nat.c: ...here.  Adjust #include.
	* config/s390/s390.mh: Rename to...
	* config/s390/linux.mh: ...here.  Reflect rename s390-nat.o ->
	s390-linux-nat.o.
	* configure.host: Reflect host rename "s390" -> "linux".
	* configure.tgt: Reflect rename s390-tdep.o -> s390-linux-tdep.o.
	* Makefile.in (ALL_TARGET_OBS): Likewise.
	(HFILES_NO_SRCDIR): Reflect rename s390-tdep.h ->
	s390-linux-tdep.h.
	(ALLDEPFILES): Reflect rename of .c files.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a0d7880d538ff5c8089892a7a35def32fb7f58c8..7381eb6b5762803be79b857e114ceb3df07328e7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,21 @@
+2013-10-30  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+       * s390-tdep.h: Rename to...
+       * s390-linux-tdep.h: ...here.
+       * s390-tdep.c: Rename to...
+       * s390-linux-tdep.c: ...here.  Adjust #include.
+       * s390-nat.c: Rename to...
+       * s390-linux-nat.c: ...here.  Adjust #include.
+       * config/s390/s390.mh: Rename to...
+       * config/s390/linux.mh: ...here.  Reflect rename s390-nat.o ->
+       s390-linux-nat.o.
+       * configure.host: Reflect host rename "s390" -> "linux".
+       * configure.tgt: Reflect rename s390-tdep.o -> s390-linux-tdep.o.
+       * Makefile.in (ALL_TARGET_OBS): Likewise.
+       (HFILES_NO_SRCDIR): Reflect rename s390-tdep.h ->
+       s390-linux-tdep.h.
+       (ALLDEPFILES): Reflect rename of .c files.
+
 2013-10-30  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
        * s390-nat.c: Whitespace cleanup.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index fc2a3af26e9e705ebd28bcfae63f55031a807866..a9b3c64a25f120fb92a56ca71ab90514eab76a81 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -586,7 +586,7 @@ ALL_TARGET_OBS = \
        rs6000-aix-tdep.o rs6000-tdep.o solib-aix.o ppc-ravenscar-thread.o \
        rs6000-lynx178-tdep.o \
        rx-tdep.o \
-       s390-tdep.o \
+       s390-linux-tdep.o \
        score-tdep.o \
        sh64-tdep.o sh-linux-tdep.o shnbsd-tdep.o sh-tdep.o \
        sparc-linux-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o \
@@ -802,7 +802,7 @@ cli/cli-script.h macrotab.h symtab.h common/version.h \
 gnulib/import/string.in.h gnulib/import/str-two-way.h \
 gnulib/import/stdint.in.h remote.h remote-notif.h gdb.h sparc-nat.h \
 gdbthread.h dwarf2-frame.h dwarf2-frame-tailcall.h nbsd-nat.h dcache.h \
-amd64-nat.h s390-tdep.h arm-linux-tdep.h exceptions.h macroscope.h \
+amd64-nat.h s390-linux-tdep.h arm-linux-tdep.h exceptions.h macroscope.h \
 gdbarch.h bsd-uthread.h common/gdb_stat.h memory-map.h memrange.h \
 mdebugread.h m88k-tdep.h stabsread.h hppa-linux-offsets.h linux-fork.h \
 ser-unix.h inf-ptrace.h terminal.h ui-out.h frame-base.h \
@@ -1551,7 +1551,7 @@ ALLDEPFILES = \
        rs6000-nat.c rs6000-tdep.c solib-aix.c ppc-ravenscar-thread.c \
        rs6000-lynx178-tdep.c \
        rx-tdep.c \
-       s390-tdep.c s390-nat.c \
+       s390-linux-tdep.c s390-linux-nat.c \
        score-tdep.c \
        ser-go32.c ser-pipe.c ser-tcp.c ser-mingw.c \
        sh-tdep.c sh64-tdep.c shnbsd-tdep.c shnbsd-nat.c \

diff --git a/gdb/config/s390/s390.mh b/gdb/config/s390/linux.mh
similarity index 81%
rename from gdb/config/s390/s390.mh
rename to gdb/config/s390/linux.mh
index 76d82e57775dd3786751b7901f875263a18160ef..59bab838b643856d031561fffb3476b1d54fc38e 100644 (file)
--- a/gdb/config/s390/s390.mh
+++ b/gdb/config/s390/linux.mh
@@ -1,6 +1,6 @@
 # Host: S390, running Linux
 NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o s390-nat.o \
+NATDEPFILES= inf-ptrace.o fork-child.o s390-linux-nat.o \
        linux-thread-db.o proc-service.o \
        linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
        linux-waitpid.o

diff --git a/gdb/configure.host b/gdb/configure.host
index f52237648236df12b950ce8f03a2c609ffb84fba..634213fb6f3ab4bc90b592f2d2c53168097a27cc 100644 (file)
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -149,7 +149,7 @@ powerpc64*-*-linux*)        gdb_host=ppc64-linux
                        ;;
 powerpc*-*-linux*)     gdb_host=linux ;;
 
-s390*-*-*)             gdb_host=s390 ;;
+s390*-*-linux*)                gdb_host=linux ;;
 
 sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu)
                        gdb_host=nbsd ;;

diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index ea0faf1b3132438242b2fa7d8d71cc29c953d661..47e98d9bd3c8440f6260af8818ea9bdec86e7b96 100644 (file)
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -464,9 +464,9 @@ powerpc*-*-*)
        fi
        ;;
 
-s390*-*-*)
+s390*-*-linux*)
        # Target: S390 running Linux
-       gdb_target_obs="s390-tdep.o solib-svr4.o linux-tdep.o"
+       gdb_target_obs="s390-linux-tdep.o solib-svr4.o linux-tdep.o"
        build_gdbserver=yes
        ;;
 

diff --git a/gdb/s390-nat.c b/gdb/s390-linux-nat.c
similarity index 99%
rename from gdb/s390-nat.c
rename to gdb/s390-linux-nat.c
index 11b5345390a9de1c23ae8374bec914caa131c479..67f97f9a05b42630f6a0a77ea50f8d93d97f02c0 100644 (file)
--- a/gdb/s390-nat.c
+++ b/gdb/s390-linux-nat.c
@@ -27,7 +27,7 @@
 #include "auxv.h"
 #include "gregset.h"
 
-#include "s390-tdep.h"
+#include "s390-linux-tdep.h"
 #include "elf/common.h"
 
 #include <asm/ptrace.h>

diff --git a/gdb/s390-tdep.c b/gdb/s390-linux-tdep.c
similarity index 99%
rename from gdb/s390-tdep.c
rename to gdb/s390-linux-tdep.c
index 91c94a4f2c89f2a106b6707d14c32c91ca59e231..cd41de5acd9a7ffb8ea10683e12d68334d4a2ddc 100644 (file)
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -43,7 +43,7 @@
 #include "solib-svr4.h"
 #include "prologue-value.h"
 #include "linux-tdep.h"
-#include "s390-tdep.h"
+#include "s390-linux-tdep.h"
 #include "auxv.h"
 
 #include "stap-probe.h"

diff --git a/gdb/s390-tdep.h b/gdb/s390-linux-tdep.h
similarity index 100%
rename from gdb/s390-tdep.h
rename to gdb/s390-linux-tdep.h