From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cgen-return-2303-listarch-cgen=sources.redhat.com@sourceware.org>
Received: (qmail 10516 invoked by alias); 24 Jul 2009 17:53:13 -0000
Received: (qmail 10508 invoked by uid 22791); 24 Jul 2009 17:53:13 -0000
X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 	tests=AWL,BAYES_00,HK_OBFDOM,SPF_PASS
X-Spam-Check-By: sourceware.org
Received: from mail-ew0-f217.google.com (HELO mail-ew0-f217.google.com) (209.85.219.217)     by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 24 Jul 2009 17:53:01 +0000
Received: by ewy17 with SMTP id 17so1834847ewy.24         for <cgen@sourceware.org>; Fri, 24 Jul 2009 10:52:59 -0700 (PDT)
Received: by 10.210.79.3 with SMTP id c3mr4551123ebb.84.1248457978803;         Fri, 24 Jul 2009 10:52:58 -0700 (PDT)
Received: from ?192.168.2.99? (cpc2-cmbg8-0-0-cust61.cmbg.cable.ntl.com [82.6.108.62])         by mx.google.com with ESMTPS id 5sm1479567eyh.18.2009.07.24.10.52.55         (version=SSLv3 cipher=RC4-MD5);         Fri, 24 Jul 2009 10:52:56 -0700 (PDT)
Message-ID: <4A69F804.1020107@gmail.com>
Date: Fri, 24 Jul 2009 17:53:00 -0000
From: Dave Korn <dave.korn.cygwin@googlemail.com>
User-Agent: Thunderbird 2.0.0.17 (Windows/20080914)
MIME-Version: 1.0
To: Doug Evans <dje@sebabeach.org>
CC: fche@redhat.com, cgen@sourceware.org
Subject: Re: remove dups from cgen/cpu?
References: <20090709160851.B60D36E3D1@sebabeach.org>
In-Reply-To: <20090709160851.B60D36E3D1@sebabeach.org>
Content-Type: multipart/mixed;  boundary="------------090400010407020605000108"
Mailing-List: contact cgen-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <cgen.sourceware.org>
List-Subscribe: <mailto:cgen-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/cgen/>
List-Post: <mailto:cgen@sourceware.org>
List-Help: <mailto:cgen-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cgen-owner@sourceware.org
X-SW-Source: 2009-q3/txt/msg00037.txt.bz2

This is a multi-part message in MIME format.
--------------090400010407020605000108
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-length: 379

Doug Evans wrote:
> Hi.
> 
> I think it's time to remove the duplicates in src/cgen/cpu
> and keep just the copies in src/cpu.
> 
> Any objections?

  None here, but how about doing this while we're at it?

cgen/ChangeLog:

	* Makefile.am (ARCHFILE): Search both cpu/ subdirs, with priority
	to top-level cpu/ over cgen/cpu/.
	* Makefile.in: Regenerate.

    cheers,
      DaveK

--------------090400010407020605000108
Content-Type: text/x-c;
 name="cgen-which-cpu-dir.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cgen-which-cpu-dir.diff"
Content-length: 669

Index: cgen/Makefile.am
===================================================================
RCS file: /cvs/src/src/cgen/Makefile.am,v
retrieving revision 1.8
diff -p -u -r1.8 Makefile.am
--- cgen/Makefile.am	13 Jul 2009 20:55:21 -0000	1.8
+++ cgen/Makefile.am	24 Jul 2009 17:46:39 -0000
@@ -7,7 +7,7 @@ SUBDIRS = doc testsuite
 GUILE = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`" -l $(srcdir)/guile.scm -s
 CGENFLAGS = -v
 ARCH = @arch@
-ARCHFILE = $(srcroot)/cpu/$(ARCH).cpu
+ARCHFILE = $(firstword $(wildcard $(srcroot)/cpu/$(ARCH).cpu $(srcroot)/cgen/cpu/$(ARCH).cpu))
 
 # for various utility rules
 MACHS = all

--------------090400010407020605000108--