Merge branch 'master' into bug13658-branch

diff --git a/dirent/dirfd.c b/dirent/dirfd.c
index 026421f33bed872e38604920130e6121cb39a20c..569484c5af0b950bd8bf589e2a00555c381c263c 100644 (file)
--- a/dirent/dirfd.c
+++ b/dirent/dirfd.c
@@ -1,5 +1,5 @@
 /* Return the file descriptor used by a DIR stream.  Stub version.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2012 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
@@ -21,12 +21,13 @@
 #include <errno.h>
 
 int
-dirfd (dirp)
+__dirfd (dirp)
      DIR *dirp;
 {
   __set_errno (ENOSYS);
   return -1;
 }
+weak_alias(__dirfd, dirfd)
 
 stub_warning (dirfd)
 #include <stub-tag.h>

diff --git a/include/dirent.h b/include/dirent.h
index 8e4823ce7371991062e34ba95598d56562760c42..36e765162abd7a6d09ffe8f76dd48aaefa718d04 100644 (file)
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -43,6 +43,7 @@ extern DIR *__alloc_dir (int fd, bool close_fd, int flags,
                         const struct stat64 *statp)
      internal_function;
 extern void __scandir_cancel_handler (void *arg);
+extern int __dirfd (DIR *__dirp);
 
 libc_hidden_proto (rewinddir)
 libc_hidden_proto (scandirat)

diff --git a/io/fts.c b/io/fts.c
index 5ba202b8aa8b66693d8ccdded8641e4cfe5083d5..11c5707d4cd22d03002c11a331d2eff7d33ce673 100644 (file)
--- a/io/fts.c
+++ b/io/fts.c
@@ -654,7 +654,7 @@ fts_build(sp, type)
         */
        cderrno = 0;
        if (nlinks || type == BREAD) {
-               if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
+               if (fts_safe_changedir(sp, cur, __dirfd(dirp), NULL)) {
                        if (nlinks && type == BREAD)
                                cur->fts_errno = errno;
                        cur->fts_flags |= FTS_DONTCHDIR;

diff --git a/io/ftw.c b/io/ftw.c
index ee3ba88174c4ca6ead0b1811c98bdfcc4c744807..9d6eb716e5da78c96e5375eebe5681ea1481bc1c 100644 (file)
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -1,5 +1,5 @@
 /* File tree walker functions.
-   Copyright (C) 1996-2004, 2006-2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1996-2004, 2006-2008, 2010, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -365,7 +365,7 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp)
        result = -1;
       else
        {
-         dirp->streamfd = dirfd (dirp->stream);
+         dirp->streamfd = __dirfd (dirp->stream);
          dirp->content = NULL;
          data->dirstreams[data->actdir] = dirp;
 
@@ -524,7 +524,7 @@ fail:
   /* If necessary, change to this directory.  */
   if (data->flags & FTW_CHDIR)
     {
-      if (__fchdir (dirfd (dir.stream)) < 0)
+      if (__fchdir (__dirfd (dir.stream)) < 0)
        {
          result = -1;
          goto fail;
@@ -604,7 +604,7 @@ fail:
       /* Change back to the parent directory.  */
       int done = 0;
       if (old_dir->stream != NULL)
-       if (__fchdir (dirfd (old_dir->stream)) == 0)
+       if (__fchdir (__dirfd (old_dir->stream)) == 0)
          done = 1;
 
       if (!done)

diff --git a/math/libm-test.inc b/math/libm-test.inc
index caa3ba414d5e87600e0d974ec8d02f909b172fbc..aeba1ae7be69b910b57102c26197e2714b412325 100644 (file)
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -2114,6 +2114,7 @@ cos_test (void)
 
 #ifdef TEST_DOUBLE
   TEST_f_f (cos, 0.80190127184058835, 0.69534156199418473);
+  TEST_f_f (cos, 1e22, 0.5232147853951389454975944733847);
 #endif
 
   END (cos);
@@ -6390,6 +6391,7 @@ sin_test (void)
 #ifdef TEST_DOUBLE
   TEST_f_f (sin, 0.80190127184058835, 0.71867942238767868);
   TEST_f_f (sin, 2.522464e-1, 2.4957989804940911e-1);
+  TEST_f_f (sin, 1e22, -0.8522008497671888017727058937530);
 #endif
 
   END (sin);
@@ -6561,7 +6563,9 @@ sincos_test (void)
 
 #ifdef TEST_DOUBLE
   TEST_extra (sincos, 0.80190127184058835, 0.71867942238767868, 0.69534156199418473);
+  TEST_extra (sincos, 1e22, -0.8522008497671888017727058937530, 0.5232147853951389454975944733847);
 #endif
+  
 
   END (sincos);
 }

diff --git a/posix/glob.c b/posix/glob.c
index 68ea2055daff90d343a33016001eb9bac170a1a5..b92dc24240a79523509613f0b387c36da978cf77 100644 (file)
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011
+/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -1545,7 +1545,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
        {
 #ifdef _LIBC
          int dfd = (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)
-                    ? -1 : dirfd ((DIR *) stream));
+                    ? -1 : __dirfd ((DIR *) stream));
 #endif
          int fnm_flags = ((!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0)
                           | ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)

diff --git a/sysdeps/mach/hurd/dirfd.c b/sysdeps/mach/hurd/dirfd.c
index 587ae7b2f159541418b55b02368539e3fb774239..975bc02863f22d2ebf9f83122ce5ecb7e204d062 100644 (file)
--- a/sysdeps/mach/hurd/dirfd.c
+++ b/sysdeps/mach/hurd/dirfd.c
@@ -1,5 +1,5 @@
 /* dirfd -- Return the file descriptor used by a DIR stream.  Hurd version.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2012 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
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 int
-dirfd (DIR *dirp)
+__dirfd (DIR *dirp)
 {
   int fd;
   __mutex_lock (&_hurd_dtable_lock);
@@ -38,3 +38,4 @@ dirfd (DIR *dirp)
 
   return fd;
 }
+weak_alias(__dirfd, dirfd)

diff --git a/sysdeps/unix/dirfd.c b/sysdeps/unix/dirfd.c
index 536c44e30e4bdd080bfb8845f038cdfc152a4a1b..0cdacf91636f68c2af64375fafd07fd30a508704 100644 (file)
--- a/sysdeps/unix/dirfd.c
+++ b/sysdeps/unix/dirfd.c
@@ -1,5 +1,5 @@
 /* Return the file descriptor used by a DIR stream.  Unix version.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2012 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
@@ -22,8 +22,9 @@
 #undef dirfd
 
 int
-dirfd (dirp)
+__dirfd (dirp)
      DIR *dirp;
 {
   return dirp->fd;
 }
+weak_alias(__dirfd, dirfd)

diff --git a/sysdeps/unix/sysv/linux/grantpt.c b/sysdeps/unix/sysv/linux/grantpt.c
index 0a3cd472fa2cbfb348e3cc460c5a2ff1fdd3e7b0..06b696b3f725ba7fc882de88d22402f8ac8a7511 100644 (file)
--- a/sysdeps/unix/sysv/linux/grantpt.c
+++ b/sysdeps/unix/sysv/linux/grantpt.c
@@ -25,7 +25,7 @@ close_all_fds (void)
          {
            char *endp;
            long int fd = strtol (d->d_name, &endp, 10);
-           if (*endp == '\0' && fd != PTY_FILENO && fd != dirfd (dir))
+           if (*endp == '\0' && fd != PTY_FILENO && fd != __dirfd (dir))
              close_not_cancel_no_status (fd);
          }
 

diff --git a/sysdeps/x86_64/fpu/s_sincos.S b/sysdeps/x86_64/fpu/s_sincos.S
deleted file mode 100644 (file)
index 3bc9d71..0000000
--- a/sysdeps/x86_64/fpu/s_sincos.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Compute sine and cosine of argument.
-   Copyright (C) 1997, 2000, 2001, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <machine/asm.h>
-#include "bp-sym.h"
-#include "bp-asm.h"
-
-#define PARMS  LINKAGE         /* no space for saved regs */
-#define ANGLE  PARMS
-#define SINP   ANGLE+12
-#define COSP   SINP+PTR_SIZE
-
-       .text
-ENTRY (BP_SYM (__sincos))
-       ENTER
-
-       movsd   %xmm0, -8(%rsp)
-       fldl    -8(%rsp)
-       fsincos
-       fnstsw  %ax
-       testl   $0x400,%eax
-       jnz     1f
-       fstpl   (%rsi)
-       fstpl   (%rdi)
-
-       LEAVE
-       retq
-
-1:     fldpi
-       fadd    %st(0)
-       fxch    %st(1)
-2:     fprem1
-       fnstsw  %ax
-       testl   $0x400,%eax
-       jnz     2b
-       fstp    %st(1)
-       fsincos
-       fstpl   (%rsi)
-       fstpl   (%rdi)
-
-       LEAVE
-       retq
-END (BP_SYM (__sincos))
-weak_alias (BP_SYM (__sincos), BP_SYM (sincos))