From: Chris Metcalf <cmetcalf@tilera.com>
To: <libc-ports@sourceware.org>
Subject: [PATCH 02/14] tile: Remove elf/ and create crti.S/crtn.S
Date: Mon, 14 May 2012 19:57:00 -0000 [thread overview]
Message-ID: <201205141956.q4EJunEG007413@farm-0002.internal.tilera.com> (raw)
In-Reply-To: <4FB161CE.6070905@tilera.com>
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 <cmetcalf@tilera.com>
+
+ * 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 <vapier@gentoo.org>
* 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
+ <http://www.gnu.org/licenses/>. */
+
+/* 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 <libc-symbols.h>
+#include <sysdep.h>
+
+#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
+ <http://www.gnu.org/licenses/>. */
+
+/* crtn.S puts function epilogues in the .init and .fini sections
+ corresponding to the prologues in crti.S. */
+
+#include <sysdep.h>
+
+ .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
next prev parent reply other threads:[~2012-05-14 19:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-14 19:49 [PATCH 00/14] Updates to tile architecture for 2.16 Chris Metcalf
2012-05-14 19:56 ` [PATCH 01/14] Add _SNSECONDS_T_TYPE for linux-generic Chris Metcalf
2012-05-14 19:57 ` [PATCH 04/14] tile: remove stale #define of ELF_MACHINE_PLTREL_OVERLAP Chris Metcalf
2012-05-14 19:57 ` [PATCH 03/14] tile: update pthread_attr_t and struct siginfo names Chris Metcalf
2012-05-14 19:57 ` Chris Metcalf [this message]
2012-05-14 19:58 ` [PATCH 07/14] tile: avoid using _LP64 Chris Metcalf
2012-05-14 19:58 ` [PATCH 05/14] linux-generic: add wordsize-32 version of prlimit64/fanotify syscalls Chris Metcalf
2012-05-14 19:58 ` [PATCH 06/14] tile: support stackguard-macros.h header Chris Metcalf
2012-05-14 19:58 ` [PATCH 08/14] tile: allow memcpy(p, p, n) without corrupting memory at "p" Chris Metcalf
2012-05-14 19:59 ` [PATCH 09/14] tilegx: small performance fix for string routines Chris Metcalf
2012-05-14 19:59 ` [PATCH 11/14] tile: fix bug in CFI definitions for clone.S Chris Metcalf
2012-05-14 19:59 ` [PATCH 10/14] tile: fix broken TLS_GD macros Chris Metcalf
2012-05-14 19:59 ` [PATCH 12/14] tile: add include <features.h> to <sys/dataplane.h> Chris Metcalf
2012-05-14 20:00 ` [PATCH 13/14] tile: align stack for tilegx32 Chris Metcalf
2012-05-14 20:02 ` [PATCH 14/14] tile: add abilist files Chris Metcalf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201205141956.q4EJunEG007413@farm-0002.internal.tilera.com \
--to=cmetcalf@tilera.com \
--cc=libc-ports@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).