[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r7349 - in /trunk/libc: ./ include/ nptl/ resolv/nss_dns/ sysdeps/unix/sysv/linux/bits/ sysdeps/x86_64/
- To: commits@xxxxxxxxxx
- Subject: [commits] r7349 - in /trunk/libc: ./ include/ nptl/ resolv/nss_dns/ sysdeps/unix/sysv/linux/bits/ sysdeps/x86_64/
- From: joseph@xxxxxxxxxx
- Date: Mon, 17 Nov 2008 16:50:16 -0000
Author: joseph
Date: Mon Nov 17 08:50:16 2008
New Revision: 7349
Log:
Merge changes between r7310 and r7325 from /fsf/trunk.
Added:
trunk/libc/nptl/tst-cond23.c
- copied unchanged from r7325, fsf/trunk/libc/nptl/tst-cond23.c
trunk/libc/sysdeps/x86_64/configure
- copied unchanged from r7325, fsf/trunk/libc/sysdeps/x86_64/configure
Modified:
trunk/libc/ChangeLog
trunk/libc/configure
trunk/libc/configure.in
trunk/libc/include/features.h
trunk/libc/nptl/ChangeLog
trunk/libc/nptl/Makefile
trunk/libc/nptl/pthread_cond_init.c
trunk/libc/nptl/pthread_condattr_setclock.c
trunk/libc/resolv/nss_dns/dns-host.c
trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h
trunk/libc/version.h
Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Mon Nov 17 08:50:16 2008
@@ -1,3 +1,26 @@
+2008-11-13 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * version.h: Bump for 2.9 release.
+ * include/features.h (__GLIBC_MINOR__): Bump to 9.
+
+ [BZ #7029]
+ * sysdeps/unix/sysv/linux/bits/sched.h (__CPU_ALLOC_SIZE):
+ Multiply with sizeof of __cpu_mask, not 8 unconditionally after
+ all the rounding.
+
+2008-11-11 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #7009]
+ * resolv/nss_dns/dns-host.c (gaih_getanswer_slice): Don't abort for
+ unknown request types for now.
+
+2008-11-11 Roland McGrath <roland@xxxxxxxxxx>
+
+ * sysdeps/x86_64/configure: New file.
+
+ * configure.in: Add AC_SUBST(libc_cv_cpp_asm_debuginfo).
+ * configure: Regenerated.
+
2008-11-03 Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
* sysdeps/s390/s390-64/dl-trampoline.S (_dl_runtime_profile): Use the
Modified: trunk/libc/configure
==============================================================================
--- trunk/libc/configure (original)
+++ trunk/libc/configure Mon Nov 17 08:50:16 2008
@@ -313,7 +313,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR NM OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH_SHELL libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_cc_with_libunwind libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_gnu89_inline libc_cv_have_initfini no_whole_archive exceptions libc_cv_cc_submachine LIBGD have_libaudit have_libcap have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR NM OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH_SHELL libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_cc_with_libunwind libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_gnu89_inline libc_cv_have_initfini no_whole_archive exceptions libc_cv_cc_submachine LIBGD have_libaudit have_libcap have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind libc_cv_cpp_asm_debuginfo use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -7853,6 +7853,8 @@
{ echo "$as_me:$LINENO: WARNING: *** be removed." >&5
echo "$as_me: WARNING: *** be removed." >&2;}
fi
+
+
@@ -8653,6 +8655,7 @@
s,@libc_cv_sysconfdir@,$libc_cv_sysconfdir,;t t
s,@libc_cv_rootsbindir@,$libc_cv_rootsbindir,;t t
s,@libc_cv_forced_unwind@,$libc_cv_forced_unwind,;t t
+s,@libc_cv_cpp_asm_debuginfo@,$libc_cv_cpp_asm_debuginfo,;t t
s,@use_ldconfig@,$use_ldconfig,;t t
s,@ldd_rewrite_script@,$ldd_rewrite_script,;t t
s,@elf@,$elf,;t t
Modified: trunk/libc/configure.in
==============================================================================
--- trunk/libc/configure.in (original)
+++ trunk/libc/configure.in Mon Nov 17 08:50:16 2008
@@ -2180,6 +2180,9 @@
AC_SUBST(libc_cv_rootsbindir)
AC_SUBST(libc_cv_forced_unwind)
+dnl sysdeps/CPU/configure.in checks set this via arch-specific asm tests
+AC_SUBST(libc_cv_cpp_asm_debuginfo)
+
AC_SUBST(use_ldconfig)
AC_SUBST(ldd_rewrite_script)
Modified: trunk/libc/include/features.h
==============================================================================
--- trunk/libc/include/features.h (original)
+++ trunk/libc/include/features.h Mon Nov 17 08:50:16 2008
@@ -310,7 +310,7 @@
/* Major and minor version number of the GNU C library package. Use
these macros to test for features in specific releases. */
#define __GLIBC__ 2
-#define __GLIBC_MINOR__ 8
+#define __GLIBC_MINOR__ 9
#define __GLIBC_PREREQ(maj, min) \
((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
Modified: trunk/libc/nptl/ChangeLog
==============================================================================
--- trunk/libc/nptl/ChangeLog (original)
+++ trunk/libc/nptl/ChangeLog Mon Nov 17 08:50:16 2008
@@ -1,3 +1,13 @@
+2008-11-12 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ [BZ #7008]
+ * pthread_condattr_setclock.c (pthread_condattr_setclock): Fix masking
+ of old value.
+ * pthread_cond_init.c (__pthread_cond_init): Fix
+ cond->__data.__nwaiters initialization.
+ * Makefile (tests): Add tst-cond23.
+ * tst-cond23.c: New test.
+
2008-11-07 Jakub Jelinek <jakub@xxxxxxxxxx>
* sysdeps/pthread/malloc-machine.h (MALLOC): Adjust __libc_tsd_define
Modified: trunk/libc/nptl/Makefile
==============================================================================
--- trunk/libc/nptl/Makefile (original)
+++ trunk/libc/nptl/Makefile Mon Nov 17 08:50:16 2008
@@ -209,7 +209,7 @@
tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \
tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \
- tst-cond20 tst-cond21 tst-cond22 \
+ tst-cond20 tst-cond21 tst-cond22 tst-cond23 \
tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \
tst-robust6 tst-robust7 tst-robust8 tst-robust9 \
tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 tst-robustpi5 \
Modified: trunk/libc/nptl/pthread_cond_init.c
==============================================================================
--- trunk/libc/nptl/pthread_cond_init.c (original)
+++ trunk/libc/nptl/pthread_cond_init.c Mon Nov 17 08:50:16 2008
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -31,8 +32,9 @@
cond->__data.__lock = LLL_LOCK_INITIALIZER;
cond->__data.__futex = 0;
cond->__data.__nwaiters = (icond_attr != NULL
- && ((icond_attr->value
- & (COND_NWAITERS_SHIFT << 1)) >> 1));
+ ? ((icond_attr->value >> 1)
+ & ((1 << COND_NWAITERS_SHIFT) - 1))
+ : CLOCK_REALTIME);
cond->__data.__total_seq = 0;
cond->__data.__wakeup_seq = 0;
cond->__data.__woken_seq = 0;
Modified: trunk/libc/nptl/pthread_condattr_setclock.c
==============================================================================
--- trunk/libc/nptl/pthread_condattr_setclock.c (original)
+++ trunk/libc/nptl/pthread_condattr_setclock.c Mon Nov 17 08:50:16 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2003.
@@ -66,7 +66,7 @@
int *valuep = &((struct pthread_condattr *) attr)->value;
- *valuep = ((*valuep & ~(1 << (COND_NWAITERS_SHIFT + 1)) & ~1)
+ *valuep = ((*valuep & ~(((1 << COND_NWAITERS_SHIFT) - 1) << 1))
| (clock_id << 1));
return 0;
Modified: trunk/libc/resolv/nss_dns/dns-host.c
==============================================================================
--- trunk/libc/resolv/nss_dns/dns-host.c (original)
+++ trunk/libc/resolv/nss_dns/dns-host.c Mon Nov 17 08:50:16 2008
@@ -1083,11 +1083,18 @@
}
continue;
}
+#if 1
+ // We should not see any types other than those explicitly listed
+ // below. Some types sent by server seem missing, though. Just
+ // collect the data for now.
+ if (__builtin_expect (type != T_A && type != T_AAAA, 0))
+#else
if (__builtin_expect (type == T_SIG, 0)
|| __builtin_expect (type == T_KEY, 0)
|| __builtin_expect (type == T_NXT, 0)
|| __builtin_expect (type == T_PTR, 0)
|| __builtin_expect (type == T_DNAME, 0))
+#endif
{
/* We don't support DNSSEC yet. For now, ignore the record
and send a low priority message to syslog.
Modified: trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h Mon Nov 17 08:50:16 2008
@@ -1,6 +1,6 @@
/* Definitions of constants and data structure for POSIX 1003.1b-1993
scheduling interface.
- Copyright (C) 1996-1999,2001-2003,2005,2006,2007
+ Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -184,7 +184,7 @@
__dest; }))
# define __CPU_ALLOC_SIZE(count) \
- ((((count) + __NCPUBITS - 1) / __NCPUBITS) * 8)
+ ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
# define __CPU_ALLOC(count) __sched_cpualloc (count)
# define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
Modified: trunk/libc/version.h
==============================================================================
--- trunk/libc/version.h (original)
+++ trunk/libc/version.h Mon Nov 17 08:50:16 2008
@@ -1,4 +1,4 @@
/* This file just defines the current version number of libc. */
-#define RELEASE "development"
-#define VERSION "2.8.90"
+#define RELEASE "stable"
+#define VERSION "2.9"