From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14921 invoked by alias); 2 Sep 2004 22:13:48 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 14913 invoked from network); 2 Sep 2004 22:13:46 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 2 Sep 2004 22:13:46 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i82MDfS2008451 for ; Thu, 2 Sep 2004 18:13:46 -0400 Received: from localhost.redhat.com (porkchop.devel.redhat.com [172.16.58.2]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i82MDZ323009; Thu, 2 Sep 2004 18:13:40 -0400 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id CD3C228D2; Thu, 2 Sep 2004 18:12:22 -0400 (EDT) Message-ID: <41379AC6.90605@gnu.org> Date: Thu, 02 Sep 2004 22:13:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-GB; rv:1.4.1) Gecko/20040831 MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [commit] Let {TM,XM,NM}_FILE specify a path Content-Type: multipart/mixed; boundary="------------020706050801080700050207" X-SW-Source: 2004-09/txt/msg00048.txt.bz2 This is a multi-part message in MIME format. --------------020706050801080700050207 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 522 Hello, Many of the still existing TM files (the others are done for consistency) are just acting as an indirect include of another file. For instance, tm-nbsd.h #includes "solib.h". This patch tweaks configure.in so that a TM_FILE can explicitly specify any file (instead of having to pull it in via an #include) - that lets us eliminate both the indirection and the unnecessary config file. It then tweaks arm/nbsd.mt to make use of this, letting arm/tm-nbsd.h be eliminated. More to follow. committed, Andrew --------------020706050801080700050207 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 3426 2004-09-02 Andrew Cagney * configure.in: Let TM_FILE, XM_FILE and NAT_FILE specify a path. * configure: Re-generate. * config/arm/nbsd.mt (TM_FILE): Set to "solib.h". * config/arm/tm-nbsd.h: Delete file. Index: configure.in =================================================================== RCS file: /cvs/src/src/gdb/configure.in,v retrieving revision 1.168 diff -p -u -r1.168 configure.in --- configure.in 2 Sep 2004 17:22:05 -0000 1.168 +++ configure.in 2 Sep 2004 22:01:13 -0000 @@ -1520,7 +1520,10 @@ rm -f xm.h xm_h="" if test "${hostfile}" != ""; then xm_h=xm.h - GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}" + case "${hostfile}" in + xm-*.h ) GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}" ;; + * ) GDB_XM_FILE="${hostfile}" + esac files="${files} ${GDB_XM_FILE}" links="${links} xm.h" AC_DEFINE_UNQUOTED(GDB_XM_FILE, "${GDB_XM_FILE}") @@ -1531,7 +1534,10 @@ rm -f tm.h tm_h="" if test "${targetfile}" != ""; then tm_h=tm.h - GDB_TM_FILE="config/${gdb_target_cpu}/${targetfile}" + case "${targetfile}" in + tm-*.h ) GDB_TM_FILE="config/${gdb_host_cpu}/${targetfile}" ;; + * ) GDB_TM_FILE="${targetfile}" + esac files="${files} ${GDB_TM_FILE}" links="${links} tm.h" AC_DEFINE_UNQUOTED(GDB_TM_FILE, "${GDB_TM_FILE}") @@ -1542,7 +1548,10 @@ rm -f nm.h nm_h="" if test "${nativefile}" != ""; then nm_h=nm.h - GDB_NM_FILE="config/${gdb_host_cpu}/${nativefile}" + case "${nativefile}" in + nm-*.h ) GDB_NM_FILE="config/${gdb_host_cpu}/${nativefile}" ;; + * ) GDB_NM_FILE="${nativefile}" + esac files="${files} ${GDB_NM_FILE}" links="${links} nm.h" AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}") Index: config/arm/nbsd.mt =================================================================== RCS file: /cvs/src/src/gdb/config/arm/nbsd.mt,v retrieving revision 1.6 diff -p -u -r1.6 nbsd.mt --- config/arm/nbsd.mt 14 Nov 2003 20:45:11 -0000 1.6 +++ config/arm/nbsd.mt 2 Sep 2004 22:01:13 -0000 @@ -1,3 +1,3 @@ # Target: ARM running NetBSD TDEPFILES= arm-tdep.o armnbsd-tdep.o solib.o solib-svr4.o nbsd-tdep.o -TM_FILE=tm-nbsd.h +TM_FILE=solib.h Index: config/arm/tm-nbsd.h =================================================================== RCS file: config/arm/tm-nbsd.h diff -N config/arm/tm-nbsd.h --- config/arm/tm-nbsd.h 14 Nov 2003 20:45:12 -0000 1.9 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -/* Macro definitions for ARM running under NetBSD. - Copyright 2003 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. */ - -#ifndef TM_NBSD_H -#define TM_NBSD_H - -#include "solib.h" - -#endif /* TM_NBSD_H */ --------------020706050801080700050207--