diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2009-12-22 08:37:33 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-12-22 08:37:33 -0800 |
| commit | d34bd80fceb76fa66308bd8005ad28be96a01e36 (patch) | |
| tree | 7c1b98f751d1fdbef74167ce255ddf8cba43627e | |
| parent | caf512dec254923b5eded0b3f36f5db66756066d (diff) | |
| download | glibc-d34bd80fceb76fa66308bd8005ad28be96a01e36.tar glibc-d34bd80fceb76fa66308bd8005ad28be96a01e36.tar.gz glibc-d34bd80fceb76fa66308bd8005ad28be96a01e36.tar.bz2 glibc-d34bd80fceb76fa66308bd8005ad28be96a01e36.zip | |
Fix s390 startup code in libpthread.
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c | 10 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c | 8 |
3 files changed, 8 insertions, 16 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 8cea2f648f..389bed4a68 100644 --- 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 40d4d50c32..eb09b4aaa9 100644 --- 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 a102d07d6c..34951f6fbb 100644 --- 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\ |