[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r23219 - in /branches/eglibc-2_17: ./ libc/ libc/elf/ libc/po/ libc/ports/ libc/ports/sysdeps/unix/sysv/linux/arm/ libc/port...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r23219 - in /branches/eglibc-2_17: ./ libc/ libc/elf/ libc/po/ libc/ports/ libc/ports/sysdeps/unix/sysv/linux/arm/ libc/port...
- From: joseph@xxxxxxxxxx
- Date: Tue, 04 Jun 2013 15:50:35 -0000
Author: joseph
Date: Tue Jun 4 15:50:35 2013
New Revision: 23219
Log:
Merge changes between r22664 and r23218 from /fsf/glibc-2_17-branch.
Modified:
branches/eglibc-2_17/ (props changed)
branches/eglibc-2_17/libc/ChangeLog
branches/eglibc-2_17/libc/NEWS
branches/eglibc-2_17/libc/elf/cache.c
branches/eglibc-2_17/libc/po/de.po
branches/eglibc-2_17/libc/ports/ChangeLog.arm
branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data (props changed)
branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data (props changed)
branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data (props changed)
branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data (props changed)
branches/eglibc-2_17/libc/sysdeps/generic/ldconfig.h
Propchange: branches/eglibc-2_17/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 4 15:50:35 2013
@@ -1,2 +1,2 @@
-/fsf/glibc-2_17-branch:22054-22664
+/fsf/glibc-2_17-branch:22054-23218
/fsf/trunk:15224-22029
Modified: branches/eglibc-2_17/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_17/libc/ChangeLog (original)
+++ branches/eglibc-2_17/libc/ChangeLog Tue Jun 4 15:50:35 2013
@@ -1,3 +1,13 @@
+2013-02-08 Carlos O'Donell <carlos@xxxxxxxxxx>
+
+ [BZ #15006]
+ * sysdeps/generic/ldconfig.h: Define FLAG_ARM_LIBSF.
+ * elf/cache.c (print_entry): Add FLAG_ARM_LIBSF support.
+
+2013-03-30 David S. Miller <davem@xxxxxxxxxxxxx>
+
+ * po/de.po: Update from translation team.
+
2013-01-31 David S. Miller <davem@xxxxxxxxxxxxx>
* po/de.po: Update from translation team.
Modified: branches/eglibc-2_17/libc/NEWS
==============================================================================
--- branches/eglibc-2_17/libc/NEWS (original)
+++ branches/eglibc-2_17/libc/NEWS Tue Jun 4 15:50:35 2013
@@ -4,6 +4,12 @@
Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
using `glibc' in the "product" field.
+
+Version 2.17.1
+
+* The following bugs are resolved with this release:
+ 15003, 15006, 15122.
+
Version 2.17
@@ -23,7 +29,7 @@
14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14803, 14805,
14807, 14811, 14815, 14821, 14822, 14824, 14828, 14831, 14833, 14835,
14838, 14856, 14863, 14865, 14866, 14868, 14869, 14871, 14872, 14879,
- 14889, 14893, 14898, 14914, 15003.
+ 14889, 14893, 14898, 14914.
* Optimization of memcpy for MIPS.
Modified: branches/eglibc-2_17/libc/elf/cache.c
==============================================================================
--- branches/eglibc-2_17/libc/elf/cache.c (original)
+++ branches/eglibc-2_17/libc/elf/cache.c Tue Jun 4 15:50:35 2013
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@xxxxxxx>, 1999.
@@ -99,6 +99,10 @@
break;
case FLAG_AARCH64_LIB64:
fputs (",AArch64", stdout);
+ break;
+ /* Uses the ARM soft-float ABI. */
+ case FLAG_ARM_LIBSF:
+ fputs (",soft-float", stdout);
break;
case 0:
break;
Modified: branches/eglibc-2_17/libc/po/de.po
==============================================================================
--- branches/eglibc-2_17/libc/po/de.po (original)
+++ branches/eglibc-2_17/libc/po/de.po Tue Jun 4 15:50:35 2013
@@ -2,13 +2,13 @@
# Copyright ÃÂ 1996, 2002 Free Software Foundation, Inc.
# This file is distributed under the same license as the glibc package.
# Karl Eichwalder <ke@xxxxxxx>, 2002.
-# Jochen Hein <jochen@xxxxxxxxxx>, 1996-2012.
+# Jochen Hein <jochen@xxxxxxxxxx>, 1996-2013.
#
msgid ""
msgstr ""
"Project-Id-Version: GNU libc 2.17-pre1\n"
"POT-Creation-Date: 2012-12-07 15:10-0500\n"
-"PO-Revision-Date: 2013-01-31 07:16+0100\n"
+"PO-Revision-Date: 2013-03-30 16:56+0100\n"
"Last-Translator: Jochen Hein <jochen@xxxxxxxxxx>\n"
"Language-Team: German <translation-team-de@xxxxxxxxxxxxxxxxxxxxx>\n"
"Language: de\n"
@@ -988,7 +988,7 @@
#: elf/ldd.bash.in:183
msgid "\tnot a dynamic executable"
-msgstr "\\tdas Programm ist nicht dynamisch gelinkt"
+msgstr "\tdas Programm ist nicht dynamisch gelinkt"
# XXX need to look at source
#: elf/ldd.bash.in:191
Modified: branches/eglibc-2_17/libc/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_17/libc/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_17/libc/ports/ChangeLog.arm Tue Jun 4 15:50:35 2013
@@ -1,3 +1,12 @@
+2013-02-08 Carlos O'Donell <carlos@xxxxxxxxxx>
+
+ [BZ #15006]
+ * sysdeps/unix/sysv/linux/arm/dl-cache.h
+ [__ARM_PCS_VFP] (_dl_cache_check_flags): Allow plain FLAG_ELF_LIBC6.
+ [!__ARM_PCS_VFP] (_dl_cache_check_flags): Likewise.
+ * sysdeps/unix/sysv/linux/arm/readelflib.c (process_elf_file):
+ Set FLAG_ARM_LIBSF for soft-float ABI otherwise just FLAG_ELF_LIBC6.
+
2012-12-04 Steve McIntyre <steve.mcintyre@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/arm/dl-cache.h: New file.
Modified: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
==============================================================================
--- branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h (original)
+++ branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h Tue Jun 4 15:50:35 2013
@@ -1,5 +1,5 @@
/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
- Copyright (C) 2003-2012 Free Software Foundation, Inc.
+ Copyright (C) 2003-2013 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
@@ -18,12 +18,17 @@
#include <ldconfig.h>
+/* In order to support the transition from unmarked objects
+ to marked objects we must treat unmarked objects as
+ compatible with either FLAG_ARM_LIBHF or FLAG_ARM_LIBSF. */
#ifdef __ARM_PCS_VFP
# define _dl_cache_check_flags(flags) \
- ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6))
+ ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6) \
+ || (flags) == FLAG_ELF_LIBC6)
#else
# define _dl_cache_check_flags(flags) \
- ((flags) == FLAG_ELF_LIBC6)
+ ((flags) == (FLAG_ARM_LIBSF | FLAG_ELF_LIBC6) \
+ || (flags) == FLAG_ELF_LIBC6)
#endif
#include_next <dl-cache.h>
Modified: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
==============================================================================
--- branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/arm/readelflib.c (original)
+++ branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/arm/readelflib.c Tue Jun 4 15:50:35 2013
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@xxxxxxx>, 1999 and
Jakub Jelinek <jakub@xxxxxxxxxx>, 1999.
@@ -46,6 +46,12 @@
if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_HARD)
*flag = FLAG_ARM_LIBHF|FLAG_ELF_LIBC6;
else if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_SOFT)
+ *flag = FLAG_ARM_LIBSF|FLAG_ELF_LIBC6;
+ else
+ /* We must assume the unmarked objects are compatible
+ with all ABI variants. Such objects may have been
+ generated in a transitional period when the ABI
+ tags were not added to all objects. */
*flag = FLAG_ELF_LIBC6;
}
}
Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 4 15:50:35 2013
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:22054-22664
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:22054-23218
/fsf/trunk/libc/ports/data/c++-types-powerpce500v2-linux-gnu.data:15224-19464
/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:19921-22029
Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 4 15:50:35 2013
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:22054-22664
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:22054-23218
/fsf/trunk/libc/ports/data/localplt-powerpce500v2-linux-gnu.data:15224-19464
/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:19921-22029
Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 4 15:50:35 2013
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:22054-22664
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:22054-23218
/fsf/trunk/libc/ports/data/c++-types-powerpce500v1-linux-gnu.data:15224-19464
/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:19921-22029
Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 4 15:50:35 2013
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:22054-22664
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:22054-23218
/fsf/trunk/libc/ports/data/localplt-powerpce500v1-linux-gnu.data:15224-19464
/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:19921-22029
Modified: branches/eglibc-2_17/libc/sysdeps/generic/ldconfig.h
==============================================================================
--- branches/eglibc-2_17/libc/sysdeps/generic/ldconfig.h (original)
+++ branches/eglibc-2_17/libc/sysdeps/generic/ldconfig.h Tue Jun 4 15:50:35 2013
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@xxxxxxx>, 1999.
@@ -36,6 +36,7 @@
#define FLAG_X8664_LIBX32 0x0800
#define FLAG_ARM_LIBHF 0x0900
#define FLAG_AARCH64_LIB64 0x0a00
+#define FLAG_ARM_LIBSF 0x0b00
/* Name of auxiliary cache. */
#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits