Re: libgcc sparc-rtems config on gcc head

[Rainer Orth <ro at CeBiTec dot Uni-Bielefeld dot DE>]

Hi Joel,

>> No, I'd like to avoid non-Solaris targets using Solaris config fragments
>> if at all possible.  AFAICS there's nothing Solaris-specific in
>> config/sparc/sol2-c[in].S.  If so, the simplest solution would be to
>> rename the files to crt[in].S.  On RTEMS, the generic crt[in].o rules in
>> Makefile.in would deal with building them, on Solaris I'd have to juggle
>> around the CUSTOM_CRTIN setting so it's only used on Solaris/x86.
>>
> I suspect this would take seconds for you and multiple
> revisions from me to match what you have in your head. :)
>
> Would you mind doing this?  I am happy to provide quick
> feedback.

sure, could you give this one a try (untested)?  Please note that it's a
git-style patch with renames, so you may have to perform those manually.

Thanks.
        Rainer


2011-11-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* config/i386/sol2-ci.S: Rename to ...
	* config/i386/crti.S: ... this.
	* config/i386/sol2-cn.S: Rename to ...
	* config/i386/crtn.S: ... this.
	* config/sparc/sol2-ci.S: Rename to ...
	* config/sparc/crti.S: ... this.
	* config/sparc/sol2-cn.S: Rename to ...
	* config/sparc/crtn.S: ... this.
	* config/t-sol2 (CUSTOM_CRTIN): Remove.
	(crti.o, crtn.o): Remove.

# HG changeset patch
# Parent 842d03d7a925718952de26cdcec4f361e68b956e
Use sol2-c[1n].S on more targets

diff --git a/libgcc/config/i386/sol2-ci.S b/libgcc/config/i386/crti.S
rename from libgcc/config/i386/sol2-ci.S
rename to libgcc/config/i386/crti.S
--- a/libgcc/config/i386/sol2-ci.S
+++ b/libgcc/config/i386/crti.S
@@ -1,4 +1,4 @@
-/* crti.s for Solaris 2, x86.
+/* crti.S for x86.
 
    Copyright (C) 1993, 2008, 2009 Free Software Foundation, Inc.
    Written By Fred Fish, Nov 1992
diff --git a/libgcc/config/i386/sol2-cn.S b/libgcc/config/i386/crtn.S
rename from libgcc/config/i386/sol2-cn.S
rename to libgcc/config/i386/crtn.S
--- a/libgcc/config/i386/sol2-cn.S
+++ b/libgcc/config/i386/crtn.S
@@ -1,4 +1,4 @@
-/* crtn.s for Solaris 2, x86.
+/* crtn.S for x86.
 
    Copyright (C) 1993, 2008, 2009 Free Software Foundation, Inc.
    Written By Fred Fish, Nov 1992
diff --git a/libgcc/config/sparc/sol2-ci.S b/libgcc/config/sparc/crti.S
rename from libgcc/config/sparc/sol2-ci.S
rename to libgcc/config/sparc/crti.S
--- a/libgcc/config/sparc/sol2-ci.S
+++ b/libgcc/config/sparc/crti.S
@@ -1,4 +1,4 @@
-! crti.s for solaris 2.0.
+! crti.S for SPARC
 
 !   Copyright (C) 1992, 2008, 2009, 2011 Free Software Foundation, Inc.
 !   Written By David Vinayak Henkel-Wallace, June 1992
diff --git a/libgcc/config/sparc/sol2-cn.S b/libgcc/config/sparc/crtn.S
rename from libgcc/config/sparc/sol2-cn.S
rename to libgcc/config/sparc/crtn.S
--- a/libgcc/config/sparc/sol2-cn.S
+++ b/libgcc/config/sparc/crtn.S
@@ -1,4 +1,4 @@
-! crtn.s for solaris 2.0.
+! crtn.S for SPARC
 
 !   Copyright (C) 1992, 2008, 2009, 2011 Free Software Foundation, Inc.
 !   Written By David Vinayak Henkel-Wallace, June 1992
diff --git a/libgcc/config/t-sol2 b/libgcc/config/t-sol2
--- a/libgcc/config/t-sol2
+++ b/libgcc/config/t-sol2
@@ -20,14 +20,8 @@
 gmon.o:	$(srcdir)/config/gmon-sol2.c
 	$(gcc_compile) -c $<
 
-CUSTOM_CRTIN = yes
-
 # Assemble startup files.
 crt1.o: $(srcdir)/config/$(cpu_type)/sol2-c1.S
 	$(crt_compile) -c $<
 gcrt1.o: $(srcdir)/config/$(cpu_type)/sol2-c1.S
 	$(crt_compile) -c -DGCRT1 $<
-crti.o: $(srcdir)/config/$(cpu_type)/sol2-ci.S
-	$(crt_compile) -c $<
-crtn.o: $(srcdir)/config/$(cpu_type)/sol2-cn.S
-	$(crt_compile) -c $<


-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University