From d91787632abd4c9bb5db0be1bae614243b3abb58 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 27 Apr 2007 13:19:48 +0000 Subject: [PATCH] * configure.host (rs6000-*-*): Merge with powerpc-*-aix* rules. * configure.tgt (rs6000-*-*): Likewise. * config/rs6000/aix4.mh: Delete file. * config/rs6000/aix4.mt: Delete file. * config/rs6000/rs6000.mh: Delete file. * config/rs6000/rs6000.mt: Delete file. * config/powerpc/nm-aix.h: Delete file. * config/powerpc/aix.mh (NAT_FILE): Set to config/rs6000/nm-rs6000.h. --- gdb/ChangeLog | 12 ++++++++++++ gdb/config/powerpc/aix.mh | 2 +- gdb/config/powerpc/nm-aix.h | 22 ---------------------- gdb/config/rs6000/aix4.mh | 9 --------- gdb/config/rs6000/aix4.mt | 3 --- gdb/config/rs6000/rs6000.mh | 9 --------- gdb/config/rs6000/rs6000.mt | 3 --- gdb/configure.host | 8 +++----- gdb/configure.tgt | 8 +++----- 9 files changed, 19 insertions(+), 57 deletions(-) delete mode 100644 gdb/config/powerpc/nm-aix.h delete mode 100644 gdb/config/rs6000/aix4.mh delete mode 100644 gdb/config/rs6000/aix4.mt delete mode 100644 gdb/config/rs6000/rs6000.mh delete mode 100644 gdb/config/rs6000/rs6000.mt diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 993944406fb..7cc195fcac9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2007-04-27 Ulrich Weigand + + * configure.host (rs6000-*-*): Merge with powerpc-*-aix* rules. + * configure.tgt (rs6000-*-*): Likewise. + * config/rs6000/aix4.mh: Delete file. + * config/rs6000/aix4.mt: Delete file. + * config/rs6000/rs6000.mh: Delete file. + * config/rs6000/rs6000.mt: Delete file. + + * config/powerpc/nm-aix.h: Delete file. + * config/powerpc/aix.mh (NAT_FILE): Set to config/rs6000/nm-rs6000.h. + 2007-04-27 Ulrich Weigand * aix-thread.c (fill_sprs32): Change argument types to "uint32_t *". diff --git a/gdb/config/powerpc/aix.mh b/gdb/config/powerpc/aix.mh index 9ee2f2fb7bf..ac5276f5564 100644 --- a/gdb/config/powerpc/aix.mh +++ b/gdb/config/powerpc/aix.mh @@ -1,6 +1,6 @@ # Host: IBM PowerPC running AIX -NAT_FILE= nm-aix.h +NAT_FILE= config/rs6000/nm-rs6000.h # aix-thread.o is not listed in NATDEPFILES as it is pulled in by configure. NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o \ diff --git a/gdb/config/powerpc/nm-aix.h b/gdb/config/powerpc/nm-aix.h deleted file mode 100644 index 7f7d1333671..00000000000 --- a/gdb/config/powerpc/nm-aix.h +++ /dev/null @@ -1,22 +0,0 @@ -/* IBM PowerPC native-dependent macros for GDB, the GNU debugger. - Copyright 1995, 1996, 2007 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. */ - -#include "rs6000/nm-rs6000.h" - diff --git a/gdb/config/rs6000/aix4.mh b/gdb/config/rs6000/aix4.mh deleted file mode 100644 index f3164224e42..00000000000 --- a/gdb/config/rs6000/aix4.mh +++ /dev/null @@ -1,9 +0,0 @@ -# Host: IBM RS/6000 running AIX4 - -NAT_FILE= nm-rs6000.h -NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o \ - xcoffsolib.o - -# When compiled with cc, for debugging, this argument should be passed. -# We have no idea who our current compiler is though, so we skip it. -# MH_CFLAGS = -bnodelcsect diff --git a/gdb/config/rs6000/aix4.mt b/gdb/config/rs6000/aix4.mt deleted file mode 100644 index 0729ffab582..00000000000 --- a/gdb/config/rs6000/aix4.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: IBM RS/6000 running AIX4 -TDEPFILES= rs6000-tdep.o xcoffread.o ppc-sysv-tdep.o solib.o solib-svr4.o -DEPRECATED_TM_FILE= config/rs6000/tm-rs6000.h diff --git a/gdb/config/rs6000/rs6000.mh b/gdb/config/rs6000/rs6000.mh deleted file mode 100644 index e518975a961..00000000000 --- a/gdb/config/rs6000/rs6000.mh +++ /dev/null @@ -1,9 +0,0 @@ -# Host: IBM RS/6000 running AIX - -NAT_FILE= nm-rs6000.h -NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o \ - xcoffsolib.o - -# When compiled with cc, for debugging, this argument should be passed. -# We have no idea who our current compiler is though, so we skip it. -# MH_CFLAGS = -bnodelcsect diff --git a/gdb/config/rs6000/rs6000.mt b/gdb/config/rs6000/rs6000.mt deleted file mode 100644 index 02c22304d53..00000000000 --- a/gdb/config/rs6000/rs6000.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: IBM RS/6000 running AIX -TDEPFILES= rs6000-tdep.o xcoffread.o ppc-sysv-tdep.o solib.o solib-svr4.o -DEPRECATED_TM_FILE= tm-rs6000.h diff --git a/gdb/configure.host b/gdb/configure.host index ba3354a8e89..e8258d591b8 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -44,7 +44,7 @@ i[34567]86*) gdb_host_cpu=i386 ;; m68*) gdb_host_cpu=m68k ;; m88*) gdb_host_cpu=m88k ;; mips*) gdb_host_cpu=mips ;; -powerpc*) gdb_host_cpu=powerpc ;; +powerpc* | rs6000) gdb_host_cpu=powerpc ;; sparcv9 | sparc64) gdb_host_cpu=sparc ;; s390*) gdb_host_cpu=s390 ;; sh*) gdb_host_cpu=sh ;; @@ -118,7 +118,8 @@ mips*-*-netbsd* | mips*-*-knetbsd*-gnu) gdb_host=nbsd ;; mips64*-*-openbsd*) gdb_host=obsd64 ;; -powerpc-*-aix*) gdb_host=aix ;; +powerpc-*-aix* | rs6000-*-*) + gdb_host=aix ;; powerpc-*-linux*) gdb_host=linux ;; powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu) gdb_host=nbsd ;; @@ -132,9 +133,6 @@ powerpc64-*-linux*) gdb_host=ppc64-linux fi ;; -rs6000-*-aix4*) gdb_host=aix4 ;; -rs6000-*-*) gdb_host=rs6000 ;; - s390*-*-*) gdb_host=s390 ;; sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu) diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 3402444c2eb..2f843f88060 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -38,7 +38,7 @@ m68hc11*|m6811*) gdb_target_cpu=m68hc11 ;; m68*) gdb_target_cpu=m68k ;; m88*) gdb_target_cpu=m88k ;; mips*) gdb_target_cpu=mips ;; -powerpc*) gdb_target_cpu=powerpc ;; +powerpc* | rs6000) gdb_target_cpu=powerpc ;; sparc*) gdb_target_cpu=sparc ;; thumb*) gdb_target_cpu=arm ;; s390*) gdb_target_cpu=s390 ;; @@ -171,7 +171,8 @@ mt-*-*) gdb_target=mt ;; powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu) gdb_target=nbsd ;; powerpc-*-openbsd*) gdb_target=obsd ;; -powerpc-*-aix*) gdb_target=aix ;; +powerpc-*-aix* | rs6000-*-*) + gdb_target=aix ;; powerpc-*-linux*) gdb_target=linux build_gdbserver=yes ;; @@ -184,9 +185,6 @@ powerpc*-*-*) if test -f ../sim/ppc/Makefile; then gdb_target=ppc-eabi fi ;; -rs6000-*-aix4*) gdb_target=aix4 ;; -rs6000-*-*) gdb_target=rs6000 ;; - s390*-*-*) gdb_target=s390 build_gdbserver=yes ;; -- 2.30.2