Use GOT instead of GOT12 all over

GOT12 is a synonym for GOT, so just use GOT everywhere for
consistency.  Generated code is unchanged on s390.

diff --git a/ChangeLog b/ChangeLog
index 803ccf0..874d2d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-11-12  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+       * sysdeps/s390/s390-32/bcopy.S (__bcopy): Use GOT instead of
+       GOT12.
+       * sysdeps/s390/s390-32/dl-machine.h (elf_machine_load_address):
+       Likewise.
+       (_dl_start_user): Likewise.
+       * sysdeps/s390/s390-32/setjmp.S (__sigsetjmp): Likewise.
+
 2014-11-12  Carlos O'Donell  <carlos@redhat.com>
            Siddhesh Poyarekar  <siddhesh@redhat.com>
 

diff --git a/sysdeps/s390/s390-32/bcopy.S b/sysdeps/s390/s390-32/bcopy.S
index d4403dc..7f61bed 100644 (file)
--- a/sysdeps/s390/s390-32/bcopy.S
+++ b/sysdeps/s390/s390-32/bcopy.S
@@ -68,7 +68,7 @@ ENTRY(__bcopy)
 #ifdef PIC
         al     %r1,.L9-.L8(%r1)     # get address of global offset table
                                     # load address of memmove
-        l      %r1,memmove@GOT12(%r1)
+        l      %r1,memmove@GOT(%r1)
         br     %r1
 .L9:    .long  _GLOBAL_OFFSET_TABLE_-.L8
 #else

diff --git a/sysdeps/s390/s390-32/dl-machine.h b/sysdeps/s390/s390-32/dl-machine.h
index 0fd5a4f..47f5874 100644 (file)
--- a/sysdeps/s390/s390-32/dl-machine.h
+++ b/sysdeps/s390/s390-32/dl-machine.h
@@ -76,7 +76,7 @@ elf_machine_load_address (void)
        "2: l     %0,4(1)\n"
        "   ar    %0,1\n"
        "   al    1,0(1)\n"
-       "   sl    %0,_dl_start@GOT12(1)"
+       "   sl    %0,_dl_start@GOT(1)"
        : "=&d" (addr) : : "1" );
   return addr;
 }
@@ -165,7 +165,7 @@ _dl_start_user:\n\
        ar    %r12,%r13\n\
        # See if we were run as a command with the executable file\n\
        # name as an extra leading argument.\n\
-       l     %r1,_dl_skip_args@GOT12(0,%r12)\n\
+       l     %r1,_dl_skip_args@GOT(%r12)\n\
        l     %r1,0(%r1)        # load _dl_skip_args\n\
        ltr   %r1,%r1\n\
        je    .L4               # Skip the arg adjustment if there were none.\n\

diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S
index 3ebc813..c0cf3ab 100644 (file)
--- a/sysdeps/s390/s390-32/setjmp.S
+++ b/sysdeps/s390/s390-32/setjmp.S
@@ -76,7 +76,7 @@ ENTRY(__sigsetjmp)
        basr   %r1,0
 .L0:    al     %r1,.L1 - .L0(0,%r1) /* get address of global offset table */
                                    /* get address of __sigjmp_save from got */
-       l      %r1,__sigjmp_save@GOT12(0,%r1)
+       l      %r1,__sigjmp_save@GOT(%r1)
        br     %r1
 .L1:    .long  _GLOBAL_OFFSET_TABLE_ - .L0
 #else