From d385f772fee7fb9a56422d3aab9a7456da637577 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 4 Nov 2011 11:54:17 +0000 Subject: [PATCH] Use sol2-c[1n].S on more targets * 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. From-SVN: r180941 --- libgcc/ChangeLog | 13 +++++++++++++ libgcc/config/i386/{sol2-ci.S => crti.S} | 2 +- libgcc/config/i386/{sol2-cn.S => crtn.S} | 2 +- libgcc/config/sparc/{sol2-ci.S => crti.S} | 2 +- libgcc/config/sparc/{sol2-cn.S => crtn.S} | 2 +- libgcc/config/t-sol2 | 6 ------ 6 files changed, 17 insertions(+), 10 deletions(-) rename libgcc/config/i386/{sol2-ci.S => crti.S} (97%) rename libgcc/config/i386/{sol2-cn.S => crtn.S} (97%) rename libgcc/config/sparc/{sol2-ci.S => crti.S} (98%) rename libgcc/config/sparc/{sol2-cn.S => crtn.S} (98%) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index d22a98ee4df3..cd929fa46717 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,16 @@ +2011-11-04 Rainer Orth + + * 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. + 2011-11-04 Tristan Gingold * config/ia64/fde-vms.c: Do not include md-unwind-support.h diff --git a/libgcc/config/i386/sol2-ci.S b/libgcc/config/i386/crti.S similarity index 97% rename from libgcc/config/i386/sol2-ci.S rename to libgcc/config/i386/crti.S index 61e1436f5606..76fd35869b5d 100644 --- 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 similarity index 97% rename from libgcc/config/i386/sol2-cn.S rename to libgcc/config/i386/crtn.S index 993675d2341e..572e9cd931b2 100644 --- 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 similarity index 98% rename from libgcc/config/sparc/sol2-ci.S rename to libgcc/config/sparc/crti.S index a89cc20c86f5..a5c1da5e86b5 100644 --- 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 similarity index 98% rename from libgcc/config/sparc/sol2-cn.S rename to libgcc/config/sparc/crtn.S index 08862a78e02e..1084628c6f68 100644 --- 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 index 09bbdf646ecf..cb511abd2fcf 100644 --- 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 $<