]> sourceware.org Git - glibc.git/commitdiff
git://sourceware.org / glibc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2bcc53a)
Rework sparc PIC macros so crt{i,n}.S can use them too.
authorDavid S. Miller <davem@davemloft.net>
Sun, 19 Feb 2012 06:31:42 +0000 (22:31 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 19 Feb 2012 06:31:42 +0000 (22:31 -0800)
* sysdeps/unix/sparc/sysdep.h (SPARC_PIC_THUNK): New macro.
(SETUP_PIC_REG): Use SPARC_PIC_THUNK and don't save and restore
%o7 across the call.
(SETUP_PIC_REG_LEAF): Do %o7 save/restore in this new macro
instead.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Use
SETUP_PIC_REG_LEAF.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/sparc/crti.S: Use SETUP_PIC_REG.
* sysdeps/sparc/crtn.S: Likewise.

ChangeLog patch | blob | blame | history
sysdeps/sparc/crti.S patch | blob | blame | history
sysdeps/unix/sparc/sysdep.h patch | blob | blame | history
sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h patch | blob | blame | history
sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index da9a1672b0ccf1ef8fe890510ddee6928bd4ca90..fee48a2591b266cf1e047e174850cc61c17b1112 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-02-18  David S. Miller  <davem@davemloft.net>
+
+       * sysdeps/unix/sparc/sysdep.h (SPARC_PIC_THUNK): New macro.
+       (SETUP_PIC_REG): Use SPARC_PIC_THUNK and don't save and restore
+       %o7 across the call.
+       (SETUP_PIC_REG_LEAF): Do %o7 save/restore in this new macro
+       instead.
+       * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Use
+       SETUP_PIC_REG_LEAF.
+       * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
+       * sysdeps/sparc/crti.S: Use SETUP_PIC_REG.
+       * sysdeps/sparc/crtn.S: Likewise.
+
 2012-02-17  Ulrich Drepper  <drepper@gmail.com>
 
        * aout/Makefile: Remove.
diff --git a/sysdeps/sparc/crti.S b/sysdeps/sparc/crti.S
index adb1b29557a86c1e133895e7858968f4cccf00aa..6ec4e9a5b38d5c69d6448a89154360139404e5d4 100644 (file)
--- a/sysdeps/sparc/crti.S
+++ b/sysdeps/sparc/crti.S
@@ -70,9 +70,7 @@
 _init:
        save            %sp, -STACKFRAME_SIZE, %sp
 #if PREINIT_FUNCTION_WEAK
-       sethi           %hi(_GLOBAL_OFFSET_TABLE_-4), %l7
-       call            __sparc_get_pc_thunk.l7
-        add            %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7
+       SETUP_PIC_REG(l7)
        sethi           %hi(PREINIT_FUNCTION), %g1
        or              %g1, %lo(PREINIT_FUNCTION), %g1
        GOT_LOAD        [%l7 + %g1], %g1
@@ -93,12 +91,3 @@ _init:
        .type           _fini, @function
 _fini:
        save            %sp, -STACKFRAME_SIZE, %sp
-
-       .section        .text.__sparc_get_pc_thunk.l7,"axG",@progbits,__sparc_get_pc_thunk.l7,comdat
-       .p2align        2
-       .weak           __sparc_get_pc_thunk.l7
-       .hidden         __sparc_get_pc_thunk.l7
-       .type           __sparc_get_pc_thunk.l7, #function
-__sparc_get_pc_thunk.l7:
-       jmp             %o7 + 8
-        add            %o7, %l7, %l7
diff --git a/sysdeps/unix/sparc/sysdep.h b/sysdeps/unix/sparc/sysdep.h
index fe8b75a0e77192d86d2493750391b626bfdd9394..10d561e789b8e56bbde0774cb4240e8051be9e33 100644 (file)
--- a/sysdeps/unix/sparc/sysdep.h
+++ b/sysdeps/unix/sparc/sysdep.h
@@ -26,8 +26,7 @@
    C name space.  Make sure we use an innocuous name.  */
 #define        syscall_error   C_SYMBOL_NAME(__syscall_error)
 
-#ifdef PIC
-#define SETUP_PIC_REG(reg, tmp)                                                \
+#define SPARC_PIC_THUNK(reg)                                           \
        .ifndef __sparc_get_pc_thunk.reg;                               \
        .section .text.__sparc_get_pc_thunk.reg,"axG",@progbits,__sparc_get_pc_thunk.reg,comdat; \
        .align   32;                                                    \
@@ -38,13 +37,21 @@ __sparc_get_pc_thunk.reg:                                           \
        jmp     %o7 + 8;                                                \
         add    %o7, %reg, %##reg;                                      \
        .previous;                                                      \
-       .endif;                                                         \
+       .endif;
+
+#define SETUP_PIC_REG(reg)                                             \
+       SPARC_PIC_THUNK(reg)                                            \
+       sethi   %hi(_GLOBAL_OFFSET_TABLE_-4), %##reg;                   \
+       call    __sparc_get_pc_thunk.reg;                               \
+        or     %##reg, %lo(_GLOBAL_OFFSET_TABLE_+4), %##reg;
+
+#define SETUP_PIC_REG_LEAF(reg, tmp)                                   \
+       SPARC_PIC_THUNK(reg)                                            \
        sethi   %hi(_GLOBAL_OFFSET_TABLE_-4), %##reg;                   \
        mov     %o7, %##tmp;                                            \
        call    __sparc_get_pc_thunk.reg;                               \
         or     %##reg, %lo(_GLOBAL_OFFSET_TABLE_+4), %##reg;           \
        mov     %##tmp, %o7;
-#endif
 
 #define        ENTRY(name)             \
   .global C_SYMBOL_NAME(name); \
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
index 01ee307abef5c7320179e12182c9b67cc7783081..fd7ded5af9f7e4b282c34bf70076fdba3c658d4d 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2002, 2003, 2004, 2006, 2008, 2011
+/* Copyright (C) 1997, 2002, 2003, 2004, 2006, 2008, 2011, 2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, January 1997.
@@ -89,7 +89,7 @@ ENTRY(name);                                  \
 #else
 # if RTLD_PRIVATE_ERRNO
 #  define SYSCALL_ERROR_HANDLER                        \
-0:     SETUP_PIC_REG(o2,g1)                    \
+0:     SETUP_PIC_REG_LEAF(o2,g1)               \
        sethi   %hi(rtld_errno), %g1;           \
        or      %g1, %lo(rtld_errno), %g1;      \
        ld      [%o2 + %g1], %g1;               \
@@ -103,8 +103,8 @@ ENTRY(name);                                        \
 #  else
 #   define SYSCALL_ERROR_ERRNO errno
 #  endif
-#  define SYSCALL_ERROR_HANDLER                                \
-0:     SETUP_PIC_REG(o2,g1)                                    \
+#  define SYSCALL_ERROR_HANDLER                                        \
+0:     SETUP_PIC_REG_LEAF(o2,g1)                               \
        sethi   %tie_hi22(SYSCALL_ERROR_ERRNO), %g1;            \
        add     %g1, %tie_lo10(SYSCALL_ERROR_ERRNO), %g1;       \
        ld      [%o2 + %g1], %g1, %tie_ld(SYSCALL_ERROR_ERRNO); \
@@ -113,7 +113,7 @@ ENTRY(name);                                        \
         mov    -1, %o0;
 # else
 #  define SYSCALL_ERROR_HANDLER                \
-0:     SETUP_PIC_REG(o2,g1)            \
+0:     SETUP_PIC_REG_LEAF(o2,g1)       \
        sethi   %hi(errno), %g1;        \
        or      %g1, %lo(errno), %g1;   \
        ld      [%o2 + %g1], %g1;       \
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
index c5fa866421ed9535b8112a42b09c1215afcab9e6..67ead22b505ac6e188b1a4a8e9129e5b357b8c0c 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2000, 2002, 2003, 2004, 2006, 2008, 2011
+/* Copyright (C) 1997, 2000, 2002, 2003, 2004, 2006, 2008, 2011, 2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Richard Henderson <richard@gnu.ai.mit.edu>, 1997.
@@ -96,7 +96,7 @@ ENTRY(name);                                  \
 #else
 # if RTLD_PRIVATE_ERRNO
 #  define SYSCALL_ERROR_HANDLER                        \
-0:     SETUP_PIC_REG(o2,g1)                    \
+0:     SETUP_PIC_REG_LEAF(o2,g1)               \
        sethi   %hi(rtld_errno), %g1;           \
        or      %g1, %lo(rtld_errno), %g1;      \
        ldx     [%o2 + %g1], %g1;               \
@@ -110,8 +110,8 @@ ENTRY(name);                                        \
 #  else
 #   define SYSCALL_ERROR_ERRNO errno
 #  endif
-#  define SYSCALL_ERROR_HANDLER                                \
-0:     SETUP_PIC_REG(o2,g1)                                    \
+#  define SYSCALL_ERROR_HANDLER                                        \
+0:     SETUP_PIC_REG_LEAF(o2,g1)                               \
        sethi   %tie_hi22(SYSCALL_ERROR_ERRNO), %g1;            \
        add     %g1, %tie_lo10(SYSCALL_ERROR_ERRNO), %g1;       \
        ldx     [%o2 + %g1], %g1, %tie_ldx(SYSCALL_ERROR_ERRNO);\
@@ -120,7 +120,7 @@ ENTRY(name);                                        \
         mov    -1, %o0;
 # else
 #  define SYSCALL_ERROR_HANDLER                \
-0:     SETUP_PIC_REG(o2,g1)            \
+0:     SETUP_PIC_REG_LEAF(o2,g1)       \
        sethi   %hi(errno), %g1;        \
        or      %g1, %lo(errno), %g1;   \
        ldx     [%o2 + %g1], %g1;       \
GNU C Library master sources
This page took 0.055355 seconds and 5 git commands to generate.