Fix s390 startup code in libpthread.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 8cea2f6..389bed4 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-18  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c (_init): Don't
+       call __gmon_start__.
+       * sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c (_init): Likewise.
+
 2009-12-17  Ulrich Drepper  <drepper@redhat.com>
 
        * pthread_rwlock_init.c (__pthread_rwlock_init): Simplify code by

diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c
index 40d4d50..eb09b4a 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c
+++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c
@@ -1,5 +1,5 @@
 /* Special .init and .fini section support for S/390.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it
@@ -67,8 +67,6 @@ _init:\n\
 .LT1_0:\n\
 .LC13:\n\
        .long   __pthread_initialize_minimal_internal-.LT1_0\n\
-.LC14:\n\
-       .long   __gmon_start__@GOT\n\
 .LC15:\n\
        .long   _GLOBAL_OFFSET_TABLE_-.LT1_0\n\
 .LTN1_0:\n\
@@ -80,12 +78,6 @@ _init:\n\
        L     1,.LC13-.LT1_0(13)\n\
        LA    1,0(1,13)\n\
        BASR  14,1\n\
-       L     1,.LC14-.LT1_0(13)\n\
-       L     1,0(1,12)\n\
-       LTR   1,1\n\
-       JE    .L22\n\
-       BASR  14,1\n\
-.L22:\n\
 #APP\n\
        .align 4,0x07\n\
        END_INIT\n\

diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c
index a102d07..34951f6 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c
+++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c
@@ -1,5 +1,5 @@
 /* Special .init and .fini section support for 64 bit S/390.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it
@@ -68,12 +68,6 @@ _init:\n\
        STG     1,0(15)\n\
        LARL    12,_GLOBAL_OFFSET_TABLE_\n\
        BRASL   14,__pthread_initialize_minimal_internal\n\
-       LARL    1,__gmon_start__@GOTENT\n\
-       LG      1,0(1)\n\
-       LTGR    1,1\n\
-       JE      .L22\n\
-       BASR    14,1\n\
-.L22:\n\
 #APP\n\
        .align 4,0x07\n\
        END_INIT\n\