remove dups from cgen/cpu?

remove dups from cgen/cpu?

[Doug Evans]

Hi.

I think it's time to remove the duplicates in src/cgen/cpu
and keep just the copies in src/cpu.

Any objections?

[Are there any that Redhat wants to keep in src/cgen/cpu,
at least for now?]

[Some files, e.g. sh*, have signficant differences.
I was going to leave resolving those for another pass,
and just do the ones with no or simple differences first.]

Re: remove dups from cgen/cpu?

[Dave Brolley]

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?
>
> [Are there any that Redhat wants to keep in src/cgen/cpu,
> at least for now?]
>   
I have no objections to the removal of duplicates. Although it has been 
explained to me several times, I keep forgetting why we needed src/cpu 
vs src/cgen/cpu at all.
> [Some files, e.g. sh*, have signficant differences.
> I was going to leave resolving those for another pass,
> and just do the ones with no or simple differences first.]
>   
Wrt sh, the work in src/cpu is most up to date.

Dave

Re: remove dups from cgen/cpu?

[Doug Evans]

Dave Brolley wrote:
> I have no objections to the removal of duplicates. Although it has 
> been explained to me several times, I keep forgetting why we needed 
> src/cpu vs src/cgen/cpu at all.

They're source code that go into building the programs and we don't ship 
src/cgen with binutils, et.al.

>> [Some files, e.g. sh*, have signficant differences.
>> I was going to leave resolving those for another pass,
>> and just do the ones with no or simple differences first.]
>>   
> Wrt sh, the work in src/cpu is most up to date.

Thanks.

Re: remove dups from cgen/cpu?

[Dave Korn]

[-- Attachment #1: Type: text/plain, Size: 379 bytes --]

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

[-- Attachment #2: cgen-which-cpu-dir.diff --]
[-- Type: text/x-c, Size: 669 bytes --]

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