From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26751 invoked by alias); 14 May 2012 19:57:16 -0000 Received: (qmail 26682 invoked by uid 22791); 14 May 2012 19:57:13 -0000 X-SWARE-Spam-Status: No, hits=-3.2 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,TW_EG,TW_JR,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from usmamail.tilera.com (HELO USMAMAIL.TILERA.COM) (12.216.194.151) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 May 2012 19:56:51 +0000 Received: from farm-0002.internal.tilera.com (10.2.0.32) by USMAEXCH2.tad.internal.tilera.com (10.3.0.33) with Microsoft SMTP Server (TLS) id 14.0.694.0; Mon, 14 May 2012 15:56:50 -0400 Received: (from cmetcalf@localhost) by farm-0002.internal.tilera.com (8.13.8/8.12.11/Submit) id q4EJunEG007413; Mon, 14 May 2012 15:56:49 -0400 Message-ID: <201205141956.q4EJunEG007413@farm-0002.internal.tilera.com> From: Chris Metcalf Date: Mon, 14 May 2012 19:57:00 -0000 Subject: [PATCH 02/14] tile: Remove elf/ and create crti.S/crtn.S To: In-Reply-To: <4FB161CE.6070905@tilera.com> References: <4FB161CE.6070905@tilera.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-05/txt/msg00059.txt.bz2 This patches fixes up the tile startup files, moving elf/start.S up a directory level and implementing the required crti.S and crtn.S files based on the old initfini.c compiler output (hand-optimized to bum a couple of cycles). --- ChangeLog.tile | 11 +++ sysdeps/tile/Makefile | 5 - sysdeps/tile/crti.S | 111 ++++++++++++++++++++++++++++ sysdeps/tile/crtn.S | 55 ++++++++++++++ sysdeps/tile/{elf => }/start.S | 0 sysdeps/unix/sysv/linux/tile/nptl/Makefile | 5 - 6 files changed, 177 insertions(+), 10 deletions(-) create mode 100644 sysdeps/tile/crti.S create mode 100644 sysdeps/tile/crtn.S rename sysdeps/tile/{elf => }/start.S (100%) diff --git a/ChangeLog.tile b/ChangeLog.tile index 77e03b5..a8b2458 100644 --- a/ChangeLog.tile +++ b/ChangeLog.tile @@ -1,3 +1,14 @@ +2012-05-12 Chris Metcalf + + * sysdeps/tile/crti.S: New file, based on compiler output + for sysdeps/generic/initfini.c. + * sysdeps/tile/crtn.S: Likewise. + * sysdeps/tile/Makefile (CFLAGS-initfini.s): Remove variable. + * sysdeps/unix/sysv/linux/tile/nptl/Makefile + (CFLAGS-pt-initfini.s): Likewise. + * sysdeps/tile/elf/start.S: Moved to ... + * sysdeps/tile/start.S: ...here. + 2012-04-15 Mike Frysinger * sysdeps/unix/sysv/linux/tile/tilegx/register-dump.h: Include diff --git a/sysdeps/tile/Makefile b/sysdeps/tile/Makefile index 08c3385..3cd4d1e 100644 --- a/sysdeps/tile/Makefile +++ b/sysdeps/tile/Makefile @@ -11,8 +11,3 @@ ifeq ($(subdir),elf) # Extra shared linker files to link only into dl-allobjs.so. sysdep-rtld-routines += dl-start __tls_get_addr endif - -ifeq ($(subdir),csu) -# Avoid .cfi_startproc/endproc markers when creating init and fini pieces. -CFLAGS-initfini.s += -fno-asynchronous-unwind-tables -endif diff --git a/sysdeps/tile/crti.S b/sysdeps/tile/crti.S new file mode 100644 index 0000000..ccb4464 --- /dev/null +++ b/sysdeps/tile/crti.S @@ -0,0 +1,111 @@ +/* Special .init and .fini section support for tile. + Copyright (C) 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* crti.S puts a function prologue at the beginning of the .init and + .fini sections and defines global symbols for those addresses, so + they can be called as functions. The symbols _init and _fini are + magic and cause the linker to emit DT_INIT and DT_FINI. */ + +#include +#include + +#ifndef PREINIT_FUNCTION +# define PREINIT_FUNCTION __gmon_start__ +#endif + +#ifndef PREINIT_FUNCTION_WEAK +# define PREINIT_FUNCTION_WEAK 1 +#endif + +#if PREINIT_FUNCTION_WEAK + weak_extern (PREINIT_FUNCTION) +#else + .hidden PREINIT_FUNCTION +#endif + + .section .init,"ax",@progbits + .align 8 + .globl _init + .type _init, @function +_init: + { + move r29, sp + ADDI_PTR r28, sp, -REGSIZE + ST sp, lr + } + ADDI_PTR sp, sp, -(2 * REGSIZE) + ST r28, r29 +#if PREINIT_FUNCTION_WEAK + lnk r2 +0: +#ifdef __tilegx__ + { + moveli r1, hw1_last(_GLOBAL_OFFSET_TABLE_ - 0b) + moveli r0, hw1_last_got(PREINIT_FUNCTION) + } + { + shl16insli r1, r1, hw0(_GLOBAL_OFFSET_TABLE_ - 0b) + shl16insli r0, r0, hw0_got(PREINIT_FUNCTION) + } +#else + { + moveli r1, lo16(_GLOBAL_OFFSET_TABLE_ - 0b) + moveli r0, got_lo16(PREINIT_FUNCTION) + } + { + auli r1, r1, ha16(_GLOBAL_OFFSET_TABLE_ - 0b) + auli r0, r0, got_ha16(PREINIT_FUNCTION) + } +#endif + ADD_PTR r0, r0, r1 + ADD_PTR r0, r0, r2 + LD_PTR r0, r0 + BEQZ r0, .Lno_weak_fn +#endif + jal plt(PREINIT_FUNCTION) +.Lno_weak_fn: + + .section .fini,"ax",@progbits + .align 8 + .globl _fini + .type _fini, @function +_fini: + { + move r29, sp + ADDI_PTR r28, sp, -REGSIZE + ST sp, lr + } + ADDI_PTR sp, sp, -(2 * REGSIZE) + ST r28, r29 diff --git a/sysdeps/tile/crtn.S b/sysdeps/tile/crtn.S new file mode 100644 index 0000000..06931a1 --- /dev/null +++ b/sysdeps/tile/crtn.S @@ -0,0 +1,55 @@ +/* Special .init and .fini section support for tile. + Copyright (C) 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* crtn.S puts function epilogues in the .init and .fini sections + corresponding to the prologues in crti.S. */ + +#include + + .section .init,"ax",@progbits + ADDI_PTR r29, sp, (2 * REGSIZE) + { + ADDI_PTR sp, sp, (2 * REGSIZE) + LD lr, r29 + } + jrp lr + + .section .fini,"ax",@progbits + ADDI_PTR r29, sp, (2 * REGSIZE) + { + ADDI_PTR sp, sp, (2 * REGSIZE) + LD lr, r29 + } + jrp lr diff --git a/sysdeps/tile/elf/start.S b/sysdeps/tile/start.S similarity index 100% rename from sysdeps/tile/elf/start.S rename to sysdeps/tile/start.S diff --git a/sysdeps/unix/sysv/linux/tile/nptl/Makefile b/sysdeps/unix/sysv/linux/tile/nptl/Makefile index 79e0354..e98c9bd 100644 --- a/sysdeps/unix/sysv/linux/tile/nptl/Makefile +++ b/sysdeps/unix/sysv/linux/tile/nptl/Makefile @@ -1,7 +1,2 @@ # pull in __syscall_error routine libpthread-routines += sysdep - -ifeq ($(subdir),nptl) -# Avoid .cfi_startproc/endproc markers when creating init and fini pieces. -CFLAGS-pt-initfini.s += -fno-asynchronous-unwind-tables -endif -- 1.6.5.2