[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r15794 - in /fsf/trunk/libc: ./ elf/ nis/ posix/ resolv/ sunrpc/ sysdeps/generic/ sysdeps/i386/i686/multiarch/ sysdeps/ieee7...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r15794 - in /fsf/trunk/libc: ./ elf/ nis/ posix/ resolv/ sunrpc/ sysdeps/generic/ sysdeps/i386/i686/multiarch/ sysdeps/ieee7...
- From: eglibc@xxxxxxxxxx
- Date: Sun, 13 Nov 2011 00:02:06 -0000
Author: eglibc
Date: Sun Nov 13 00:02:04 2011
New Revision: 15794
Log:
Import glibc-mainline for 2011-11-13
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/elf/dl-iteratephdr.c
fsf/trunk/libc/nis/nis_table.c
fsf/trunk/libc/posix/regex_internal.c
fsf/trunk/libc/posix/regex_internal.h
fsf/trunk/libc/resolv/getaddrinfo_a.c
fsf/trunk/libc/sunrpc/rpc_prot.c
fsf/trunk/libc/sysdeps/generic/dwarf2.h
fsf/trunk/libc/sysdeps/generic/sysdep.h
fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscmp-c.c
fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcslen-c.c
fsf/trunk/libc/sysdeps/i386/i686/multiarch/wmemcmp-c.c
fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_hypotl.c
fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_j0l.c
fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_j1l.c
fsf/trunk/libc/sysdeps/unix/clock_gettime.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/clock_gettime.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Nov 13 00:02:04 2011
@@ -1,3 +1,45 @@
+2011-11-12 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * sysdeps/unix/clock_gettime.c (clock_gettime): No need to assign
+ result of SYSDEP_GETTIME_CPU to retval.
+ * sysdeps/unix/sysv/linux/clock_gettime.c (SYSDEP_GETTIME_CPU): Add
+ parameter list to macro. Remove trailing semicolon. Adjust users.
+
+ * resolv/getaddrinfo_a.c (getaddrinfo_a): Avoid warning about unused
+ variable.
+
+ * sysdeps/ieee754/ldbl-96/e_j0l.c (__ieee754_j0l): Avoid storing
+ mantissa words.
+ * sysdeps/ieee754/ldbl-96/e_j1l.c (__ieee754_j1l): Likewise.
+
+ * sysdeps/ieee754/ldbl-96/e_hypotl.c (__ieee754_hypotl): Avoid warning
+ from unused variable.
+
+ * sysdeps/generic/sysdep.h: Clean up, pretty print, use dwarf2.h for
+ DWARF definitions.
+ * sysdeps/generic/dwarf2.h: Don't define enums when using the file
+ for assembling.
+
+ * elf/dl-iteratephdr.c [!SHARED] (__dl_iterate_phdr): Don't iterate
+ over namespaces.
+
+ * sunrpc/rpc_prot.c (rejected): Fix case value.
+
+ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Use
+ unsigned long long int to avoid warnings in shift.
+
+ * posix/regex_internal.c (re_string_reconstruct): Actually use result
+ of use of trans.
+ * posix/regex_internal.h (re_string_wchar_at): Remove temporary
+ variable tmp.
+
+ * sysdeps/i386/i686/multiarch/wcscmp-c.c: Avoid warning.
+ * sysdeps/i386/i686/multiarch/wcslen-c.c: Likewise.
+ * sysdeps/i386/i686/multiarch/wmemcmp-c.c: Likewise.
+
+ * nis/nis_table.c (nis_list): Use variable of correct type for
+ result of __follow_path call.
+
2011-11-07 Adhemerval Zanella <azanella@xxxxxxxxxxxxxxxxxx>
* sysdeps/powerpc/fpu/math_private.h: Using inline assembly version
Modified: fsf/trunk/libc/elf/dl-iteratephdr.c
==============================================================================
--- fsf/trunk/libc/elf/dl-iteratephdr.c (original)
+++ fsf/trunk/libc/elf/dl-iteratephdr.c Sun Nov 13 00:02:04 2011
@@ -44,9 +44,10 @@
/* We have to determine the namespace of the caller since this determines
which namespace is reported. */
- const void *caller = RETURN_ADDRESS (0);
size_t nloaded = GL(dl_ns)[0]._ns_nloaded;
Lmid_t ns = 0;
+#ifdef SHARED
+ const void *caller = RETURN_ADDRESS (0);
for (Lmid_t cnt = GL(dl_nns) - 1; cnt > 0; --cnt)
for (struct link_map *l = GL(dl_ns)[cnt]._ns_loaded; l; l = l->l_next)
{
@@ -59,6 +60,7 @@
|| _dl_addr_inside_object (l, (ElfW(Addr)) caller)))
ns = cnt;
}
+#endif
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
{
Modified: fsf/trunk/libc/nis/nis_table.c
==============================================================================
--- fsf/trunk/libc/nis/nis_table.c (original)
+++ fsf/trunk/libc/nis/nis_table.c Sun Nov 13 00:02:04 2011
@@ -101,8 +101,8 @@
}
*val++ = '\0';
if (search_len + 1 >= size)
- {
- size += 1;
+ {
+ size += 1;
nis_attr *newp = realloc (search_val, size * sizeof (nis_attr));
if (newp == NULL)
goto free_null;
@@ -279,8 +279,8 @@
&dir, &bptr, flags & ~MASTER_ONLY);
if (status != NIS_SUCCESS)
{
- NIS_RES_STATUS (res) = status;
- goto fail3;
+ NIS_RES_STATUS (res) = status;
+ goto fail3;
}
while (__nisbind_connect (&bptr) != NIS_SUCCESS)
@@ -368,12 +368,12 @@
else if ((flags & FOLLOW_PATH)
&& NIS_RES_STATUS (res) == NIS_PARTIAL)
{
- clnt_status = __follow_path (&tablepath, &tableptr, ibreq,
- &bptr);
- if (clnt_status != NIS_SUCCESS)
- {
- if (clnt_status == NIS_NOMEMORY)
- NIS_RES_STATUS (res) = clnt_status;
+ enum nis_error err = __follow_path (&tablepath, &tableptr,
+ ibreq, &bptr);
+ if (err != NIS_SUCCESS)
+ {
+ if (err == NIS_NOMEMORY)
+ NIS_RES_STATUS (res) = err;
++done;
}
else
@@ -428,15 +428,15 @@
NIS_RES_STATUS (allres) = NIS_RES_STATUS (res);
xdr_free ((xdrproc_t) _xdr_nis_result, (char *) res);
}
- clnt_status = __follow_path (&tablepath, &tableptr, ibreq,
- &bptr);
- if (clnt_status != NIS_SUCCESS)
+ enum nis_error err = __follow_path (&tablepath, &tableptr,
+ ibreq, &bptr);
+ if (err != NIS_SUCCESS)
{
/* Prepare for the nis_freeresult call. */
memset (res, '\0', sizeof (*res));
- if (clnt_status == NIS_NOMEMORY)
- NIS_RES_STATUS (allres) = clnt_status;
+ if (err == NIS_NOMEMORY)
+ NIS_RES_STATUS (allres) = err;
++done;
}
}
@@ -453,12 +453,12 @@
++done;
else
{
- clnt_status
+ enum nis_error err
= __follow_path (&tablepath, &tableptr, ibreq, &bptr);
- if (clnt_status != NIS_SUCCESS)
+ if (err != NIS_SUCCESS)
{
- if (clnt_status == NIS_NOMEMORY)
- NIS_RES_STATUS (res) = clnt_status;
+ if (err == NIS_NOMEMORY)
+ NIS_RES_STATUS (res) = err;
++done;
}
}
Modified: fsf/trunk/libc/posix/regex_internal.c
==============================================================================
--- fsf/trunk/libc/posix/regex_internal.c (original)
+++ fsf/trunk/libc/posix/regex_internal.c Sun Nov 13 00:02:04 2011
@@ -1,5 +1,5 @@
/* Extended regular expression matching and search library.
- Copyright (C) 2002-2006, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2002-2006, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@xxxxxxxxxxxxxx>.
@@ -736,16 +736,18 @@
unsigned char buf[6];
size_t mbclen;
+ const unsigned char *pp = p;
if (BE (pstr->trans != NULL, 0))
{
int i = mlen < 6 ? mlen : 6;
while (--i >= 0)
buf[i] = pstr->trans[p[i]];
+ pp = buf;
}
/* XXX Don't use mbrtowc, we know which conversion
to use (UTF-8 -> UCS4). */
memset (&cur_state, 0, sizeof (cur_state));
- mbclen = __mbrtowc (&wc2, (const char *) p, mlen,
+ mbclen = __mbrtowc (&wc2, (const char *) pp, mlen,
&cur_state);
if (raw + offset - p <= mbclen
&& mbclen < (size_t) -2)
Modified: fsf/trunk/libc/posix/regex_internal.h
==============================================================================
--- fsf/trunk/libc/posix/regex_internal.h (original)
+++ fsf/trunk/libc/posix/regex_internal.h Sun Nov 13 00:02:04 2011
@@ -1,5 +1,5 @@
/* Extended regular expression matching and search library.
- Copyright (C) 2002-2005, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2002-2005, 2007, 2008, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@xxxxxxxxxxxxxx>.
@@ -744,7 +744,6 @@
# ifdef _LIBC
const unsigned char *p, *extra;
const int32_t *table, *indirect;
- int32_t tmp;
# include <locale/weight.h>
uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
@@ -756,7 +755,7 @@
indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
_NL_COLLATE_INDIRECTMB);
p = pstr->mbs + idx;
- tmp = findidx (&p);
+ findidx (&p);
return p - pstr->mbs - idx;
}
else
Modified: fsf/trunk/libc/resolv/getaddrinfo_a.c
==============================================================================
--- fsf/trunk/libc/resolv/getaddrinfo_a.c (original)
+++ fsf/trunk/libc/resolv/getaddrinfo_a.c Sun Nov 13 00:02:04 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2001.
@@ -125,8 +125,8 @@
while (total > 0)
{
#ifdef DONT_NEED_GAI_MISC_COND
- int result;
- GAI_MISC_WAIT (result, total, NULL, 1);
+ int not_used __attribute__ ((unused));
+ GAI_MISC_WAIT (not_used, total, NULL, 1);
#else
pthread_cond_wait (&cond, &__gai_requests_mutex);
#endif
Modified: fsf/trunk/libc/sunrpc/rpc_prot.c
==============================================================================
--- fsf/trunk/libc/sunrpc/rpc_prot.c (original)
+++ fsf/trunk/libc/sunrpc/rpc_prot.c Sun Nov 13 00:02:04 2011
@@ -214,7 +214,7 @@
{
switch (rjct_stat)
{
- case RPC_VERSMISMATCH:
+ case RPC_MISMATCH:
error->re_status = RPC_VERSMISMATCH;
return;
case AUTH_ERROR:
Modified: fsf/trunk/libc/sysdeps/generic/dwarf2.h
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/dwarf2.h (original)
+++ fsf/trunk/libc/sysdeps/generic/dwarf2.h Sun Nov 13 00:02:04 2011
@@ -1,6 +1,6 @@
/* Declarations and definitions of codes relating to the DWARF2 symbolic
debugging information format.
- Copyright (C) 1992, 1993, 1995, 1996, 1997, 2000
+ Copyright (C) 1992, 1993, 1995, 1996, 1997, 2000, 2011
Free Software Foundation, Inc.
Contributed by Gary Funck (gary@xxxxxxxxxxxx). Derived from the
DWARF 1 implementation written by Ron Guilmette (rfg@xxxxxxxxxxx).
@@ -21,6 +21,9 @@
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+
+#ifndef _DWARF2_H
+#define _DWARF2_H 1
/* This file is derived from the DWARF specification (a public document)
Revision 2.0.0 (July 27, 1993) developed by the UNIX International
@@ -31,6 +34,7 @@
/* This file is shared between GCC and GDB, and should not contain
prototypes. */
+#ifndef __ASSEMBLER__
/* Tag names and codes. */
enum dwarf_tag
@@ -560,6 +564,7 @@
DW_MACINFO_vendor_ext = 255
};
+#endif /* !ASSEMBLER */
/* @@@ For use with GNU frame unwind information. */
@@ -583,3 +588,5 @@
#define DW_EH_PE_aligned 0x50
#define DW_EH_PE_indirect 0x80
+
+#endif /* dwarf2.h */
Modified: fsf/trunk/libc/sysdeps/generic/sysdep.h
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/sysdep.h (original)
+++ fsf/trunk/libc/sysdeps/generic/sysdep.h Sun Nov 13 00:02:04 2011
@@ -1,5 +1,6 @@
/* Generic asm macros used on many machines.
- Copyright (C) 1991,92,93,96,98,2002,2003,2009 Free Software Foundation, Inc.
+ Copyright (C) 1991-1993,96,98,2002,2003,2009,2011
+ 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
@@ -20,19 +21,19 @@
#ifndef C_LABEL
/* Define a macro we can use to construct the asm name for a C symbol. */
-#ifdef NO_UNDERSCORES
-#ifdef __STDC__
-#define C_LABEL(name) name##:
-#else
-#define C_LABEL(name) name/**/:
-#endif
-#else
-#ifdef __STDC__
-#define C_LABEL(name) _##name##:
-#else
-#define C_LABEL(name) _/**/name/**/:
-#endif
-#endif
+# ifdef NO_UNDERSCORES
+# ifdef __STDC__
+# define C_LABEL(name) name##:
+# else
+# define C_LABEL(name) name/**/:
+# endif
+# else
+# ifdef __STDC__
+# define C_LABEL(name) _##name##:
+# else
+# define C_LABEL(name) _/**/name/**/:
+# endif
+# endif
#endif
@@ -40,15 +41,17 @@
/* Mark the end of function named SYM. This is used on some platforms
to generate correct debugging information. */
# ifndef END
-# define END(sym)
+# define END(sym)
# endif
# ifndef JUMPTARGET
-# define JUMPTARGET(sym) sym
+# define JUMPTARGET(sym) sym
# endif
+#endif
/* Makros to generate eh_frame unwind information. */
-# ifdef HAVE_ASM_CFI_DIRECTIVES
+#ifdef HAVE_ASM_CFI_DIRECTIVES
+# ifdef __ASSEMBLER__
# define cfi_startproc .cfi_startproc
# define cfi_endproc .cfi_endproc
# define cfi_def_cfa(reg, off) .cfi_def_cfa reg, off
@@ -67,29 +70,9 @@
# define cfi_window_save .cfi_window_save
# define cfi_personality(enc, exp) .cfi_personality enc, exp
# define cfi_lsda(enc, exp) .cfi_lsda enc, exp
-# else
-# define cfi_startproc
-# define cfi_endproc
-# define cfi_def_cfa(reg, off)
-# define cfi_def_cfa_register(reg)
-# define cfi_def_cfa_offset(off)
-# define cfi_adjust_cfa_offset(off)
-# define cfi_offset(reg, off)
-# define cfi_rel_offset(reg, off)
-# define cfi_register(r1, r2)
-# define cfi_return_column(reg)
-# define cfi_restore(reg)
-# define cfi_same_value(reg)
-# define cfi_undefined(reg)
-# define cfi_remember_state
-# define cfi_restore_state
-# define cfi_window_save
-# define cfi_personality(enc, exp)
-# define cfi_lsda(enc, exp)
-# endif
-#else /* ! ASSEMBLER */
-# ifdef HAVE_ASM_CFI_DIRECTIVES
+# else /* ! ASSEMBLER */
+
# define CFI_STRINGIFY(Name) CFI_STRINGIFY2 (Name)
# define CFI_STRINGIFY2(Name) #Name
# define CFI_STARTPROC ".cfi_startproc"
@@ -124,43 +107,27 @@
".cfi_personality " CFI_STRINGIFY(enc) "," CFI_STRINGIFY(exp)
# define CFI_LSDA(enc, exp) \
".cfi_lsda " CFI_STRINGIFY(enc) "," CFI_STRINGIFY(exp)
-# else
-# define CFI_STARTPROC
-# define CFI_ENDPROC
-# define CFI_DEF_CFA(reg, off)
-# define CFI_DEF_CFA_REGISTER(reg)
-# define CFI_DEF_CFA_OFFSET(off)
-# define CFI_ADJUST_CFA_OFFSET(off)
-# define CFI_OFFSET(reg, off)
-# define CFI_REL_OFFSET(reg, off)
-# define CFI_REGISTER(r1, r2)
-# define CFI_RETURN_COLUMN(reg)
-# define CFI_RESTORE(reg)
-# define CFI_UNDEFINED(reg)
-# define CFI_REMEMBER_STATE
-# define CFI_RESTORE_STATE
-# define CFI_WINDOW_SAVE
-# define CFI_PERSONALITY(enc, exp)
-# define CFI_LSDA(enc, exp)
# endif
-#endif /* __ASSEMBLER__ */
+#else
-/* Values used for encoding parameter of cfi_personality and cfi_lsda. */
-#define DW_EH_PE_absptr 0x00
-#define DW_EH_PE_omit 0xff
-#define DW_EH_PE_uleb128 0x01
-#define DW_EH_PE_udata2 0x02
-#define DW_EH_PE_udata4 0x03
-#define DW_EH_PE_udata8 0x04
-#define DW_EH_PE_sleb128 0x09
-#define DW_EH_PE_sdata2 0x0a
-#define DW_EH_PE_sdata4 0x0b
-#define DW_EH_PE_sdata8 0x0c
-#define DW_EH_PE_signed 0x08
-#define DW_EH_PE_pcrel 0x10
-#define DW_EH_PE_textrel 0x20
-#define DW_EH_PE_datarel 0x30
-#define DW_EH_PE_funcrel 0x40
-#define DW_EH_PE_aligned 0x50
-#define DW_EH_PE_indirect 0x80
+# define CFI_STARTPROC
+# define CFI_ENDPROC
+# define CFI_DEF_CFA(reg, off)
+# define CFI_DEF_CFA_REGISTER(reg)
+# define CFI_DEF_CFA_OFFSET(off)
+# define CFI_ADJUST_CFA_OFFSET(off)
+# define CFI_OFFSET(reg, off)
+# define CFI_REL_OFFSET(reg, off)
+# define CFI_REGISTER(r1, r2)
+# define CFI_RETURN_COLUMN(reg)
+# define CFI_RESTORE(reg)
+# define CFI_UNDEFINED(reg)
+# define CFI_REMEMBER_STATE
+# define CFI_RESTORE_STATE
+# define CFI_WINDOW_SAVE
+# define CFI_PERSONALITY(enc, exp)
+# define CFI_LSDA(enc, exp)
+#endif
+
+#include "dwarf2.h"
Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscmp-c.c
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscmp-c.c (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcscmp-c.c Sun Nov 13 00:02:04 2011
@@ -1,3 +1,5 @@
+#include <wchar.h>
+
#define WCSCMP __wcscmp_ia32
#ifdef SHARED
# undef libc_hidden_def
@@ -5,4 +7,6 @@
__hidden_ver1 (__wcscmp_ia32, __GI_wcscmp, __wcscmp_ia32);
#endif
+extern __typeof (wcscmp) __wcscmp_ia32;
+
#include "wcsmbs/wcscmp.c"
Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcslen-c.c
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcslen-c.c (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/wcslen-c.c Sun Nov 13 00:02:04 2011
@@ -1,5 +1,9 @@
+#include <wchar.h>
+
#ifndef NOT_IN_libc
# define WCSLEN __wcslen_ia32
#endif
+extern __typeof (wcslen) __wcslen_ia32;
+
#include "wcsmbs/wcslen.c"
Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/wmemcmp-c.c
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/wmemcmp-c.c (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/wmemcmp-c.c Sun Nov 13 00:02:04 2011
@@ -1,5 +1,9 @@
+#include <wchar.h>
+
#ifndef NOT_IN_libc
# define WMEMCMP __wmemcmp_ia32
#endif
+extern __typeof (wmemcmp) __wmemcmp_ia32;
+
#include "wcsmbs/wmemcmp.c"
Modified: fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_hypotl.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_hypotl.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_hypotl.c Sun Nov 13 00:02:04 2011
@@ -70,7 +70,8 @@
k=0;
if(__builtin_expect(ea > 0x5f3f,0)) { /* a>2**8000 */
if(ea == 0x7fff) { /* Inf or NaN */
- u_int32_t exp,high,low;
+ u_int32_t exp __attribute__ ((unused));
+ u_int32_t high,low;
w = a+b; /* for sNaN */
GET_LDOUBLE_WORDS(exp,high,low,a);
if(((high&0x7fffffff)|low)==0) w = a;
@@ -85,7 +86,8 @@
}
if(__builtin_expect(eb < 0x20bf, 0)) { /* b < 2**-8000 */
if(eb == 0) { /* subnormal b or 0 */
- u_int32_t exp,high,low;
+ u_int32_t exp __attribute__ ((unused));
+ u_int32_t high,low;
GET_LDOUBLE_WORDS(exp,high,low,b);
if((high|low)==0) return a;
SET_LDOUBLE_WORDS(t1, 0x7ffd, 0, 0); /* t1=2^16382 */
Modified: fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_j0l.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_j0l.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_j0l.c Sun Nov 13 00:02:04 2011
@@ -108,9 +108,9 @@
{
long double z, s, c, ss, cc, r, u, v;
int32_t ix;
- u_int32_t se, i0, i1;
-
- GET_LDOUBLE_WORDS (se, i0, i1, x);
+ u_int32_t se;
+
+ GET_LDOUBLE_EXP (se, x);
ix = se & 0x7fff;
if (__builtin_expect (ix >= 0x7fff, 0))
return one / (x * x);
Modified: fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_j1l.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_j1l.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/ldbl-96/e_j1l.c Sun Nov 13 00:02:04 2011
@@ -110,9 +110,9 @@
{
long double z, c, r, s, ss, cc, u, v, y;
int32_t ix;
- u_int32_t se, i0, i1;
-
- GET_LDOUBLE_WORDS (se, i0, i1, x);
+ u_int32_t se;
+
+ GET_LDOUBLE_EXP (se, x);
ix = se & 0x7fff;
if (__builtin_expect (ix >= 0x7fff, 0))
return one / x;
Modified: fsf/trunk/libc/sysdeps/unix/clock_gettime.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/clock_gettime.c (original)
+++ fsf/trunk/libc/sysdeps/unix/clock_gettime.c Sun Nov 13 00:02:04 2011
@@ -113,7 +113,7 @@
default:
#ifdef SYSDEP_GETTIME_CPU
- retval = SYSDEP_GETTIME_CPU (clock_id, tp);
+ SYSDEP_GETTIME_CPU (clock_id, tp);
#endif
#if HP_TIMING_AVAIL
if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1))
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/clock_gettime.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/clock_gettime.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/clock_gettime.c Sun Nov 13 00:02:04 2011
@@ -45,8 +45,8 @@
/* This means the REALTIME and MONOTONIC clock are definitely
supported in the kernel. */
-# define SYSDEP_GETTIME \
- SYSDEP_GETTIME_CPUTIME \
+# define SYSDEP_GETTIME \
+ SYSDEP_GETTIME_CPUTIME; \
case CLOCK_REALTIME: \
case CLOCK_MONOTONIC: \
retval = SYSCALL_GETTIME (clock_id, tp); \
@@ -82,8 +82,8 @@
/* The REALTIME and MONOTONIC clock might be available. Try the
syscall first. */
-# define SYSDEP_GETTIME \
- SYSDEP_GETTIME_CPUTIME \
+# define SYSDEP_GETTIME \
+ SYSDEP_GETTIME_CPUTIME; \
case CLOCK_REALTIME: \
case CLOCK_MONOTONIC: \
case CLOCK_MONOTONIC_RAW: \
@@ -100,7 +100,7 @@
__set_errno (retval); \
retval = -1; \
} \
- break;
+ break
#endif
#ifdef __NR_clock_gettime
@@ -164,7 +164,7 @@
return e;
}
-# define SYSDEP_GETTIME_CPU \
+# define SYSDEP_GETTIME_CPU(clock_id, tp) \
retval = maybe_syscall_gettime_cpu (clock_id, tp); \
if (retval == 0) \
break; \
@@ -199,7 +199,7 @@
break; \
} \
retval = hp_timing_gettime (clock_id, tp); \
- break;
+ break
# if !HP_TIMING_AVAIL
# define hp_timing_gettime(clock_id, tp) (__set_errno (EINVAL), -1)
# endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c Sun Nov 13 00:02:04 2011
@@ -237,9 +237,13 @@
buf->f_files = fsbuf->f_files;
buf->f_ffree = fsbuf->f_ffree;
if (sizeof (buf->f_fsid) == sizeof (fsbuf->f_fsid))
+ /* The shifting uses 'unsigned long long int' even though the target
+ field might only have 32 bits. This is OK since the 'if' branch
+ is not used in this case but the compiler would still generate
+ warnings. */
buf->f_fsid = ((fsbuf->f_fsid.__val[0]
- & ((1UL << (8 * sizeof (fsbuf->f_fsid.__val[0]))) - 1))
- | ((unsigned long int) fsbuf->f_fsid.__val[1]
+ & ((1ULL << (8 * sizeof (fsbuf->f_fsid.__val[0]))) - 1))
+ | ((unsigned long long int) fsbuf->f_fsid.__val[1]
<< (8 * (sizeof (buf->f_fsid)
- sizeof (fsbuf->f_fsid.__val[0])))));
else
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits