Skip to content

Commit

Permalink
Merge remote branch 'origin/master' into fedora/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Schwab committed Mar 9, 2010
2 parents 7bea852 + 462a522 commit 35be409
Show file tree
Hide file tree
Showing 72 changed files with 1,527 additions and 2,669 deletions.
210 changes: 194 additions & 16 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,197 @@
2010-03-09 David S. Miller <davem@davemloft.net>

* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handling
of R_SPARC_TLS_LE_* needs to use 32-bit loads and stores, not
64-bit ones.

* sysdeps/sparc/sparc32/memcpy.S: Fix build.

* sysdeps/sparc/sparc32/strlen.S: Optimize.
* sysdeps/sparc/sparc64/strlen.S: Likewise.
* sysdeps/sparc/sparc32/sparcv9/strlen.S (ASI_PNF, ASI_BLK_P,
XCC): Delete definitions, not needed.

2010-03-07 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
Little follow-up patch from last change.

2010-03-06 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/internal_statvfs.c: Handle ext4 and logfs.
* sysdeps/unix/sysv/linux/linux_fsinfo.h: Add entry for logfs.

2010-02-18 Yann Droneaud <yann@droneaud.fr>

* resolv/res_send.c: Fixed DEBUG statements.
Moved tmpbuf declaration to block beginning and
updated pointer names used in multiple DprintQ() calls

2010-02-18 H.J. Lu <hongjiu.lu@intel.com>

* config.make.in (config-asflags-i686): Define.
* configure.in: Substitute libc_cv_as_i686.
* sysdeps/i386/configure.in: Check if assembler supports -mtune=i686.
* sysdeps/i386/i686/Makefile (CFLAGS-.oX): Add -Wa,-mtune=i686
if assembler supports -mtune=i686.
(ASFLAGS-.oX): Likewise.

2010-03-04 Ulrich Drepper <drepper@redhat.com>

* elf/elf.h (R_X86_64_SIZE32): Define.
(R_X86_64_SIZE64): Define.

2010-03-02 Richard Guenther <rguenther@suse.de>

* sysdeps/x86_64/dl-machine.h (elf_machine_rela): R_X86_64_PC32
is sign-extending.

2010-03-03 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/bits/in.h: Add a few more definitions from
the kernel headers.

2010-03-04 David S. Miller <davem@davemloft.net>

* sysdeps/sparc/sparc64/Implies: Add ieee754/dbl-64/wordsize-64 entry.

* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Delete.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Delete.

2010-03-03 David S. Miller <davem@davemloft.net>

* math/math_private.h (INSERT_WORDS64): Fix argument order.

2010-03-03 Aurelien Jarno <aurelien@aurel32.net>

* sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c: New file.

2010-03-03 David S. Miller <davem@davemloft.net>

* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_lazy_rel): Must
pass '1' for 't' argument to sparc_fixup_plt.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_lazy_rel):
Likewise.
* sysdeps/sparc/sparc32/dl-plt.h (OPCODE_BA_PT): Define.
(sparc_fixup_plt): Document 't' argument. Enable branch
optimization and use v9 branches when possible. Explain why we
cannot unconditionally patch the branch into the first PLT
instruction.
* sysdeps/sparc/sparc64/dl-plt.h (sparc64_fixup_plt): Document 't'
argument. Use v9 branches when possible. Explain why we can in
fact unconditionally use a branch in the first PLT instruction
here.

2010-02-28 Roland McGrath <roland@redhat.com>

* elf/elf.h (NT_X86_XSTATE): New macro.

2010-02-25 David S. Miller <davem@davemloft.net>

* sysdeps/sparc/sparc64/Makefile: Add align-cpy rule.
* sysdeps/sparc/sparc64/align-cpy.S: New.
* sysdeps/sparc/sparc64/memcpy.S (__align_cpy_1, __align_cpy_2,
__align_cpy_4, __align_cpy_8, __align_cpy_16): Remove.
* sysdeps/sparc/sparc64/sparcv9b/memcpy.S (__align_cpy_1,
__align_cpy_2, __align_cpy_4, __align_cpy_8, __align_cpy_16):
Remove.
* sysdeps/sparc/sparc64/sparcv9v/memcpy.S (__align_cpy_1,
__align_cpy_2, __align_cpy_4, __align_cpy_8, __align_cpy_16):
Remove.
* sysdeps/sparc/sparc64/sparcv9v2/memcpy.S (__align_cpy_1,
__align_cpy_2, __align_cpy_4, __align_cpy_8, __align_cpy_16):
Remove.

* sysdeps/sparc/sparc32/bcopy.c: Delete.
* sysdeps/sparc/sparc32/memmove.c: Delete.
* sysdeps/sparc/sparc32/sparcv9/bcopy.c: Delete.
* sysdeps/sparc/sparc32/sparcv9/memmove.c: Delete.
* sysdeps/sparc/sparc64/bcopy.c: Delete.
* sysdeps/sparc/sparc64/memmove.c: Delete.
* sysdeps/sparc/sparc64/memcopy.h: New.
* sysdeps/sparc/sparc32/memcpy.S (bcopy, memmove): Remove.
* sysdeps/sparc/sparc64/memcpy.S (bcopy, memmove): Likewise.
* sysdeps/sparc/sparc64/sparcv9b/memcpy.S (bcopy, memmove): Likewise.
* sysdeps/sparc/sparc64/sparcv9v/memcpy.S (bcopy, memmove): Likewise.
* sysdeps/sparc/sparc64/sparcv9v2/memcpy.S (bcopy, memmove): Likewise.

* sysdeps/sparc/elf/rtld-global-offsets.sym: New file.
* sysdeps/sparc/Makefile (csu): Add rtld-global-offsets.sym to
gen-as-const-headers.
* sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile: New file.
* sysdeps/sparc/sparc32/sparcv9/multiarch/memcpy.S: New file.
* sysdeps/sparc/sparc32/sparcv9/multiarch/memset.S: New file.
* sysdeps/sparc/sparc32/sparcv9/sparcv9b/memcpy.S: Move to...
* sysdeps/sparc/sparc32/sparcv9/multiarch/memcpy-ultra3.S: ...here.
* sysdeps/sparc/sparc32/sparcv9/sparcv9v/memcpy.S: Move to...
* sysdeps/sparc/sparc32/sparcv9/multiarch/memcpy-niagara1.S: ...here.
* sysdeps/sparc/sparc32/sparcv9/sparcv9v/memset.S: Move to...
* sysdeps/sparc/sparc32/sparcv9/multiarch/memset-niagara1.S: ...here.
* sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memcpy.S: Move to...
* sysdeps/sparc/sparc32/sparcv9/multiarch/memcpy-niagara2.S: ...here.
* sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memset.S: Removed.
* sysdeps/sparc/sparc64/multiarch/Makefile: New file.
* sysdeps/sparc/sparc64/sparcv9v/memcpy.S: Move to...
* sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S: ...here.
* sysdeps/sparc/sparc64/sparcv9v2/memcpy.S: Move to...
* sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S: ...here.
* sysdeps/sparc/sparc64/sparcv9b/memcpy.S: Move to...
* sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: ...here.
* sysdeps/sparc/sparc64/sparcv9v/memset.S: Move to...
* sysdeps/sparc/sparc64/multiarch/memset-niagara1.S: ...here.
* sysdeps/sparc/sparc64/sparcv9v2/memset.S: Removed.
* sysdeps/sparc/sparc64/multiarch/memcpy.S: New file.
* sysdeps/sparc/sparc64/multiarch/memset.S: New file.

2010-02-20 H.J. Lu <hongjiu.lu@intel.com>

[BZ #11332]
* sysdeps/i386/i686/multiarch/strcmp-sse4.S: Use cfi_remember_state
and cfi_restore_state only if USE_AS_STRNCMP is defined.

2010-02-24 Ulrich Drepper <drepper@redhat.com>

* sysdeps/x86_64/Implies: Add ieee754/dbl-64/wordsize-64 entry.

2010-02-24 H.J. Lu <hongjiu.lu@intel.com>

* sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
(bk_write_less32bytes_2): Renamed to ...
(bk_write_less48bytes): This.
Use unsigned conditional jumps.
Correct unwind info.
Use add/sub instead of lea if possible.
(shl_0_gobble_cache_loop_tail): Removed.
(large_page): Properly adjust ECX.

* sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Use unsigned
conditional jumps.
Correct unwind info.

* sysdeps/i386/i686/multiarch/memset-sse2-rep.S: Remove redundant
punpcklbw.
Use unsigned conditional jumps.
(128bytesormore_nt): Renamed to ...
(128bytesormore_endof_L1): This.
Use add instead of lea if possible.
Correct unwind info.
* sysdeps/i386/i686/multiarch/memset-sse2.S: Remove redundant
punpcklbw.
Use unsigned conditional jumps.
Use add instead of lea if possible.
Correct unwind info.

2010-02-24 Ulrich Drepper <drepper@redhat.com>

[BZ #11319]
* libio/iovdprintf.c (_IO_vdprintf): Explicitly flush stream before
undoing the stream because _IO_FINISH doesn't report failures.

[BZ #5553]
* malloc/malloc.c (public_vALLOc): Set ar_ptr when trying main_arena.
(public_pVALLOc): Likewise.
Patch by Petr Baudis.

2010-02-22 Jim Meyering <meyering@redhat.com>

* manual/math.texi (BSD Random): Fix a typo: s/are/is/
Expand Down Expand Up @@ -30,11 +224,6 @@
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_runtime_setup):
Adjust rela->r_offset by l->l_addr when rewriting PLT.

2010-02-21 H.J. Lu <hongjiu.lu@intel.com>

* sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Properly
decrement ECX when jumping to copy_page_by_rep.

2010-02-19 Carl Fredrik Hammar <hammy.lite@gmail.com>

* hurd/hurdioctl.c (tiocsctty): Call `do_tiocsctty' instead of
Expand Down Expand Up @@ -216,17 +405,6 @@
* sysdeps/x86_64/fpu/fegetenv.c: Likewise
* sysdeps/s390/fpu/fegetenv.c: Likewise. Remove unused headers.

2010-02-12 H.J. Lu <hongjiu.lu@intel.com>

* sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Use unsigned
conditional jumps.
(shl_0_gobble_cache_loop_tail): Removed.
* sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Likewise.

* sysdeps/i386/i686/multiarch/memset-sse2-rep.S: Use unsigned
conditional jumps.
* sysdeps/i386/i686/multiarch/memset-sse2.S: Likewise.

2009-10-27 Aurelien Jarno <aurelien@aurel32.net>

[BZ #10855]
Expand Down
1 change: 1 addition & 0 deletions config.make.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ asflags-cpu = @libc_cv_cc_submachine@

config-cflags-sse4 = @libc_cv_cc_sse4@
config-cflags-avx = @libc_cv_cc_avx@
config-asflags-i686 = @libc_cv_as_i686@

defines = @DEFINES@
sysincludes = @SYSINCLUDES@
Expand Down
2 changes: 2 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,7 @@ xcoff
elf
ldd_rewrite_script
use_ldconfig
libc_cv_as_i686
libc_cv_cc_avx
libc_cv_cc_sse4
libc_cv_cpp_asm_debuginfo
Expand Down Expand Up @@ -8830,6 +8831,7 @@ fi
if test $elf = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_ELF 1
Expand Down
1 change: 1 addition & 0 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -2323,6 +2323,7 @@ dnl sysdeps/CPU/configure.in checks set this via arch-specific asm tests
AC_SUBST(libc_cv_cpp_asm_debuginfo)
AC_SUBST(libc_cv_cc_sse4)
AC_SUBST(libc_cv_cc_avx)
AC_SUBST(libc_cv_as_i686)

AC_SUBST(use_ldconfig)
AC_SUBST(ldd_rewrite_script)
Expand Down
14 changes: 7 additions & 7 deletions elf/dl-load.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Map in a shared object's segments from the file.
Copyright (C) 1995-2005, 2006, 2007, 2009 Free Software Foundation, Inc.
Copyright (C) 1995-2005, 2006, 2007, 2009, 2010 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
Expand Down Expand Up @@ -313,7 +313,7 @@ static char *
expand_dynamic_string_token (struct link_map *l, const char *s)
{
/* We make two runs over the string. First we determine how large the
resulting string is and then we copy it over. Since this is now
resulting string is and then we copy it over. Since this is no
frequently executed operation we are looking here not for performance
but rather for code size. */
size_t cnt;
Expand Down Expand Up @@ -391,7 +391,7 @@ fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep,
size_t len = strlen (cp);

/* `strsep' can pass an empty string. This has to be
interpreted as `use the current directory'. */
interpreted as `use the current directory'. */
if (len == 0)
{
static const char curwd[] = "./";
Expand Down Expand Up @@ -1519,7 +1519,7 @@ cannot enable executable stack as shared object requires");
/* Print search path. */
static void
print_search_path (struct r_search_path_elem **list,
const char *what, const char *name)
const char *what, const char *name)
{
char buf[max_dirnamelen + max_capstrlen];
int first = 1;
Expand Down Expand Up @@ -2044,7 +2044,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
fd = -1;

/* When the object has the RUNPATH information we don't use any
RPATHs. */
RPATHs. */
if (loader == NULL || loader->l_info[DT_RUNPATH] == NULL)
{
/* This is the executable's map (if there is one). Make sure that
Expand All @@ -2067,7 +2067,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
}

/* If dynamically linked, try the DT_RPATH of the executable
itself. NB: we do this for lookups in any namespace. */
itself. NB: we do this for lookups in any namespace. */
if (fd == -1 && !did_main_map
&& main_map != NULL && main_map->l_type != lt_loaded
&& cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH,
Expand Down Expand Up @@ -2164,7 +2164,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,

/* Add another newline when we are tracing the library loading. */
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0))
_dl_debug_printf ("\n");
_dl_debug_printf ("\n");
}
else
{
Expand Down
5 changes: 4 additions & 1 deletion elf/elf.h
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,7 @@ typedef struct
#define NT_PPC_VSX 0x102 /* PowerPC VSX registers */
#define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */
#define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */
#define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */

/* Legal values for the note segment descriptor types for object files. */

Expand Down Expand Up @@ -2665,7 +2666,9 @@ typedef Elf32_Addr Elf32_Conflict;
#define R_X86_64_GOTOFF64 25 /* 64 bit offset to GOT */
#define R_X86_64_GOTPC32 26 /* 32 bit signed pc relative
offset to GOT */
/* 27 .. 33 */
/* 27 .. 31 */
#define R_X86_64_SIZE32 32 /* Size of symbol plus 32-bit addend */
#define R_X86_64_SIZE64 33 /* Size of symbol plus 64-bit addend */
#define R_X86_64_GOTPC32_TLSDESC 34 /* GOT offset for TLS descriptor. */
#define R_X86_64_TLSDESC_CALL 35 /* Marker for call through TLS
descriptor. */
Expand Down
5 changes: 4 additions & 1 deletion libio/iovdprintf.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006
/* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Expand Down Expand Up @@ -60,6 +60,9 @@ _IO_vdprintf (d, format, arg)

done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg);

if (done != EOF && _IO_do_flush (&tmpfil.file) == EOF)
done = EOF;

_IO_FINISH (&tmpfil.file);

return done;
Expand Down
16 changes: 9 additions & 7 deletions malloc/malloc.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Malloc implementation for multiple threads without lock contention.
Copyright (C) 1996-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
Copyright (C) 1996-2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Wolfram Gloger <wg@malloc.de>
and Doug Lea <dl@cs.oswego.edu>, 2001.
Expand Down Expand Up @@ -3933,9 +3933,10 @@ public_vALLOc(size_t bytes)
if(!p) {
/* Maybe the failure is due to running out of mmapped areas. */
if(ar_ptr != &main_arena) {
(void)mutex_lock(&main_arena.mutex);
p = _int_memalign(&main_arena, pagesz, bytes);
(void)mutex_unlock(&main_arena.mutex);
ar_ptr = &main_arena;
(void)mutex_lock(&ar_ptr->mutex);
p = _int_memalign(ar_ptr, pagesz, bytes);
(void)mutex_unlock(&ar_ptr->mutex);
} else {
#if USE_ARENAS
/* ... or sbrk() has failed and there is still a chance to mmap() */
Expand Down Expand Up @@ -3978,9 +3979,10 @@ public_pVALLOc(size_t bytes)
if(!p) {
/* Maybe the failure is due to running out of mmapped areas. */
if(ar_ptr != &main_arena) {
(void)mutex_lock(&main_arena.mutex);
p = _int_memalign(&main_arena, pagesz, rounded_bytes);
(void)mutex_unlock(&main_arena.mutex);
ar_ptr = &main_arena;
(void)mutex_lock(&ar_ptr->mutex);
p = _int_memalign(ar_ptr, pagesz, rounded_bytes);
(void)mutex_unlock(&ar_ptr->mutex);
} else {
#if USE_ARENAS
/* ... or sbrk() has failed and there is still a chance to mmap() */
Expand Down
2 changes: 1 addition & 1 deletion math/math_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ do { \
} while (0)

/* Get all in one, efficient on 64-bit machines. */
#define INSERT_WORDS64(i,d) \
#define INSERT_WORDS64(d,i) \
do { \
ieee_double_shape_type iw_u; \
iw_u.word = (i); \
Expand Down
Loading

0 comments on commit 35be409

Please sign in to comment.