This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-517-g7edb22e
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Nov 2011 12:43:36 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-517-g7edb22e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 7edb22eff50b957c5b40815d0974639db19f5870 (commit)
via 9694fc4479ce3c9b9e5df3f81a958d120f60962b (commit)
via 8ad89ef88d66f13e139c7dbd16b78729ec1af41c (commit)
via 0c822ef9883c8c28929734eceb104729ba9e62e0 (commit)
via ca743930cdd78629f1a246b8b7eff3f01f3b3dbe (commit)
via 7da46b42d1f9e15280ea325e0a39c548e512fbee (commit)
via 874e05643b8bb121a69b672080c3e265a9fad926 (commit)
via 3a2edc79edb6c802679ac930f82ce1e261a2aabd (commit)
via f3c2577fdc5755c0c70e72df57d4c25b77552bce (commit)
via 294ce12680bfa52aa7f9f1cb93b2bb5b2d22eaae (commit)
via 5e2b63c65892e054980570957f533312cfd223c2 (commit)
via e7f4b08ee9b36cc1fdb7d7f72013788a832a9f22 (commit)
via ab26144ebb79009a4cdf50c6768bcb4b2debcdcb (commit)
from 8a6d525522b2fb04cec86b48c5b25818d395bbbd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7edb22eff50b957c5b40815d0974639db19f5870
commit 7edb22eff50b957c5b40815d0974639db19f5870
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 02:54:34 2011 -0500
Fix wanings in clock_gettime
diff --git a/ChangeLog b/ChangeLog
index 145c38b..8612676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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.
diff --git a/sysdeps/unix/clock_gettime.c b/sysdeps/unix/clock_gettime.c
index d467f2b..b4355d4 100644
--- a/sysdeps/unix/clock_gettime.c
+++ b/sysdeps/unix/clock_gettime.c
@@ -113,7 +113,7 @@ clock_gettime (clockid_t clock_id, struct timespec *tp)
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))
diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c
index 0ae45de..e5e032d 100644
--- a/sysdeps/unix/sysv/linux/clock_gettime.c
+++ b/sysdeps/unix/sysv/linux/clock_gettime.c
@@ -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 @@ maybe_syscall_gettime (clockid_t clock_id, struct timespec *tp)
/* 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 @@ maybe_syscall_gettime (clockid_t clock_id, struct timespec *tp)
__set_errno (retval); \
retval = -1; \
} \
- break;
+ break
#endif
#ifdef __NR_clock_gettime
@@ -164,7 +164,7 @@ maybe_syscall_gettime_cpu (clockid_t clock_id, struct timespec *tp)
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 @@ maybe_syscall_gettime_cputime (clockid_t clock_id, struct timespec *tp)
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
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9694fc4479ce3c9b9e5df3f81a958d120f60962b
commit 9694fc4479ce3c9b9e5df3f81a958d120f60962b
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 02:30:01 2011 -0500
Avoid unused warning in getaddrinfo_a
diff --git a/ChangeLog b/ChangeLog
index c50ab96..145c38b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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.
diff --git a/resolv/getaddrinfo_a.c b/resolv/getaddrinfo_a.c
index f6af3aa..6f4ad8d 100644
--- a/resolv/getaddrinfo_a.c
+++ b/resolv/getaddrinfo_a.c
@@ -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@redhat.com>, 2001.
@@ -125,8 +125,8 @@ getaddrinfo_a (int mode, struct gaicb *list[], int ent, struct sigevent *sig)
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
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8ad89ef88d66f13e139c7dbd16b78729ec1af41c
commit 8ad89ef88d66f13e139c7dbd16b78729ec1af41c
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 02:20:29 2011 -0500
Avoid warnings about unused variable in 96-bit j0l and j1l
diff --git a/ChangeLog b/ChangeLog
index ceea48e..c50ab96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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.
diff --git a/sysdeps/ieee754/ldbl-96/e_j0l.c b/sysdeps/ieee754/ldbl-96/e_j0l.c
index abf4f10..325408d 100644
--- a/sysdeps/ieee754/ldbl-96/e_j0l.c
+++ b/sysdeps/ieee754/ldbl-96/e_j0l.c
@@ -108,9 +108,9 @@ __ieee754_j0l (long double x)
{
long double z, s, c, ss, cc, r, u, v;
int32_t ix;
- u_int32_t se, i0, i1;
+ u_int32_t se;
- GET_LDOUBLE_WORDS (se, i0, i1, x);
+ GET_LDOUBLE_EXP (se, x);
ix = se & 0x7fff;
if (__builtin_expect (ix >= 0x7fff, 0))
return one / (x * x);
diff --git a/sysdeps/ieee754/ldbl-96/e_j1l.c b/sysdeps/ieee754/ldbl-96/e_j1l.c
index 369fd83..d7fcc9b 100644
--- a/sysdeps/ieee754/ldbl-96/e_j1l.c
+++ b/sysdeps/ieee754/ldbl-96/e_j1l.c
@@ -110,9 +110,9 @@ __ieee754_j1l (long double x)
{
long double z, c, r, s, ss, cc, u, v, y;
int32_t ix;
- u_int32_t se, i0, i1;
+ u_int32_t se;
- GET_LDOUBLE_WORDS (se, i0, i1, x);
+ GET_LDOUBLE_EXP (se, x);
ix = se & 0x7fff;
if (__builtin_expect (ix >= 0x7fff, 0))
return one / x;
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0c822ef9883c8c28929734eceb104729ba9e62e0
commit 0c822ef9883c8c28929734eceb104729ba9e62e0
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 02:15:07 2011 -0500
Avoid warnings about unused variables in 96-bit hypotl
diff --git a/ChangeLog b/ChangeLog
index 1b61bbf..ceea48e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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
diff --git a/sysdeps/ieee754/ldbl-96/e_hypotl.c b/sysdeps/ieee754/ldbl-96/e_hypotl.c
index a59320b..5e0b37e 100644
--- a/sysdeps/ieee754/ldbl-96/e_hypotl.c
+++ b/sysdeps/ieee754/ldbl-96/e_hypotl.c
@@ -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 */
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ca743930cdd78629f1a246b8b7eff3f01f3b3dbe
commit ca743930cdd78629f1a246b8b7eff3f01f3b3dbe
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 02:11:48 2011 -0500
Prepare dwarf2.h for multiple inclusion
diff --git a/sysdeps/generic/dwarf2.h b/sysdeps/generic/dwarf2.h
index 89ed073..26ceef6 100644
--- a/sysdeps/generic/dwarf2.h
+++ b/sysdeps/generic/dwarf2.h
@@ -22,6 +22,9 @@
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
Programming Languages Special Interest Group (UI/PLSIG) and distributed
@@ -585,3 +588,5 @@ enum dwarf_macinfo_record_type
#define DW_EH_PE_aligned 0x50
#define DW_EH_PE_indirect 0x80
+
+#endif /* dwarf2.h */
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7da46b42d1f9e15280ea325e0a39c548e512fbee
commit 7da46b42d1f9e15280ea325e0a39c548e512fbee
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 02:10:45 2011 -0500
Fix incomplete edit in last patch
diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h
index 2a5f5d4..eecbd73 100644
--- a/sysdeps/generic/sysdep.h
+++ b/sysdeps/generic/sysdep.h
@@ -130,6 +130,4 @@
# define CFI_LSDA(enc, exp)
#endif
-#endif /* __ASSEMBLER__ */
-
#include "dwarf2.h"
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=874e05643b8bb121a69b672080c3e265a9fad926
commit 874e05643b8bb121a69b672080c3e265a9fad926
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 02:06:05 2011 -0500
Avoid redefinition of DWARF constants
diff --git a/ChangeLog b/ChangeLog
index 59d9157..1b61bbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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.
diff --git a/sysdeps/generic/dwarf2.h b/sysdeps/generic/dwarf2.h
index 9fca4c0..89ed073 100644
--- a/sysdeps/generic/dwarf2.h
+++ b/sysdeps/generic/dwarf2.h
@@ -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@intrepid.com). Derived from the
DWARF 1 implementation written by Ron Guilmette (rfg@monkeys.com).
@@ -31,6 +31,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 +561,7 @@ enum dwarf_macinfo_record_type
DW_MACINFO_vendor_ext = 255
};
+#endif /* !ASSEMBLER */
/* @@@ For use with GNU frame unwind information. */
diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h
index 54884d9..2a5f5d4 100644
--- a/sysdeps/generic/sysdep.h
+++ b/sysdeps/generic/sysdep.h
@@ -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,29 @@
".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
+#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__ */
-/* 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
+#include "dwarf2.h"
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3a2edc79edb6c802679ac930f82ce1e261a2aabd
commit 3a2edc79edb6c802679ac930f82ce1e261a2aabd
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 01:49:14 2011 -0500
Fix warning in __dl_iterate_phdr
diff --git a/ChangeLog b/ChangeLog
index 4cbffb9..59d9157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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
diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c
index 45107a9..33b56c9 100644
--- a/elf/dl-iteratephdr.c
+++ b/elf/dl-iteratephdr.c
@@ -44,9 +44,10 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
/* 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_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
|| _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)
{
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f3c2577fdc5755c0c70e72df57d4c25b77552bce
commit f3c2577fdc5755c0c70e72df57d4c25b77552bce
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 01:41:05 2011 -0500
Fix case value used in RPC cod
diff --git a/ChangeLog b/ChangeLog
index aa29e14..4cbffb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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.
diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c
index b19dff7..9a23cc1 100644
--- a/sunrpc/rpc_prot.c
+++ b/sunrpc/rpc_prot.c
@@ -214,7 +214,7 @@ rejected (enum reject_stat rjct_stat,
{
switch (rjct_stat)
{
- case RPC_VERSMISMATCH:
+ case RPC_MISMATCH:
error->re_status = RPC_VERSMISMATCH;
return;
case AUTH_ERROR:
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=294ce12680bfa52aa7f9f1cb93b2bb5b2d22eaae
commit 294ce12680bfa52aa7f9f1cb93b2bb5b2d22eaae
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 01:31:29 2011 -0500
Avoid warning from shifting
diff --git a/ChangeLog b/ChangeLog
index 897174e..aa29e14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
index 2ddec1e..a0bad02 100644
--- a/sysdeps/unix/sysv/linux/internal_statvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
@@ -237,9 +237,13 @@ INTERNAL_STATVFS (const char *name, struct STATVFS *buf,
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
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5e2b63c65892e054980570957f533312cfd223c2
commit 5e2b63c65892e054980570957f533312cfd223c2
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 01:23:45 2011 -0500
Fix warnings in regex
diff --git a/ChangeLog b/ChangeLog
index 192f38c..897174e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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.
diff --git a/posix/regex_internal.c b/posix/regex_internal.c
index 285ae3b..bc19243 100644
--- a/posix/regex_internal.c
+++ b/posix/regex_internal.c
@@ -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@yamato.ibm.com>.
@@ -736,16 +736,18 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
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)
diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index 65a9905..74dd230 100644
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -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@yamato.ibm.com>.
@@ -744,7 +744,6 @@ re_string_elem_size_at (const re_string_t *pstr, int idx)
# 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 @@ re_string_elem_size_at (const re_string_t *pstr, int idx)
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
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e7f4b08ee9b36cc1fdb7d7f72013788a832a9f22
commit e7f4b08ee9b36cc1fdb7d7f72013788a832a9f22
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 00:50:26 2011 -0500
Fix warnings in fallback C code of x86-32 wide memory functions
diff --git a/ChangeLog b/ChangeLog
index dd1e49f..192f38c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
+ * 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.
diff --git a/sysdeps/i386/i686/multiarch/wcscmp-c.c b/sysdeps/i386/i686/multiarch/wcscmp-c.c
index 53cc4e9..165c56a 100644
--- a/sysdeps/i386/i686/multiarch/wcscmp-c.c
+++ b/sysdeps/i386/i686/multiarch/wcscmp-c.c
@@ -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"
diff --git a/sysdeps/i386/i686/multiarch/wcslen-c.c b/sysdeps/i386/i686/multiarch/wcslen-c.c
index 49f32a2..8cebfea 100644
--- a/sysdeps/i386/i686/multiarch/wcslen-c.c
+++ b/sysdeps/i386/i686/multiarch/wcslen-c.c
@@ -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"
diff --git a/sysdeps/i386/i686/multiarch/wmemcmp-c.c b/sysdeps/i386/i686/multiarch/wmemcmp-c.c
index 94ff615..bd37660 100644
--- a/sysdeps/i386/i686/multiarch/wmemcmp-c.c
+++ b/sysdeps/i386/i686/multiarch/wmemcmp-c.c
@@ -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"
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ab26144ebb79009a4cdf50c6768bcb4b2debcdcb
commit ab26144ebb79009a4cdf50c6768bcb4b2debcdcb
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Nov 12 00:18:19 2011 -0500
Fix warning in nis_table
diff --git a/ChangeLog b/ChangeLog
index 0fe09d0..dd1e49f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-12 Ulrich Drepper <drepper@gmail.com>
+
+ * nis/nis_table.c (nis_list): Use variable of correct type for
+ result of __follow_path call.
+
2011-11-07 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/fpu/math_private.h: Using inline assembly version
diff --git a/nis/nis_table.c b/nis/nis_table.c
index aba2897..c628ed6 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -101,8 +101,8 @@ __create_ib_request (const_nis_name name, unsigned int flags)
}
*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 @@ nis_list (const_nis_name name, unsigned int flags,
&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 @@ nis_list (const_nis_name name, unsigned int flags,
else if ((flags & FOLLOW_PATH)
&& NIS_RES_STATUS (res) == NIS_PARTIAL)
{
- 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)
{
- if (clnt_status == NIS_NOMEMORY)
- NIS_RES_STATUS (res) = clnt_status;
+ if (err == NIS_NOMEMORY)
+ NIS_RES_STATUS (res) = err;
++done;
}
else
@@ -428,15 +428,15 @@ nis_list (const_nis_name name, unsigned int flags,
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 @@ nis_list (const_nis_name name, unsigned int flags,
++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;
}
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 42 ++++++++++
elf/dl-iteratephdr.c | 4 +-
nis/nis_table.c | 36 ++++----
posix/regex_internal.c | 6 +-
posix/regex_internal.h | 5 +-
resolv/getaddrinfo_a.c | 6 +-
sunrpc/rpc_prot.c | 2 +-
sysdeps/generic/dwarf2.h | 9 ++-
sysdeps/generic/sysdep.h | 119 ++++++++++------------------
sysdeps/i386/i686/multiarch/wcscmp-c.c | 4 +
sysdeps/i386/i686/multiarch/wcslen-c.c | 4 +
sysdeps/i386/i686/multiarch/wmemcmp-c.c | 4 +
sysdeps/ieee754/ldbl-96/e_hypotl.c | 6 +-
sysdeps/ieee754/ldbl-96/e_j0l.c | 4 +-
sysdeps/ieee754/ldbl-96/e_j1l.c | 4 +-
sysdeps/unix/clock_gettime.c | 2 +-
sysdeps/unix/sysv/linux/clock_gettime.c | 14 ++--
sysdeps/unix/sysv/linux/internal_statvfs.c | 8 ++-
18 files changed, 158 insertions(+), 121 deletions(-)
hooks/post-receive
--
GNU C Library master sources