From: Rainer Orth Date: Fri, 4 Nov 2011 11:54:17 +0000 (+0000) Subject: Use sol2-c[1n].S on more targets X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d385f772fee7fb9a56422d3aab9a7456da637577;p=gcc.git 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 --- diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index d22a98ee4df..cd929fa4671 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/crti.S b/libgcc/config/i386/crti.S new file mode 100644 index 00000000000..76fd35869b5 --- /dev/null +++ b/libgcc/config/i386/crti.S @@ -0,0 +1,40 @@ +/* crti.S for x86. + + Copyright (C) 1993, 2008, 2009 Free Software Foundation, Inc. + Written By Fred Fish, Nov 1992 + +This file 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 3, or (at your option) any +later version. + +This file 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. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + + +/* This file just supplies labeled starting points for the .init and .fini + sections. It is linked in before the values-Xx.o files and also before + crtbegin.o. */ + + .ident "GNU C crti.s" + + .section .init + .globl _init + .type _init,@function +_init: + + .section .fini + .globl _fini + .type _fini,@function +_fini: diff --git a/libgcc/config/i386/crtn.S b/libgcc/config/i386/crtn.S new file mode 100644 index 00000000000..572e9cd931b --- /dev/null +++ b/libgcc/config/i386/crtn.S @@ -0,0 +1,35 @@ +/* crtn.S for x86. + + Copyright (C) 1993, 2008, 2009 Free Software Foundation, Inc. + Written By Fred Fish, Nov 1992 + +This file 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 3, or (at your option) any +later version. + +This file 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. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + + +/* This file just supplies returns for the .init and .fini sections. It is + linked in after all other files. */ + + .ident "GNU C crtn.o" + + .section .init + ret $0x0 + + .section .fini + ret $0x0 diff --git a/libgcc/config/i386/sol2-ci.S b/libgcc/config/i386/sol2-ci.S deleted file mode 100644 index 61e1436f560..00000000000 --- a/libgcc/config/i386/sol2-ci.S +++ /dev/null @@ -1,40 +0,0 @@ -/* crti.s for Solaris 2, x86. - - Copyright (C) 1993, 2008, 2009 Free Software Foundation, Inc. - Written By Fred Fish, Nov 1992 - -This file 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 3, or (at your option) any -later version. - -This file 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. - -Under Section 7 of GPL version 3, you are granted additional -permissions described in the GCC Runtime Library Exception, version -3.1, as published by the Free Software Foundation. - -You should have received a copy of the GNU General Public License and -a copy of the GCC Runtime Library Exception along with this program; -see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -. */ - - -/* This file just supplies labeled starting points for the .init and .fini - sections. It is linked in before the values-Xx.o files and also before - crtbegin.o. */ - - .ident "GNU C crti.s" - - .section .init - .globl _init - .type _init,@function -_init: - - .section .fini - .globl _fini - .type _fini,@function -_fini: diff --git a/libgcc/config/i386/sol2-cn.S b/libgcc/config/i386/sol2-cn.S deleted file mode 100644 index 993675d2341..00000000000 --- a/libgcc/config/i386/sol2-cn.S +++ /dev/null @@ -1,35 +0,0 @@ -/* crtn.s for Solaris 2, x86. - - Copyright (C) 1993, 2008, 2009 Free Software Foundation, Inc. - Written By Fred Fish, Nov 1992 - -This file 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 3, or (at your option) any -later version. - -This file 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. - -Under Section 7 of GPL version 3, you are granted additional -permissions described in the GCC Runtime Library Exception, version -3.1, as published by the Free Software Foundation. - -You should have received a copy of the GNU General Public License and -a copy of the GCC Runtime Library Exception along with this program; -see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -. */ - - -/* This file just supplies returns for the .init and .fini sections. It is - linked in after all other files. */ - - .ident "GNU C crtn.o" - - .section .init - ret $0x0 - - .section .fini - ret $0x0 diff --git a/libgcc/config/sparc/crti.S b/libgcc/config/sparc/crti.S new file mode 100644 index 00000000000..a5c1da5e86b --- /dev/null +++ b/libgcc/config/sparc/crti.S @@ -0,0 +1,77 @@ +! crti.S for SPARC + +! Copyright (C) 1992, 2008, 2009, 2011 Free Software Foundation, Inc. +! Written By David Vinayak Henkel-Wallace, June 1992 +! +! This file 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 3, or (at your option) any +! later version. +! +! This file 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. +! +! Under Section 7 of GPL version 3, you are granted additional +! permissions described in the GCC Runtime Library Exception, version +! 3.1, as published by the Free Software Foundation. +! +! You should have received a copy of the GNU General Public License and +! a copy of the GCC Runtime Library Exception along with this program; +! see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +! . + +! This file just make a stack frame for the contents of the .fini and +! .init sections. Users may put any desired instructions in those +! sections. + +! This file is linked in before the Values-Xx.o files and also before +! crtbegin, with which perhaps it should be merged. + + .section ".init" + .proc 022 + .global _init + .type _init,#function + .align 4 +_init: +#ifdef _FLAT +#ifdef __sparcv9 + stx %i7, [%sp+2167] + add %sp, -176, %sp +#else + st %i7, [%sp+60] + add %sp, -96, %sp +#endif + mov %o7, %i7 +#else +#ifdef __sparcv9 + save %sp, -176, %sp +#else + save %sp, -96, %sp +#endif +#endif + + + .section ".fini" + .proc 022 + .global _fini + .type _fini,#function + .align 4 +_fini: +#ifdef _FLAT +#ifdef __sparcv9 + stx %i7, [%sp+2167] + add %sp, -176, %sp +#else + st %i7, [%sp+60] + add %sp, -96, %sp +#endif + mov %o7, %i7 +#else +#ifdef __sparcv9 + save %sp, -176, %sp +#else + save %sp, -96, %sp +#endif +#endif diff --git a/libgcc/config/sparc/crtn.S b/libgcc/config/sparc/crtn.S new file mode 100644 index 00000000000..1084628c6f6 --- /dev/null +++ b/libgcc/config/sparc/crtn.S @@ -0,0 +1,63 @@ +! crtn.S for SPARC + +! Copyright (C) 1992, 2008, 2009, 2011 Free Software Foundation, Inc. +! Written By David Vinayak Henkel-Wallace, June 1992 +! +! This file 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 3, or (at your option) any +! later version. +! +! This file 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. +! +! Under Section 7 of GPL version 3, you are granted additional +! permissions described in the GCC Runtime Library Exception, version +! 3.1, as published by the Free Software Foundation. +! +! You should have received a copy of the GNU General Public License and +! a copy of the GCC Runtime Library Exception along with this program; +! see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +! . + +! This file just makes sure that the .fini and .init sections do in +! fact return. Users may put any desired instructions in those sections. +! This file is the last thing linked into any executable. + + .section ".init" + .align 4 +#ifdef _FLAT + mov %i7, %o7 +#ifdef __sparcv9 + ldx [%sp+2343], %i7 + sub %sp, -176, %sp +#else + ld [%sp+156], %i7 + sub %sp, -96, %sp +#endif +#else + restore +#endif + jmp %o7+8 + nop + + .section ".fini" + .align 4 +#ifdef _FLAT + mov %i7, %o7 +#ifdef __sparcv9 + ldx [%sp+2343], %i7 + sub %sp, -176, %sp +#else + ld [%sp+156], %i7 + sub %sp, -96, %sp +#endif +#else + restore +#endif + jmp %o7+8 + nop + +! Th-th-th-that is all folks! diff --git a/libgcc/config/sparc/sol2-ci.S b/libgcc/config/sparc/sol2-ci.S deleted file mode 100644 index a89cc20c86f..00000000000 --- a/libgcc/config/sparc/sol2-ci.S +++ /dev/null @@ -1,77 +0,0 @@ -! crti.s for solaris 2.0. - -! Copyright (C) 1992, 2008, 2009, 2011 Free Software Foundation, Inc. -! Written By David Vinayak Henkel-Wallace, June 1992 -! -! This file 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 3, or (at your option) any -! later version. -! -! This file 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. -! -! Under Section 7 of GPL version 3, you are granted additional -! permissions described in the GCC Runtime Library Exception, version -! 3.1, as published by the Free Software Foundation. -! -! You should have received a copy of the GNU General Public License and -! a copy of the GCC Runtime Library Exception along with this program; -! see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -! . - -! This file just make a stack frame for the contents of the .fini and -! .init sections. Users may put any desired instructions in those -! sections. - -! This file is linked in before the Values-Xx.o files and also before -! crtbegin, with which perhaps it should be merged. - - .section ".init" - .proc 022 - .global _init - .type _init,#function - .align 4 -_init: -#ifdef _FLAT -#ifdef __sparcv9 - stx %i7, [%sp+2167] - add %sp, -176, %sp -#else - st %i7, [%sp+60] - add %sp, -96, %sp -#endif - mov %o7, %i7 -#else -#ifdef __sparcv9 - save %sp, -176, %sp -#else - save %sp, -96, %sp -#endif -#endif - - - .section ".fini" - .proc 022 - .global _fini - .type _fini,#function - .align 4 -_fini: -#ifdef _FLAT -#ifdef __sparcv9 - stx %i7, [%sp+2167] - add %sp, -176, %sp -#else - st %i7, [%sp+60] - add %sp, -96, %sp -#endif - mov %o7, %i7 -#else -#ifdef __sparcv9 - save %sp, -176, %sp -#else - save %sp, -96, %sp -#endif -#endif diff --git a/libgcc/config/sparc/sol2-cn.S b/libgcc/config/sparc/sol2-cn.S deleted file mode 100644 index 08862a78e02..00000000000 --- a/libgcc/config/sparc/sol2-cn.S +++ /dev/null @@ -1,63 +0,0 @@ -! crtn.s for solaris 2.0. - -! Copyright (C) 1992, 2008, 2009, 2011 Free Software Foundation, Inc. -! Written By David Vinayak Henkel-Wallace, June 1992 -! -! This file 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 3, or (at your option) any -! later version. -! -! This file 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. -! -! Under Section 7 of GPL version 3, you are granted additional -! permissions described in the GCC Runtime Library Exception, version -! 3.1, as published by the Free Software Foundation. -! -! You should have received a copy of the GNU General Public License and -! a copy of the GCC Runtime Library Exception along with this program; -! see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -! . - -! This file just makes sure that the .fini and .init sections do in -! fact return. Users may put any desired instructions in those sections. -! This file is the last thing linked into any executable. - - .section ".init" - .align 4 -#ifdef _FLAT - mov %i7, %o7 -#ifdef __sparcv9 - ldx [%sp+2343], %i7 - sub %sp, -176, %sp -#else - ld [%sp+156], %i7 - sub %sp, -96, %sp -#endif -#else - restore -#endif - jmp %o7+8 - nop - - .section ".fini" - .align 4 -#ifdef _FLAT - mov %i7, %o7 -#ifdef __sparcv9 - ldx [%sp+2343], %i7 - sub %sp, -176, %sp -#else - ld [%sp+156], %i7 - sub %sp, -96, %sp -#endif -#else - restore -#endif - jmp %o7+8 - nop - -! Th-th-th-that is all folks! diff --git a/libgcc/config/t-sol2 b/libgcc/config/t-sol2 index 09bbdf646ec..cb511abd2fc 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 $<