[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r9522 - in /fsf/trunk/libc: ./ hurd/ nptl/ nptl/sysdeps/unix/sysv/linux/s390/s390-32/ nptl/sysdeps/unix/sysv/linux/s390/s390...
- To: commits@xxxxxxxxxx
- Subject: [commits] r9522 - in /fsf/trunk/libc: ./ hurd/ nptl/ nptl/sysdeps/unix/sysv/linux/s390/s390-32/ nptl/sysdeps/unix/sysv/linux/s390/s390...
- From: eglibc@xxxxxxxxxx
- Date: Wed, 23 Dec 2009 08:02:15 -0000
Author: eglibc
Date: Wed Dec 23 00:02:14 2009
New Revision: 9522
Log:
Import glibc-mainline for 2009-12-23
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/hurd/hurdioctl.c
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c
fsf/trunk/libc/sysdeps/mach/hurd/getcwd.c
fsf/trunk/libc/sysdeps/s390/s390-32/dl-machine.h
fsf/trunk/libc/sysdeps/s390/s390-64/dl-machine.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Dec 23 00:02:14 2009
@@ -1,3 +1,20 @@
+2009-12-22 Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
+
+ * hurd/hurdioctl.c (_hurd_locked_install_cttyid): Set newctty to
+ MACH_PORT_NULL when id != cttyid.
+
+2009-12-20 Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
+
+ * sysdeps/mach/hurd/getcwd.c (cleanup): Do not call
+ __mach_port_deallocate on rootdevid.
+
+2009-12-17 Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
+
+ * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela): Handle
+ R_390_PC32DBL. Remove unneeded R_390_PLT16DBL.
+ * sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela): Remove
+ unneeded R_390_PLT16DBL and R_390_PLT32DBL.
+
2009-12-21 Ulrich Drepper <drepper@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/futimens.c: Handle AT_FDCWD.
Modified: fsf/trunk/libc/hurd/hurdioctl.c
==============================================================================
--- fsf/trunk/libc/hurd/hurdioctl.c (original)
+++ fsf/trunk/libc/hurd/hurdioctl.c Wed Dec 23 00:02:14 2009
@@ -1,5 +1,6 @@
/* ioctl commands which must be done in the C library.
- Copyright (C) 1994,95,96,97,99,2001,02 Free Software Foundation, Inc.
+ Copyright (C) 1994,95,96,97,99,2001,2002,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 and/or
@@ -169,33 +170,28 @@
for (i = 0; i < _hurd_dtablesize; ++i)
{
struct hurd_fd *const d = _hurd_dtable[i];
- mach_port_t newctty;
+ mach_port_t newctty = MACH_PORT_NULL;
if (d == NULL)
/* Nothing to do for an unused descriptor cell. */
continue;
- if (cttyid == MACH_PORT_NULL)
- /* We now have no controlling tty at all. */
- newctty = MACH_PORT_NULL;
- else
+ if (cttyid != MACH_PORT_NULL)
+ /* We do have some controlling tty. */
HURD_PORT_USE (&d->port,
({ mach_port_t id;
/* Get the io object's cttyid port. */
if (! __term_getctty (port, &id))
{
- if (id == cttyid && /* Is it ours? */
+ if (id == cttyid /* Is it ours? */
/* Get the ctty io port. */
- __term_open_ctty (port,
- _hurd_pid, _hurd_pgrp,
- &newctty))
+ && __term_open_ctty (port,
+ _hurd_pid, _hurd_pgrp,
+ &newctty))
/* XXX it is our ctty but the call failed? */
newctty = MACH_PORT_NULL;
- __mach_port_deallocate
- (__mach_task_self (), (mach_port_t) id);
+ __mach_port_deallocate (__mach_task_self (), id);
}
- else
- newctty = MACH_PORT_NULL;
0;
}));
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Wed Dec 23 00:02:14 2009
@@ -1,3 +1,9 @@
+2009-12-18 Thomas Schwinge <thomas@xxxxxxxxxxxxxxxx>
+
+ * 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@xxxxxxxxxx>
* pthread_rwlock_init.c (__pthread_rwlock_init): Simplify code by
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c Wed Dec 23 00:02:14 2009
@@ -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 @@
.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 @@
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\
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c Wed Dec 23 00:02:14 2009
@@ -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 @@
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\
Modified: fsf/trunk/libc/sysdeps/mach/hurd/getcwd.c
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/getcwd.c (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/getcwd.c Wed Dec 23 00:02:14 2009
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98,2002,04 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,98,2002,2004,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 and/or
@@ -60,7 +61,6 @@
__mach_port_deallocate (__mach_task_self (), thisid);
__mach_port_deallocate (__mach_task_self (), thisdevid);
__mach_port_deallocate (__mach_task_self (), rootid);
- __mach_port_deallocate (__mach_task_self (), rootdevid);
if (dirbuf != NULL)
__vm_deallocate (__mach_task_self (),
Modified: fsf/trunk/libc/sysdeps/s390/s390-32/dl-machine.h
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/s390-32/dl-machine.h (original)
+++ fsf/trunk/libc/sysdeps/s390/s390-32/dl-machine.h Wed Dec 23 00:02:14 2009
@@ -389,9 +389,12 @@
*reloc_addr = value + reloc->r_addend - (Elf32_Addr) reloc_addr;
break;
case R_390_PC16DBL:
- case R_390_PLT16DBL:
*(unsigned short *) reloc_addr = (unsigned short)
((short) (value + reloc->r_addend - (Elf32_Addr) reloc_addr) >> 1);
+ break;
+ case R_390_PC32DBL:
+ *(unsigned int *) reloc_addr = (unsigned int)
+ ((int) (value + reloc->r_addend - (Elf32_Addr) reloc_addr) >> 1);
break;
case R_390_PC16:
*(unsigned short *) reloc_addr =
Modified: fsf/trunk/libc/sysdeps/s390/s390-64/dl-machine.h
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/s390-64/dl-machine.h (original)
+++ fsf/trunk/libc/sysdeps/s390/s390-64/dl-machine.h Wed Dec 23 00:02:14 2009
@@ -371,7 +371,6 @@
*reloc_addr = value +reloc->r_addend - (Elf64_Addr) reloc_addr;
break;
case R_390_PC32DBL:
- case R_390_PLT32DBL:
*(unsigned int *) reloc_addr = (unsigned int)
((int) (value + reloc->r_addend - (Elf64_Addr) reloc_addr) >> 1);
break;
@@ -380,7 +379,6 @@
value + reloc->r_addend - (Elf64_Addr) reloc_addr;
break;
case R_390_PC16DBL:
- case R_390_PLT16DBL:
*(unsigned short *) reloc_addr = (unsigned short)
((short) (value + reloc->r_addend - (Elf64_Addr) reloc_addr) >> 1);
break;