glibc/glibc-fedora.patch

4664 lines
145 KiB
Diff
Raw Normal View History

2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/ChangeLog
+++ glibc-2.14-3/ChangeLog
@@ -1,3 +1,13 @@
+2011-06-21 Andreas Schwab <schwab@redhat.com>
2011-05-31 12:54:27 +00:00
+
2011-06-21 12:59:31 +00:00
+ * iconvdata/gb18030.c: Regenerate tables.
2011-05-31 12:54:27 +00:00
+
2011-06-21 12:59:31 +00:00
+2011-06-16 Andreas Schwab <schwab@redhat.com>
+
+ [BZ #12885]
+ * sysdeps/posix/getaddrinfo.c (gaih_inet): Filter results from
+ gethostbyname4_r according to request flags.
+
2011-06-15 Ulrich Drepper <drepper@gmail.com>
2011-06-03 12:29:51 +00:00
2011-06-21 12:59:31 +00:00
* resolv/res_send.c (__libc_res_nsend): Fix typos in last patch. We
@@ -475,6 +485,13 @@
2011-05-18 14:18:54 +00:00
* libio/Makefile (tests): Add bug-fclose1.
* libio/bug-fclose1.c: New file.
2011-05-13 14:56:46 +00:00
+2011-05-13 Andreas Schwab <schwab@redhat.com>
2011-05-06 10:41:38 +00:00
+
2011-05-13 14:56:46 +00:00
+ * elf/dl-load.c (is_dst): Remove parameter secure, all callers
+ changed. Move check for valid use of $ORIGIN ...
+ (_dl_dst_substitute): ... here. Reset check_for_trusted when a
+ path element is skipped.
2011-05-06 10:41:38 +00:00
+
2011-05-13 14:56:46 +00:00
2011-05-12 Ulrich Drepper <drepper@gmail.com>
2011-05-06 10:41:38 +00:00
2011-05-13 14:56:46 +00:00
[BZ #12511]
2011-06-21 12:59:31 +00:00
@@ -752,13 +769,6 @@
* stdlib/bug-getcontext.c: New file.
* stdlib/Makefile: Add rules to build and run bug-getcontext.
-2011-04-13 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
-
- * sysdeps/s390/s390-64/utf16-utf32-z9.c: Wrap the z9-109
- instructions into .machine "z9-109".
- * sysdeps/s390/s390-64/utf8-utf16-z9.c: Likewise.
- * sysdeps/s390/s390-64/utf8-utf32-z9.c: Likewise.
-
2011-04-11 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes
@@ -996,6 +1006,31 @@
2011-04-07 11:22:58 +00:00
* sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime):
Export.
+2011-04-06 Andreas Schwab <schwab@redhat.com>
+
+ * scripts/check-local-headers.sh: Ignore systemtap headers.
+
+2011-02-21 Roland McGrath <roland@redhat.com>
+
+ * sysdeps/x86_64/__longjmp.S: Add a static probe here.
+ * sysdeps/x86_64/setjmp.S: Likewise.
+ * sysdeps/i386/bsd-setjmp.S: Likewise.
+ * sysdeps/i386/bsd-_setjmp.S: Likewise.
+ * sysdeps/i386/setjmp.S: Likewise.
+ * sysdeps/i386/__longjmp.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/____longjmp_chk.S: Likewise.
+
+2011-02-08 Roland McGrath <roland@redhat.com>
+
+ * include/stap-probe.h: New file.
+ * configure.in: Handle --enable-systemtap.
+ * configure: Regenerated.
+ * config.h.in (USE_STAP_PROBE): New #undef.
+ * extra-lib.mk (CPPFLAGS-$(lib)): Add -DIN_LIB=$(lib).
+ * elf/Makefile (CPPFLAGS-.os): Add -DIN_LIB=rtld.
+ * elf/rtld-Rules (rtld-CPPFLAGS): Likewise.
+
2011-03-22 Ulrich Drepper <drepper@gmail.com>
* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment
2011-06-21 12:59:31 +00:00
@@ -1056,6 +1091,16 @@
2011-03-21 15:34:52 +00:00
$LDFLAGS and -nostdlib -nostartfiles to linking step. Change main
to _start.
+2011-03-18 Andreas Schwab <schwab@redhat.com>
+
+ * elf/ldd.bash.in: Never run file directly.
+
2011-04-07 11:22:58 +00:00
+2011-03-07 Andreas Schwab <schwab@redhat.com>
+
+ * include/link.h (struct link_map): Remove l_orig_initfini.
+ * elf/dl-close.c (_dl_close_worker): Revert its use.
+ * elf/dl-deps.c (_dl_map_object_deps): Likewise.
2011-03-21 15:34:52 +00:00
+
2011-03-06 Ulrich Drepper <drepper@gmail.com>
* elf/dl-load.c (_dl_map_object): If we are looking for the first
2011-06-21 12:59:31 +00:00
@@ -1110,12 +1155,6 @@
2011-03-21 15:34:52 +00:00
* elf/noload.c: Include <memcheck.h>.
(main): Call mtrace. Close all opened handles.
-2011-02-17 Andreas Schwab <schwab@redhat.com>
-
- [BZ #12454]
- * elf/dl-deps.c (_dl_map_object_deps): Signal error early when
- dependencies are missing.
-
2011-02-22 Samuel Thibault <samuel.thibault@ens-lyon.org>
Fix __if_freereq crash: Unlike the generic version which uses free,
2011-06-21 12:59:31 +00:00
@@ -1272,6 +1311,12 @@
2011-02-15 13:29:18 +00:00
* shadow/sgetspent.c: Check return value of __sgetspent_r instead
of errno.
+2011-02-03 Andreas Schwab <schwab@redhat.com>
+
+ * login/programs/pt_chown.c (main): Check for valid file
+ descriptor instead of privileges. Be careful to drop all
+ capabilities when not needed.
2011-03-02 16:28:13 +00:00
+
2011-01-19 Ulrich Drepper <drepper@gmail.com>
2011-02-15 13:29:18 +00:00
2011-03-02 16:28:13 +00:00
[BZ #11724]
2011-06-21 12:59:31 +00:00
@@ -1959,6 +2004,29 @@
2010-10-04 11:27:15 +00:00
* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
Mask out sign-bit copies when constructing f_fsid.
2010-09-27 14:48:52 +00:00
+2010-09-27 Andreas Schwab <schwab@redhat.com>
+
2011-03-07 16:50:04 +00:00
+ * include/link.h (struct link_map): Add l_free_initfini.
+ * elf/dl-deps.c (_dl_map_object_deps): Set it when assigning
+ l_initfini.
+ * elf/rtld.c (dl_main): Clear it on all objects loaded on startup.
+ * elf/dl-libc.c (free_mem): Free l_initfini if l_free_initfini is
+ set.
+
2010-09-27 14:48:52 +00:00
+ [BZ #11561]
+ * posix/regcomp.c (parse_bracket_exp): When looking up collating
+ elements compare against the byte sequence of it, not its name.
+
+ [BZ #6530]
+ * stdio-common/vfprintf.c (process_string_arg): Revert 2000-07-22
+ change.
+
+ * nss/nss_files/files-XXX.c (internal_getent): Declare linebuflen
+ as size_t.
+
+ * sysdeps/i386/i686/multiarch/strspn.S (ENTRY): Add missing
+ backslash.
+
2010-09-24 Petr Baudis <pasky@suse.cz>
* debug/stack_chk_fail_local.c: Add missing licence exception.
2011-06-21 12:59:31 +00:00
@@ -2751,6 +2819,32 @@
2010-07-02 12:42:07 +00:00
call returning > 0 value.
* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
+2010-07-01 Andreas Schwab <schwab@redhat.com>
+
+ * include/sys/resource.h (__getrlimit): Add hidden proto.
+ * sysdeps/unix/sysv/linux/i386/getrlimit.c: Add libc_hidden_weak.
+ * sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def.
+ * resource/getrlimit.c: Likewise.
+
+2010-06-28 Andreas Schwab <schwab@redhat.com>
+
+ * allocatestack.c (setxid_mark_thread): Ensure that the exiting
+ thread is woken up.
+
+ * elf/Makefile: Add rules to build and run unload8 test.
+ * elf/unload8.c: New file.
+ * elf/unload8mod1.c: New file.
+ * elf/unload8mod1x.c: New file.
+ * elf/unload8mod2.c: New file.
+ * elf/unload8mod3.c: New file.
+
+ * elf/dl-close.c (_dl_close_worker): Reset private search list if
+ it wasn't used.
2011-02-15 13:29:18 +00:00
+
+2010-06-21 Andreas Schwab <schwab@redhat.com>
+
+ * sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler.
2010-07-02 12:42:07 +00:00
+
2010-06-07 Andreas Schwab <schwab@redhat.com>
* dlfcn/Makefile: Remove explicit dependencies on libc.so and
2011-06-21 12:59:31 +00:00
@@ -2803,6 +2897,24 @@
2010-06-15 08:43:24 +00:00
* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
+2010-06-11 Andreas Schwab <schwab@redhat.com>
+
+ * elf/rtld.c (_dl_starting_up): Always define.
+ (dl_main): Always set _dl_starting_up.
+ * elf/dl-support.c (_dl_starting_up): Always define.
+ * elf/dl-init.c (_dl_init): Always clear _dl_starting_up.
+
+2010-06-10 Andreas Schwab <schwab@redhat.com>
+
+ * sysdeps/unix/sysv/linux/getpagesize.c: Don't assume AT_PAGESIZE
+ is always available.
+
+ * sysdeps/unix/sysv/linux/i386/Versions: Export __uname under
+ GLIBC_PRIVATE.
+ * nptl/Versions: Export __getrlimit under GLIBC_PRIVATE.
+ * sysdeps/unix/sysv/linux/i386/smp.h: Call __uname instead of uname.
+ * nptl/nptl-init.c: Call __getrlimit instead of getrlimit.
+
2010-05-28 Luis Machado <luisgpm@br.ibm.com>
2010-05-31 15:10:22 +00:00
* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/ChangeLog.15
+++ glibc-2.14-3/ChangeLog.15
@@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek <jakub@redhat.com>
+ * posix/Makefile (generated: Add getconf.speclist.
+ ($(inst_libexecdir)/getconf): Use getconf.speclist instead of
+ getconf output.
+ ($(objpfx)getconf.speclist): New rule.
+ * posix/getconf.speclist.h: New file.
+
+2004-11-26 Jakub Jelinek <jakub@redhat.com>
+
* sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add GETCONF_DIR.
2004-11-26 Kaz Kojima <kkojima@rr.iij4u.or.jp>
@@ -1103,6 +1111,13 @@
* sysdeps/generic/tempname.c (__path_search): Add missing argument
TRY_TMPDIR.
+2004-11-02 Jakub Jelinek <jakub@redhat.com>
+
+ * include/features.h (__USE_FORTIFY_LEVEL): Also set for Red Hat
+ GCC 3.4.x-RH >= 3.4.2-8.
+ * debug/tst-chk1.c (do_test): Deal with GCC 3.4.x-RH not
+ being able to recognize subobjects.
+
2004-10-31 Mariusz Mazur <mmazur@kernel.pl>
* sysdeps/unix/sysv/linux/alpha/setregid.c: New file.
@@ -1443,6 +1458,11 @@
* sysdeps/generic/readonly-area.c (__readonly_str): Renamed to ...
(__readonly_area): ... this.
+2004-10-19 Jakub Jelinek <jakub@redhat.com>
+
+ * include/features.h (__USE_FORTIFY_LEVEL): Enable even with
+ Red Hat gcc4 4.0.0 and above.
+
2004-10-18 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/strcpy_chk.c (__strcpy_chk): Speed up by checking
@@ -3182,6 +3202,23 @@
before return type.
* locale/localename.c (__current_locale_name): Likewise.
+2004-08-31 Jakub Jelinek <jakub@redhat.com>
+
+ * elf/ldconfig.c (parse_conf): Add prefix argument, prepend it
+ before arguments to add_dir and pass to parse_conf_include.
+ (parse_conf_include): Add prefix argument, pass it down to
+ parse_conf.
+ (main): Call arch_startup. Adjust parse_conf caller.
+ Call add_arch_dirs.
+ * sysdeps/generic/dl-cache.h (arch_startup, add_arch_dirs): Define.
+ * sysdeps/unix/sysv/linux/i386/dl-cache.h: New file.
+ * sysdeps/unix/sysv/linux/ia64/dl-cache.h (EMUL_HACK, arch_startup,
+ add_arch_dirs): Define.
+ * sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed: Prepend
+ /emul/ia32-linux before the 32-bit ld.so pathname.
+ * sysdeps/unix/sysv/linux/ia64/dl-procinfo.c: New file.
+ * sysdeps/unix/sysv/linux/ia64/dl-procinfo.h: New file.
+
2004-08-30 Roland McGrath <roland@frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/ChangeLog.16
+++ glibc-2.14-3/ChangeLog.16
2009-11-12 17:51:25 +00:00
@@ -2042,6 +2042,9 @@
(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
followed by __THROW.
+ * sysdeps/unix/sysv/linux/futimesat.c (futimesat): If
+ file == NULL, use __futimes unconditionally.
+
2006-02-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
2009-11-12 17:51:25 +00:00
@@ -2101,6 +2104,11 @@
* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
+2006-01-30 Jakub Jelinek <jakub@redhat.com>
+
+ * include/bits/stdlib-ldbl.h: New file.
+ * include/bits/wchar-ldbl.h: New file.
+
2006-01-19 Thomas Schwinge <tschwinge@gnu.org>
* libio/genops.c: Include <stdbool.h>.
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/ChangeLog.17
+++ glibc-2.14-3/ChangeLog.17
2010-05-19 12:00:46 +00:00
@@ -256,6 +256,12 @@
* Makerules (libc-abis): Fix search for libc-abis in add-ons.
+2010-04-06 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/posix/getaddrinfo.c (default_scopes): Assign global
+ scope to RFC 1918 addresses.
+ * posix/gai.conf: Document difference from RFC 3484.
+
2010-04-05 Thomas Schwinge <thomas@schwinge.name>
* sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.
2011-01-18 15:41:09 +00:00
@@ -1010,6 +1016,13 @@
2010-05-19 12:00:46 +00:00
* sysdeps/x86_64/fpu/fegetenv.c: Likewise
* sysdeps/s390/fpu/fegetenv.c: Likewise. Remove unused headers.
+2009-10-27 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #10855]
+ * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
+ used later with MMAP_FIXED | MMAP_SHARED to cope with different
+ alignment restrictions.
+
2010-02-05 H.J. Lu <hongjiu.lu@intel.com>
[BZ #11230]
2011-01-18 15:41:09 +00:00
@@ -2953,6 +2966,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
2010-05-19 12:00:46 +00:00
* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
the unique symbol hash table should not be const.
+2009-07-22 Jakub Jelinek <jakub@redhat.com>
+
+ * Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS).
+ * sysdeps/i386/Makefile (sysdep-ASFLAGS): Add -U__i686.
+
2009-07-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove
2011-01-18 15:41:09 +00:00
@@ -3218,6 +3236,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
2010-05-19 12:00:46 +00:00
out common code into new function get_common_indeces. Determine
extended family and model for Intel processors.
+2009-06-26 Andreas Schwab <aschwab@redhat.com>
+
+ * timezone/zic.c (stringzone): Don't try to generate a POSIX TZ
+ string when the timezone ends in DST.
+
2009-06-26 Ulrich Drepper <drepper@redhat.com>
* resolv/resolv.h: Define RES_SNGLKUPREOP.
2011-01-18 15:41:09 +00:00
@@ -11818,6 +11841,10 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
2010-05-19 12:00:46 +00:00
[BZ #4368]
* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
+2007-04-16 Jakub Jelinek <jakub@redhat.com>
+
+ * locale/programs/locarchive.c (add_alias, insert_name): Remove static.
+
2007-04-16 Ulrich Drepper <drepper@redhat.com>
[BZ #4364]
2011-01-18 15:41:09 +00:00
@@ -13075,6 +13102,15 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
2010-05-19 12:00:46 +00:00
separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3.
+2006-12-10 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/netlinkaccess.h: Include linux/if_addr.h
+ if IFA_MAX is not defined.
+ (IFA_RTA, IFA_PAYLOAD, IFLA_RTA, IFLA_PAYLOAD): Define if not
+ defined.
+ * sysdeps/unix/sysv/linux/check_pf.c: Include netlinkaccess.h
+ instead of asm/types.h, linux/netlink.h and linux/rtnetlink.h.
+
2006-12-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3632]
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/Makeconfig
+++ glibc-2.14-3/Makeconfig
2011-05-31 12:54:27 +00:00
@@ -791,12 +791,12 @@ endif
2009-07-22 13:05:11 +00:00
# The assembler can generate debug information too.
ifndef ASFLAGS
ifeq ($(have-cpp-asm-debuginfo),yes)
2010-05-19 12:00:46 +00:00
-ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))
+ASFLAGS = $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))
2009-07-22 13:05:11 +00:00
else
-ASFLAGS :=
+ASFLAGS =
endif
endif
-ASFLAGS += $(ASFLAGS-config) $(asflags-cpu)
+ASFLAGS += $(ASFLAGS-config) $(asflags-cpu) $(sysdep-ASFLAGS)
ifndef BUILD_CC
BUILD_CC = $(CC)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/NEWS
+++ glibc-2.14-3/NEWS
@@ -20,16 +20,6 @@ Version 2.14
12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
12795, 12811, 12813, 12814, 12841
2011-05-13 14:56:46 +00:00
-* The RPC implementation in libc is obsoleted. Old programs keep working
- but new programs cannot be linked with the routines in libc anymore.
- Programs in need of RPC functionality must be linked against TI-RPC.
2011-05-31 12:54:27 +00:00
- The TI-RPC implementation is IPv6 enabled and there are other benefits.
2011-05-13 14:56:46 +00:00
-
- Visible changes of this change include (obviously) the inability to link
- programs using RPC functions without referencing the TI-RPC library and the
- removal of the RPC headers from the glibc headers.
- Implemented by Ulrich Drepper.
2011-06-21 12:59:31 +00:00
-
2011-05-13 14:56:46 +00:00
* New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
2011-05-31 12:54:27 +00:00
syncfs, setns, sendmmsg
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/config.h.in
+++ glibc-2.14-3/config.h.in
2011-04-07 11:22:58 +00:00
@@ -204,6 +204,9 @@
/* Define if `.ctors' and `.dtors' sections shouldn't be used. */
#undef NO_CTORS_DTORS_SECTIONS
+/* Define if Systemtap <sys/sdt.h> probes should be defined. */
+#undef USE_STAP_PROBE
+
/*
*/
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/configure
+++ glibc-2.14-3/configure
2011-04-07 11:22:58 +00:00
@@ -784,6 +784,7 @@ enable_all_warnings
enable_multi_arch
enable_experimental_malloc
enable_nss_crypt
+enable_systemtap
with_cpu
'
ac_precious_vars='build_alias
@@ -1444,6 +1445,7 @@ Optional Features:
--enable-experimental-malloc
enable experimental malloc features
--enable-nss-crypt enable libcrypt to use nss
+ --enable-systemtap enable systemtap static probe points [default=no]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -3823,6 +3825,51 @@ else
fi
+# Check whether --enable-systemtap was given.
+if test "${enable_systemtap+set}" = set; then :
+ enableval=$enable_systemtap; systemtap=$enableval
+else
+ systemtap=no
+fi
+
+if test x$systemtap != xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for systemtap static probe support" >&5
+$as_echo_n "checking for systemtap static probe support... " >&6; }
+if test "${libc_cv_sdt+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="-std=gnu99 $CFLAGS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/sdt.h>
+void foo (int i, void *p)
+{
+ asm ("" STAP_PROBE_ASM (foo, bar, STAP_PROBE_ASM_TEMPLATE (2)) ""
+ :: STAP_PROBE_ASM_OPERANDS (2, i, p));
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ libc_cv_sdt=yes
+else
+ libc_cv_sdt=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$old_CFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_sdt" >&5
+$as_echo "$libc_cv_sdt" >&6; }
+ if test $libc_cv_sdt = yes; then
+ $as_echo "#define USE_STAP_PROBE 1" >>confdefs.h
+
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "systemtap support needs sys/sdt.h with asm support
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+fi
+
# The way shlib-versions is used to generate soversions.mk uses a
# fairly simplistic model for name recognition that can't distinguish
# i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/configure.in
+++ glibc-2.14-3/configure.in
2011-04-07 11:22:58 +00:00
@@ -316,6 +316,29 @@ else
fi
AC_SUBST(libc_cv_nss_crypt)
+AC_ARG_ENABLE([systemtap],
+ [AS_HELP_STRING([--enable-systemtap],
+ [enable systemtap static probe points @<:@default=no@:>@])],
+ [systemtap=$enableval],
+ [systemtap=no])
+if test x$systemtap != xno; then
+ AC_CACHE_CHECK([for systemtap static probe support], libc_cv_sdt, [dnl
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="-std=gnu99 $CFLAGS"
+ AC_COMPILE_IFELSE([#include <sys/sdt.h>
+void foo (int i, void *p)
+{
+ asm ("" STAP_PROBE_ASM (foo, bar, STAP_PROBE_ASM_TEMPLATE (2)) ""
+ :: STAP_PROBE_ASM_OPERANDS (2, i, p));
+}], [libc_cv_sdt=yes], [libc_cv_sdt=no])
+ CFLAGS="$old_CFLAGS"])
+ if test $libc_cv_sdt = yes; then
+ AC_DEFINE([USE_STAP_PROBE])
+ else
+ AC_MSG_FAILURE([systemtap support needs sys/sdt.h with asm support])
+ fi
+fi
+
# The way shlib-versions is used to generate soversions.mk uses a
# fairly simplistic model for name recognition that can't distinguish
# i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/csu/Makefile
+++ glibc-2.14-3/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
$(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@
-CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time)
+CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time) \
+ -fno-asynchronous-unwind-tables
vpath initfini.c $(sysdirs)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/csu/elf-init.c
+++ glibc-2.14-3/csu/elf-init.c
2009-09-01 11:03:11 +00:00
@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
extern void (*__fini_array_start []) (void) attribute_hidden;
extern void (*__fini_array_end []) (void) attribute_hidden;
+#if defined HAVE_VISIBILITY_ATTRIBUTE \
+ && (defined SHARED || defined LIBC_NONSHARED)
+# define hidden_undef_2(x) #x
+# define hidden_undef_1(x) hidden_undef_2 (x)
+# define hidden_undef(x) \
+ __asm (hidden_undef_1 (ASM_GLOBAL_DIRECTIVE) " " #x); \
+ __asm (".hidden " #x);
+#else
+# define hidden_undef(x)
+#endif
+
+hidden_undef (__preinit_array_start)
+hidden_undef (__preinit_array_end)
+hidden_undef (__init_array_start)
+hidden_undef (__init_array_end)
+hidden_undef (__fini_array_start)
+hidden_undef (__fini_array_end)
/* These function symbols are provided for the .init/.fini section entry
points automagically by the linker. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/debug/tst-chk1.c
+++ glibc-2.14-3/debug/tst-chk1.c
@@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+/* Hack: make sure GCC doesn't know __chk_fail () will not return. */
+#define __noreturn__
+
#include <assert.h>
#include <fcntl.h>
#include <locale.h>
2008-03-05 10:32:39 +00:00
@@ -242,7 +245,7 @@ do_test (void)
if (memcmp (a.buf1, "aabcdabcjj", 10))
FAIL ();
-#if __USE_FORTIFY_LEVEL < 2
+#if __USE_FORTIFY_LEVEL < 2 || !__GNUC_PREREQ (4, 0)
/* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2
and sufficient GCC support, as the string operations overflow
from a.buf1 into a.buf2. */
2008-03-05 10:32:39 +00:00
@@ -357,7 +360,7 @@ do_test (void)
memset (a.buf1 + 9, 'j', l0 + 2);
CHK_FAIL_END
2007-09-18 20:12:30 +00:00
-# if __USE_FORTIFY_LEVEL >= 2
+# if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)
# define O 0
# else
# define O 1
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/Makefile
+++ glibc-2.14-3/elf/Makefile
2011-05-18 14:18:54 +00:00
@@ -90,6 +90,7 @@ distribute := rtld-Rules \
2010-07-02 12:42:07 +00:00
unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
unload6mod1.c unload6mod2.c unload6mod3.c \
unload7mod1.c unload7mod2.c \
+ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \
tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
tst-auditmod4a.c tst-auditmod4b.c \
2011-05-18 14:18:54 +00:00
@@ -133,6 +134,7 @@ include ../Makeconfig
2010-05-31 15:10:22 +00:00
ifeq ($(unwind-find-fde),yes)
routines += unwind-dw2-fde-glibc
shared-only-routines += unwind-dw2-fde-glibc
2011-05-27 14:19:02 +00:00
+CFLAGS-unwind-dw2-fde-glibc.c += -fno-strict-aliasing
2010-05-31 15:10:22 +00:00
endif
before-compile = $(objpfx)trusted-dirs.h
2011-05-31 12:54:27 +00:00
@@ -221,7 +223,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
2010-07-02 12:42:07 +00:00
tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
tst-dlmodcount tst-dlopenrpath tst-deep1 \
tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \
+ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
tst-audit1 tst-audit2 \
tst-stackguard1 tst-addr1 tst-thrlock \
2011-05-13 14:56:46 +00:00
tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
2011-05-31 12:54:27 +00:00
@@ -279,6 +281,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
2010-07-02 12:42:07 +00:00
unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
unload6mod1 unload6mod2 unload6mod3 \
unload7mod1 unload7mod2 \
+ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
order2mod1 order2mod2 order2mod3 order2mod4 \
tst-unique1mod1 tst-unique1mod2 \
2011-03-02 16:28:13 +00:00
tst-unique2mod1 tst-unique2mod2 \
2011-05-31 12:54:27 +00:00
@@ -500,7 +503,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
2011-04-07 11:22:58 +00:00
CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
CFLAGS-cache.c = $(SYSCONF-FLAGS)
-CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),-DNOT_IN_libc=1 -DIS_IN_rtld=1)
+CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
+ -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld)
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
generated += $(addsuffix .so,$(strip $(modules-names)))
2011-05-31 12:54:27 +00:00
@@ -568,6 +572,9 @@ $(objpfx)unload6mod2.so: $(libdl)
2010-07-02 12:42:07 +00:00
$(objpfx)unload6mod3.so: $(libdl)
$(objpfx)unload7mod1.so: $(libdl)
$(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so
+$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so
+$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so
+$(objpfx)unload8mod3.so: $(libdl)
2011-03-02 16:28:13 +00:00
$(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so
$(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so
$(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so
2011-05-31 12:54:27 +00:00
@@ -881,6 +888,9 @@ $(objpfx)unload7: $(libdl)
2010-07-02 12:42:07 +00:00
$(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so
unload7-ENV = MALLOC_PERTURB_=85
+$(objpfx)unload8: $(libdl)
+$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so
+
ifdef libdl
$(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
$(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/dl-close.c
+++ glibc-2.14-3/elf/dl-close.c
2011-03-07 16:50:04 +00:00
@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
|| dl_close_state != not_pending)
{
- if (map->l_direct_opencount == 0)
- {
- if (map->l_type == lt_loaded)
- dl_close_state = rerun;
- else if (map->l_type == lt_library)
- {
- struct link_map **oldp = map->l_initfini;
- map->l_initfini = map->l_orig_initfini;
- _dl_scope_free (oldp);
- }
- }
+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
+ dl_close_state = rerun;
/* There are still references to this object. Do nothing more. */
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
@@ -430,6 +421,13 @@ _dl_close_worker (struct link_map *map)
2010-07-02 12:42:07 +00:00
imap->l_scope_max = new_size;
}
+ else if (new_list != NULL)
+ {
+ /* We didn't change the scope array, so reset the search
+ list. */
+ imap->l_searchlist.r_list = NULL;
+ imap->l_searchlist.r_nlist = 0;
+ }
/* The loader is gone, so mark the object as not having one.
Note: l_idx != IDX_STILL_USED -> object will be removed. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/dl-deps.c
+++ glibc-2.14-3/elf/dl-deps.c
2011-03-07 16:50:04 +00:00
@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
nneeded * sizeof needed[0]);
atomic_write_barrier ();
l->l_initfini = l_initfini;
+ l->l_free_initfini = 1;
}
/* If we have no auxiliary objects just go on to the next map. */
2011-03-21 15:34:52 +00:00
@@ -491,10 +492,6 @@ _dl_map_object_deps (struct link_map *map,
if (errno == 0 && errno_saved != 0)
__set_errno (errno_saved);
- if (errno_reason)
- _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
- NULL, errstring);
-
struct link_map **old_l_initfini = NULL;
if (map->l_initfini != NULL && map->l_type == lt_loaded)
{
2011-05-31 12:54:27 +00:00
@@ -681,6 +678,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
2011-03-07 16:50:04 +00:00
l_initfini[nlist] = NULL;
atomic_write_barrier ();
map->l_initfini = l_initfini;
+ map->l_free_initfini = 1;
if (l_reldeps != NULL)
{
atomic_write_barrier ();
2011-05-31 12:54:27 +00:00
@@ -689,5 +687,9 @@ Filters not supported with LD_TRACE_PRELINKING"));
2011-03-07 16:50:04 +00:00
_dl_scope_free (old_l_reldeps);
}
if (old_l_initfini != NULL)
- map->l_orig_initfini = old_l_initfini;
+ _dl_scope_free (old_l_initfini);
2011-03-21 15:34:52 +00:00
+
+ if (errno_reason)
+ _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
+ NULL, errstring);
2011-03-07 16:50:04 +00:00
}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/dl-init.c
+++ glibc-2.14-3/elf/dl-init.c
2010-06-15 08:43:24 +00:00
@@ -24,11 +24,9 @@
/* Type of the initializer. */
typedef void (*init_t) (int, char **, char **);
-#ifndef HAVE_INLINED_SYSCALLS
/* Flag, nonzero during startup phase. */
extern int _dl_starting_up;
extern int _dl_starting_up_internal attribute_hidden;
-#endif
static void
@@ -133,9 +131,7 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env)
while (i-- > 0)
call_init (main_map->l_initfini[i], argc, argv, env);
-#ifndef HAVE_INLINED_SYSCALLS
/* Finished starting up. */
INTUSE(_dl_starting_up) = 0;
-#endif
}
INTDEF (_dl_init)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/dl-libc.c
+++ glibc-2.14-3/elf/dl-libc.c
2011-03-07 16:50:04 +00:00
@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
{
- /* Remove all additional names added to the objects. */
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
{
struct libname_list *lnp = l->l_libname->next;
l->l_libname->next = NULL;
+ /* Remove all additional names added to the objects. */
while (lnp != NULL)
{
struct libname_list *old = lnp;
@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
if (! old->dont_free)
free (old);
}
+
+ /* Free the initfini dependency list. */
+ if (l->l_free_initfini)
+ free (l->l_initfini);
}
if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/dl-load.c
+++ glibc-2.14-3/elf/dl-load.c
2011-05-13 14:56:46 +00:00
@@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len)
2011-03-21 15:34:52 +00:00
static size_t
-is_dst (const char *start, const char *name, const char *str,
- int is_path, int secure)
+is_dst (const char *start, const char *name, const char *str, int is_path)
{
size_t len;
bool is_curly = false;
2011-05-13 14:56:46 +00:00
@@ -280,12 +279,6 @@ is_dst (const char *start, const char *name, const char *str,
2011-03-21 15:34:52 +00:00
&& (!is_path || name[len] != ':'))
return 0;
- if (__builtin_expect (secure, 0)
2011-05-13 14:56:46 +00:00
- && ((name[len] != '\0' && name[len] != '/'
- && (!is_path || name[len] != ':'))
2011-03-21 15:34:52 +00:00
- || (name != start + 1 && (!is_path || name[-2] != ':'))))
- return 0;
-
return len;
}
2011-05-13 14:56:46 +00:00
@@ -300,13 +293,10 @@ _dl_dst_count (const char *name, int is_path)
2011-03-21 15:34:52 +00:00
{
size_t len;
- /* $ORIGIN is not expanded for SUID/GUID programs (except if it
- is $ORIGIN alone) and it must always appear first in path. */
++name;
- if ((len = is_dst (start, name, "ORIGIN", is_path,
- INTUSE(__libc_enable_secure))) != 0
- || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0
- || (len = is_dst (start, name, "LIB", is_path, 0)) != 0)
+ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0
+ || (len = is_dst (start, name, "PLATFORM", is_path)) != 0
+ || (len = is_dst (start, name, "LIB", is_path)) != 0)
++cnt;
name = strchr (name + len, '$');
2011-05-13 14:56:46 +00:00
@@ -339,9 +329,16 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
2011-03-21 15:34:52 +00:00
size_t len;
++name;
- if ((len = is_dst (start, name, "ORIGIN", is_path,
- INTUSE(__libc_enable_secure))) != 0)
+ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0)
{
2011-05-13 14:56:46 +00:00
+ /* For SUID/GUID programs $ORIGIN must always appear
+ first in a path element. */
2011-03-21 15:34:52 +00:00
+ if (__builtin_expect (INTUSE(__libc_enable_secure), 0)
2011-05-13 14:56:46 +00:00
+ && ((name[len] != '\0' && name[len] != '/'
+ && (!is_path || name[len] != ':'))
2011-03-21 15:34:52 +00:00
+ || (name != start + 1 && (!is_path || name[-2] != ':'))))
+ repl = (const char *) -1;
+ else
#ifndef SHARED
if (l == NULL)
repl = _dl_get_origin ();
2011-05-13 14:56:46 +00:00
@@ -352,9 +349,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
check_for_trusted = (INTUSE(__libc_enable_secure)
&& l->l_type == lt_executable);
2011-03-21 15:34:52 +00:00
}
- else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)
+ else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0)
repl = GLRO(dl_platform);
- else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0)
+ else if ((len = is_dst (start, name, "LIB", is_path)) != 0)
repl = DL_DST_LIB;
if (repl != NULL && repl != (const char *) -1)
2011-05-13 14:56:46 +00:00
@@ -374,6 +371,7 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
element, but keep an empty element at the end. */
if (wp == result && is_path && *name == ':' && name[1] != '\0')
++name;
+ check_for_trusted = false;
}
else
/* No DST we recognize. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/dl-support.c
+++ glibc-2.14-3/elf/dl-support.c
2011-01-18 15:41:09 +00:00
@@ -81,10 +81,8 @@ unsigned long long _dl_load_adds;
2010-06-15 08:43:24 +00:00
create a fake scope containing nothing. */
struct r_scope_elem _dl_initial_searchlist;
-#ifndef HAVE_INLINED_SYSCALLS
/* Nonzero during startup. */
int _dl_starting_up = 1;
-#endif
/* Random data provided by the kernel. */
void *_dl_random;
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/ldconfig.c
+++ glibc-2.14-3/elf/ldconfig.c
2011-05-04 11:11:17 +00:00
@@ -1034,17 +1034,19 @@ search_dirs (void)
static void parse_conf_include (const char *config_file, unsigned int lineno,
- bool do_chroot, const char *pattern);
+ const char *prefix, bool do_chroot,
+ const char *pattern);
/* Parse configuration file. */
static void
-parse_conf (const char *filename, bool do_chroot)
+parse_conf (const char *filename, const char *prefix, bool do_chroot)
{
FILE *file = NULL;
char *line = NULL;
const char *canon;
size_t len = 0;
unsigned int lineno;
+ size_t prefix_len = prefix ? strlen (prefix) : 0;
if (do_chroot && opt_chroot)
{
2011-05-04 11:11:17 +00:00
@@ -1105,7 +1107,14 @@ parse_conf (const char *filename, bool do_chroot)
cp += 8;
while ((dir = strsep (&cp, " \t")) != NULL)
if (dir[0] != '\0')
- parse_conf_include (filename, lineno, do_chroot, dir);
+ parse_conf_include (filename, lineno, prefix, do_chroot, dir);
+ }
+ else if (prefix != NULL)
+ {
+ size_t cp_len = strlen (cp);
+ char new_cp [prefix_len + cp_len + 1];
+ memcpy (mempcpy (new_cp, prefix, prefix_len), cp, cp_len + 1);
+ add_dir (new_cp);
}
else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5]))
{
2011-05-04 11:11:17 +00:00
@@ -1168,7 +1177,7 @@ parse_conf (const char *filename, bool do_chroot)
config files to read. */
static void
parse_conf_include (const char *config_file, unsigned int lineno,
- bool do_chroot, const char *pattern)
+ const char *prefix, bool do_chroot, const char *pattern)
{
if (opt_chroot && pattern[0] != '/')
error (EXIT_FAILURE, 0,
2011-05-04 11:11:17 +00:00
@@ -1200,7 +1209,7 @@ parse_conf_include (const char *config_file, unsigned int lineno,
{
case 0:
for (size_t i = 0; i < gl.gl_pathc; ++i)
- parse_conf (gl.gl_pathv[i], false);
+ parse_conf (gl.gl_pathv[i], prefix, false);
globfree64 (&gl);
break;
2011-05-04 11:11:17 +00:00
@@ -1243,6 +1252,8 @@ main (int argc, char **argv)
/* Set the text message domain. */
textdomain (_libc_intl_domainname);
+ arch_startup (argc, argv);
+
/* Parse and process arguments. */
int remaining;
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
2011-05-04 11:11:17 +00:00
@@ -1352,12 +1363,14 @@ main (int argc, char **argv)
if (!opt_only_cline)
{
- parse_conf (config_file, true);
+ parse_conf (config_file, NULL, true);
/* Always add the standard search paths. */
add_system_dir (SLIBDIR);
if (strcmp (SLIBDIR, LIBDIR))
add_system_dir (LIBDIR);
+
+ add_arch_dirs (config_file);
}
2010-05-19 12:00:46 +00:00
const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/ldd.bash.in
+++ glibc-2.14-3/elf/ldd.bash.in
2011-03-21 15:34:52 +00:00
@@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
fi
done
case $ret in
- 0)
- # If the program exits with exit code 5, it means the process has been
- # invoked with __libc_enable_secure. Fall back to running it through
- # the dynamic linker.
- try_trace "$file"
- rc=$?
- if [ $rc = 5 ]; then
- try_trace "$RTLD" "$file"
- rc=$?
- fi
- [ $rc = 0 ] || result=1
- ;;
1)
# This can be a non-ELF binary or no binary at all.
nonelf "$file" || {
@@ -186,7 +174,7 @@ warning: you do not have execution permission for" "\`$file'" >&2
result=1
}
;;
- 2)
+ 0|2)
try_trace "$RTLD" "$file" || result=1
;;
*)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/rtld-Rules
+++ glibc-2.14-3/elf/rtld-Rules
2011-04-07 11:22:58 +00:00
@@ -1,7 +1,7 @@
# Subroutine makefile for compiling libc modules linked into dynamic linker.
# Copyright (C) 2002,2003,2005,2006,2008,2010,2011
-# Free Software Foundation, Inc.
+# 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
@@ -131,6 +131,6 @@ ifdef rtld-depfiles
endif
# This here is the whole point of all the shenanigans.
-rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1
+rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld
endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/rtld.c
+++ glibc-2.14-3/elf/rtld.c
2011-01-18 15:41:09 +00:00
@@ -107,7 +107,6 @@ static struct audit_list
2010-06-15 08:43:24 +00:00
struct audit_list *next;
} *audit_list;
-#ifndef HAVE_INLINED_SYSCALLS
/* Set nonzero during loading and initialization of executable and
libraries, cleared before the executable's entry point runs. This
must not be initialized to nonzero, because the unused dynamic
2011-01-18 15:41:09 +00:00
@@ -117,7 +116,6 @@ static struct audit_list
2010-06-15 08:43:24 +00:00
never be called. */
int _dl_starting_up = 0;
INTVARDEF(_dl_starting_up)
-#endif
/* This is the structure which defines all variables global to ld.so
(except those which cannot be added for some reason). */
2011-01-18 15:41:09 +00:00
@@ -923,10 +921,8 @@ dl_main (const ElfW(Phdr) *phdr,
2010-06-15 08:43:24 +00:00
/* Process the environment variable which control the behaviour. */
process_envvars (&mode);
-#ifndef HAVE_INLINED_SYSCALLS
/* Set up a flag which tells we are just starting. */
INTUSE(_dl_starting_up) = 1;
-#endif
if (*user_entry == (ElfW(Addr)) ENTRY_POINT)
{
2011-05-31 12:54:27 +00:00
@@ -2263,6 +2259,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
2011-03-07 16:50:04 +00:00
lnp->dont_free = 1;
lnp = lnp->next;
}
+ l->l_free_initfini = 0;
if (l != &GL(dl_rtld_map))
_dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
2011-05-31 12:54:27 +00:00
@@ -2312,7 +2309,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
2010-09-28 13:19:46 +00:00
2011-03-02 16:28:13 +00:00
/* Make sure no new search directories have been added. */
assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs));
2010-09-28 13:19:46 +00:00
-
if (! prelinked && rtld_multiple_ref)
{
/* There was an explicit ref to the dynamic linker as a shared lib.
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/unload8.c
+++ glibc-2.14-3/elf/unload8.c
2010-07-02 12:42:07 +00:00
@@ -0,0 +1,33 @@
+#include <dlfcn.h>
+#include <stdio.h>
+
+int
+main (void)
+{
+ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY);
+ if (h == NULL)
+ {
+ puts ("dlopen unload8mod1.so failed");
+ return 1;
+ }
+
+ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY);
+ if (h2 == NULL)
+ {
+ puts ("dlopen unload8mod1x.so failed");
+ return 1;
+ }
+ dlclose (h2);
+
+ int (*mod1) (void) = dlsym (h, "mod1");
+ if (mod1 == NULL)
+ {
+ puts ("dlsym failed");
+ return 1;
+ }
+
+ mod1 ();
+ dlclose (h);
+
+ return 0;
+}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/unload8mod1.c
+++ glibc-2.14-3/elf/unload8mod1.c
2010-07-02 12:42:07 +00:00
@@ -0,0 +1,7 @@
+extern void mod2 (void);
+
+void
+mod1 (void)
+{
+ mod2 ();
+}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/unload8mod1x.c
+++ glibc-2.14-3/elf/unload8mod1x.c
2010-07-02 12:42:07 +00:00
@@ -0,0 +1 @@
+int mod1x;
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/unload8mod2.c
+++ glibc-2.14-3/elf/unload8mod2.c
2010-07-02 12:42:07 +00:00
@@ -0,0 +1,7 @@
+extern void mod3 (void);
+
+void
+mod2 (void)
+{
+ mod3 ();
+}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/elf/unload8mod3.c
+++ glibc-2.14-3/elf/unload8mod3.c
2010-07-02 12:42:07 +00:00
@@ -0,0 +1,27 @@
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void
+mod3_fini2 (void)
+{
+}
+
+void
+mod3_fini (void)
+{
+ mod3_fini2 ();
+}
+
+void
+mod3 (void)
+{
+ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY);
+ if (h == NULL)
+ {
+ puts ("dlopen unload8mod2.so failed");
+ exit (1);
+ }
+
+ atexit (mod3_fini);
+}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/extra-lib.mk
+++ glibc-2.14-3/extra-lib.mk
2011-04-07 11:22:58 +00:00
@@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
-CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1
+CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/include/bits/stdlib-ldbl.h
+++ glibc-2.14-3/include/bits/stdlib-ldbl.h
2009-06-26 15:46:27 +00:00
@@ -0,0 +1 @@
+#include <stdlib/bits/stdlib-ldbl.h>
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/include/bits/wchar-ldbl.h
+++ glibc-2.14-3/include/bits/wchar-ldbl.h
2009-06-26 15:46:27 +00:00
@@ -0,0 +1 @@
+#include <wcsmbs/bits/wchar-ldbl.h>
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/include/features.h
+++ glibc-2.14-3/include/features.h
2011-04-07 11:22:58 +00:00
@@ -310,8 +310,13 @@
#endif
#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
- && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
2007-10-14 21:33:51 +00:00
-# if _FORTIFY_SOURCE > 1
+ && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
+# if !__GNUC_PREREQ (4, 1)
+# ifdef __GNUC_RH_RELEASE__
+# warning _FORTIFY_SOURCE supported only with GCC 4.1 and later
+# endif
+# define __USE_FORTIFY_LEVEL 0
+# elif _FORTIFY_SOURCE > 1
# define __USE_FORTIFY_LEVEL 2
# else
2007-10-14 21:33:51 +00:00
# define __USE_FORTIFY_LEVEL 1
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/include/libc-symbols.h
+++ glibc-2.14-3/include/libc-symbols.h
2011-05-13 14:56:46 +00:00
@@ -635,7 +635,7 @@ for linking")
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libc_hidden_def(name) hidden_def (name)
# define libc_hidden_weak(name) hidden_weak (name)
-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
+# define libc_hidden_nolink(name, version) hidden_def (name)
# define libc_hidden_ver(local, name) hidden_ver (local, name)
# define libc_hidden_data_def(name) hidden_data_def (name)
# define libc_hidden_data_weak(name) hidden_data_weak (name)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/include/link.h
+++ glibc-2.14-3/include/link.h
2011-03-07 16:50:04 +00:00
@@ -1,6 +1,6 @@
/* Data structure for communication from the run-time dynamic linker for
loaded ELF shared objects.
- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1995-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
@@ -192,6 +192,9 @@ struct link_map
during LD_TRACE_PRELINKING=1
contains any DT_SYMBOLIC
libraries. */
+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
+ freed, ie. not allocated with
+ the dummy malloc in ld.so. */
/* Collected information about own RPATH directories. */
struct r_search_path_struct l_rpath_dirs;
@@ -240,9 +243,6 @@ struct link_map
/* List of object in order of the init and fini calls. */
struct link_map **l_initfini;
- /* The init and fini list generated at startup, saved when the
- object is also loaded dynamically. */
- struct link_map **l_orig_initfini;
/* List of the dependencies introduced through symbol binding. */
struct link_map_reldeps
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/include/stap-probe.h
+++ glibc-2.14-3/include/stap-probe.h
2011-04-07 11:22:58 +00:00
@@ -0,0 +1,140 @@
+/* Macros for defining Systemtap <sys/sdt.h> static probe points.
+ Copyright (C) 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
+ 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _STAP_PROBE_H
+#define _STAP_PROBE_H 1
+
+#ifdef USE_STAP_PROBE
+
+# include <sys/sdt.h>
+
+/* Our code uses one macro LIBC_PROBE (name, n, arg1, ..., argn).
+
+ Without USE_STAP_PROBE, that does nothing but evaluates all
+ its arguments (to prevent bit rot, unlike e.g. assert).
+
+ Systemtap's header defines the macros STAP_PROBE (provider, name) and
+ STAP_PROBEn (provider, name, arg1, ..., argn). For "provider" we paste
+ in the IN_LIB name (libc, libpthread, etc.) automagically. */
+
+# ifndef NOT_IN_libc
+# define IN_LIB libc
+# elif !defined IN_LIB
+/* This is intentionally defined with extra unquoted commas in it so
+ that macro substitution will bomb out when it is used. We don't
+ just use #error here, so that this header can be included by
+ other headers that use LIBC_PROBE inside their own macros. We
+ only want such headers to fail to compile if those macros are
+ actually used in a context where IN_LIB has not been defined. */
+# define IN_LIB ,,,missing -DIN_LIB=... -- not extra-lib.mk?,,,
+# endif
+
+# define LIBC_PROBE(name, n, ...) \
+ LIBC_PROBE_1 (IN_LIB, name, n, ## __VA_ARGS__)
+
+# define LIBC_PROBE_1(lib, name, n, ...) \
+ STAP_PROBE##n (lib, name, ## __VA_ARGS__)
+
+# define STAP_PROBE0 STAP_PROBE
+
+# define LIBC_PROBE_ASM(name, template) \
+ STAP_PROBE_ASM (IN_LIB, name, template)
+
+# define LIBC_PROBE_ASM_OPERANDS STAP_PROBE_ASM_OPERANDS
+
+#else /* Not USE_STAP_PROBE. */
+
+# ifndef __ASSEMBLER__
+# define LIBC_PROBE(name, n, ...) DUMMY_PROBE##n (__VA_ARGS__)
+# else
+# define LIBC_PROBE(name, n, ...) /* Nothing. */
+# endif
+
+# define LIBC_PROBE_ASM(name, template) /* Nothing. */
+# define LIBC_PROBE_ASM_OPERANDS(n, ...) /* Nothing. */
+
+/* This silliness lets us evaluate all the arguments for each arity
+ of probe. My kingdom for a real macro system. */
+
+# define DUMMY_PROBE0() do {} while (0)
+# define DUMMY_PROBE1(a1) do {} while ((void) (a1), 0)
+# define DUMMY_PROBE2(a1, a2) do {} while ((void) (a1), \
+ (void) (a2), 0)
+# define DUMMY_PROBE3(a1, a2, a3) do {} while ((void) (a1), \
+ (void) (a2), \
+ (void) (a3), 0)
+# define DUMMY_PROBE4(a1, a2, a3, a4) do {} while ((void) (a1), \
+ (void) (a2), \
+ (void) (a3), \
+ (void) (a4), 0)
+# define DUMMY_PROBE5(a1, a2, a3, a4, a5) \
+ do {} while ((void) (a1), \
+ (void) (a2), \
+ (void) (a3), \
+ (void) (a4), \
+ (void) (a5), 0)
+# define DUMMY_PROBE6(a1, a2, a3, a4, a5, a6) \
+ do {} while ((void) (a1), \
+ (void) (a2), \
+ (void) (a3), \
+ (void) (a4), \
+ (void) (a5), \
+ (void) (a6), 0)
+# define DUMMY_PROBE7(a1, a2, a3, a4, a5, a6, a7) \
+ do {} while ((void) (a1), \
+ (void) (a2), \
+ (void) (a3), \
+ (void) (a4), \
+ (void) (a5), \
+ (void) (a6), \
+ (void) (a7), 0)
+# define DUMMY_PROBE8(a1, a2, a3, a4, a5, a6, a7, a8) \
+ do {} while ((void) (a1), \
+ (void) (a2), \
+ (void) (a3), \
+ (void) (a4), \
+ (void) (a5), \
+ (void) (a6), \
+ (void) (a7), \
+ (void) (a8), 0)
+# define DUMMY_PROBE9(a1, a2, a3, a4, a5, a6, a7, a8, a9) \
+ do {} while ((void) (a1), \
+ (void) (a2), \
+ (void) (a3), \
+ (void) (a4), \
+ (void) (a5), \
+ (void) (a6), \
+ (void) (a7), \
+ (void) (a8), \
+ (void) (a9), 0)
+# define DUMMY_PROBE10(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) \
+ do {} while ((void) (a1), \
+ (void) (a2), \
+ (void) (a3), \
+ (void) (a4), \
+ (void) (a5), \
+ (void) (a6), \
+ (void) (a7), \
+ (void) (a8), \
+ (void) (a9), \
+ (void) (a10), 0)
+
+#endif /* USE_STAP_PROBE. */
+
+#endif /* stap-probe.h */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/include/sys/resource.h
+++ glibc-2.14-3/include/sys/resource.h
2011-01-18 15:41:09 +00:00
@@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
2010-07-02 12:42:07 +00:00
extern int __setrlimit (enum __rlimit_resource __resource,
const struct rlimit *__rlimits);
+libc_hidden_proto (__getrlimit)
#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/inet/Makefile
+++ glibc-2.14-3/inet/Makefile
2010-05-31 15:10:22 +00:00
@@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
include ../Rules
2011-05-27 14:19:02 +00:00
+CFLAGS-tst-inet6_rth.c += -fno-strict-aliasing
2010-05-31 15:10:22 +00:00
+
ifeq ($(have-thread-library),yes)
CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/intl/locale.alias
+++ glibc-2.14-3/intl/locale.alias
2007-12-12 20:47:44 +00:00
@@ -57,8 +57,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR
lithuanian lt_LT.ISO-8859-13
-no_NO nb_NO.ISO-8859-1
-no_NO.ISO-8859-1 nb_NO.ISO-8859-1
norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/libio/stdio.h
+++ glibc-2.14-3/libio/stdio.h
2010-01-11 09:49:54 +00:00
@@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t;
extern struct _IO_FILE *stdin; /* Standard input stream. */
extern struct _IO_FILE *stdout; /* Standard output stream. */
extern struct _IO_FILE *stderr; /* Standard error output stream. */
+#ifdef __STDC__
/* C89/C99 say they're macros. Make them happy. */
#define stdin stdin
#define stdout stdout
#define stderr stderr
+#endif
__BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/locale/iso-4217.def
+++ glibc-2.14-3/locale/iso-4217.def
@@ -8,6 +8,7 @@
*
* !!! The list has to be sorted !!!
*/
+DEFINE_INT_CURR("ADP") /* Andorran Peseta -> EUR */
DEFINE_INT_CURR("AED") /* United Arab Emirates Dirham */
DEFINE_INT_CURR("AFN") /* Afghanistan Afgani */
DEFINE_INT_CURR("ALL") /* Albanian Lek */
2009-09-01 11:03:11 +00:00
@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD") /* Armenia Dram */
DEFINE_INT_CURR("ANG") /* Netherlands Antilles */
DEFINE_INT_CURR("AOA") /* Angolan Kwanza */
DEFINE_INT_CURR("ARS") /* Argentine Peso */
+DEFINE_INT_CURR("ATS") /* Austrian Schilling -> EUR */
DEFINE_INT_CURR("AUD") /* Australian Dollar */
DEFINE_INT_CURR("AWG") /* Aruba Guilder */
DEFINE_INT_CURR("AZM") /* Azerbaijan Manat */
DEFINE_INT_CURR("BAM") /* Bosnian and Herzegovina Convertible Mark */
DEFINE_INT_CURR("BBD") /* Barbados Dollar */
DEFINE_INT_CURR("BDT") /* Bangladesh Taka */
+DEFINE_INT_CURR("BEF") /* Belgian Franc -> EUR */
DEFINE_INT_CURR("BGN") /* Bulgarian Lev */
DEFINE_INT_CURR("BHD") /* Bahraini Dinar */
DEFINE_INT_CURR("BIF") /* Burundi Franc */
2009-09-01 11:03:11 +00:00
@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP") /* Cuban Peso */
DEFINE_INT_CURR("CVE") /* Cape Verde Escudo */
DEFINE_INT_CURR("CYP") /* Cypriot Pound */
DEFINE_INT_CURR("CZK") /* Czech Koruna */
+DEFINE_INT_CURR("DEM") /* German Mark -> EUR */
DEFINE_INT_CURR("DJF") /* Djibouti Franc */
DEFINE_INT_CURR("DKK") /* Danish Krone (Faroe Islands, Greenland) */
DEFINE_INT_CURR("DOP") /* Dominican Republic */
2009-09-01 11:03:11 +00:00
@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD") /* Algerian Dinar */
DEFINE_INT_CURR("EEK") /* Estonian Kroon */
DEFINE_INT_CURR("EGP") /* Egyptian Pound */
DEFINE_INT_CURR("ERN") /* Eritrean Nakfa */
+DEFINE_INT_CURR("ESP") /* Spanish Peseta -> EUR */
DEFINE_INT_CURR("ETB") /* Ethiopian Birr */
DEFINE_INT_CURR("EUR") /* European Union Euro */
+DEFINE_INT_CURR("FIM") /* Finnish Markka -> EUR */
DEFINE_INT_CURR("FJD") /* Fiji Dollar */
DEFINE_INT_CURR("FKP") /* Falkland Islands Pound (Malvinas) */
+DEFINE_INT_CURR("FRF") /* French Franc -> EUR */
DEFINE_INT_CURR("GBP") /* British Pound */
DEFINE_INT_CURR("GEL") /* Georgia Lari */
DEFINE_INT_CURR("GHC") /* Ghana Cedi */
DEFINE_INT_CURR("GIP") /* Gibraltar Pound */
DEFINE_INT_CURR("GMD") /* Gambian Dalasi */
DEFINE_INT_CURR("GNF") /* Guinea Franc */
+DEFINE_INT_CURR("GRD") /* Greek Drachma -> EUR */
DEFINE_INT_CURR("GTQ") /* Guatemala Quetzal */
DEFINE_INT_CURR("GYD") /* Guyana Dollar */
DEFINE_INT_CURR("HKD") /* Hong Kong Dollar */
2009-09-01 11:03:11 +00:00
@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK") /* Croatia Kuna */
DEFINE_INT_CURR("HTG") /* Haiti Gourde */
DEFINE_INT_CURR("HUF") /* Hungarian Forint */
DEFINE_INT_CURR("IDR") /* Indonesia Rupiah */
+DEFINE_INT_CURR("IEP") /* Irish Pound -> EUR */
DEFINE_INT_CURR("ILS") /* Israeli Shekel */
DEFINE_INT_CURR("IMP") /* Isle of Man Pounds */
DEFINE_INT_CURR("INR") /* Indian Rupee (Bhutan) */
DEFINE_INT_CURR("IQD") /* Iraqi Dinar */
DEFINE_INT_CURR("IRR") /* Iranian Rial */
DEFINE_INT_CURR("ISK") /* Iceland Krona */
+DEFINE_INT_CURR("ITL") /* Italian Lira -> EUR */
DEFINE_INT_CURR("JEP") /* Jersey Pound */
DEFINE_INT_CURR("JMD") /* Jamaican Dollar */
DEFINE_INT_CURR("JOD") /* Jordanian Dinar */
2009-09-01 11:03:11 +00:00
@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR") /* Sri Lankan Rupee */
DEFINE_INT_CURR("LRD") /* Liberian Dollar */
DEFINE_INT_CURR("LSL") /* Lesotho Maloti */
DEFINE_INT_CURR("LTL") /* Lithuanian Litas */
+DEFINE_INT_CURR("LUF") /* Luxembourg Franc -> EUR */
DEFINE_INT_CURR("LVL") /* Latvia Lat */
DEFINE_INT_CURR("LYD") /* Libyan Arab Jamahiriya Dinar */
DEFINE_INT_CURR("MAD") /* Moroccan Dirham */
2009-09-01 11:03:11 +00:00
@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM") /* Mozambique Metical */
DEFINE_INT_CURR("NAD") /* Namibia Dollar */
DEFINE_INT_CURR("NGN") /* Nigeria Naira */
DEFINE_INT_CURR("NIO") /* Nicaragua Cordoba Oro */
+DEFINE_INT_CURR("NLG") /* Netherlands Guilder -> EUR */
DEFINE_INT_CURR("NOK") /* Norwegian Krone */
DEFINE_INT_CURR("NPR") /* Nepalese Rupee */
DEFINE_INT_CURR("NZD") /* New Zealand Dollar */
2009-09-01 11:03:11 +00:00
@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK") /* Papau New Guinea Kina */
DEFINE_INT_CURR("PHP") /* Philippines Peso */
DEFINE_INT_CURR("PKR") /* Pakistan Rupee */
DEFINE_INT_CURR("PLN") /* Polish Zloty */
+DEFINE_INT_CURR("PTE") /* Portugese Escudo -> EUR */
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/locale/programs/locarchive.c
+++ glibc-2.14-3/locale/programs/locarchive.c
2010-02-08 15:32:13 +00:00
@@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah)
size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0;
if (total < reserved
- && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
-1, 0)) != MAP_FAILED))
xflags = MAP_FIXED;
else
2009-09-01 11:03:11 +00:00
@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
/* forward decls for below */
static uint32_t add_locale (struct locarhandle *ah, const char *name,
locale_data_t data, bool replace);
-static void add_alias (struct locarhandle *ah, const char *alias,
- bool replace, const char *oldname,
- uint32_t *locrec_offset_p);
+void add_alias (struct locarhandle *ah, const char *alias,
+ bool replace, const char *oldname,
+ uint32_t *locrec_offset_p);
2009-06-26 15:46:27 +00:00
static bool
2010-02-08 15:32:13 +00:00
@@ -396,7 +396,7 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0;
if (total < reserved
- && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
-1, 0)) != MAP_FAILED))
xflags = MAP_FIXED;
else
@@ -614,7 +614,7 @@ open_archive (struct locarhandle *ah, bool readonly)
int xflags = 0;
void *p;
if (st.st_size < reserved
- && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
-1, 0)) != MAP_FAILED))
xflags = MAP_FIXED;
else
2009-06-26 15:46:27 +00:00
@@ -649,7 +649,7 @@ close_archive (struct locarhandle *ah)
#include "../../intl/explodename.c"
#include "../../intl/l10nflist.c"
-static struct namehashent *
+struct namehashent *
insert_name (struct locarhandle *ah,
const char *name, size_t name_len, bool replace)
{
2009-06-26 15:46:27 +00:00
@@ -707,7 +707,7 @@ insert_name (struct locarhandle *ah,
return &namehashtab[idx];
}
-static void
+void
add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p)
{
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/localedata/ChangeLog
+++ glibc-2.14-3/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-21 Andreas Schwab <schwab@redhat.com>
+
+ * charmaps/GB18030: Readd lost characters.
+
2011-05-21 Ulrich Drepper <drepper@gmail.com>
[BZ #12788]
--- glibc-2.14-12-g5babac1/localedata/Makefile
+++ glibc-2.14-3/localedata/Makefile
2010-05-19 12:00:46 +00:00
@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
$(LOCALEDEF) --alias-file=../intl/locale.alias \
+ --no-archive \
-i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/localedata/SUPPORTED
+++ glibc-2.14-3/localedata/SUPPORTED
2011-05-13 14:56:46 +00:00
@@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \
da_DK/ISO-8859-1 \
+da_DK.ISO-8859-15/ISO-8859-15 \
de_AT.UTF-8/UTF-8 \
de_AT/ISO-8859-1 \
de_AT@euro/ISO-8859-15 \
2011-05-13 14:56:46 +00:00
@@ -117,6 +118,7 @@ en_DK.UTF-8/UTF-8 \
en_DK/ISO-8859-1 \
en_GB.UTF-8/UTF-8 \
en_GB/ISO-8859-1 \
+en_GB.ISO-8859-15/ISO-8859-15 \
en_HK.UTF-8/UTF-8 \
en_HK/ISO-8859-1 \
en_IE.UTF-8/UTF-8 \
2011-05-13 14:56:46 +00:00
@@ -132,6 +134,7 @@ en_SG.UTF-8/UTF-8 \
en_SG/ISO-8859-1 \
en_US.UTF-8/UTF-8 \
en_US/ISO-8859-1 \
+en_US.ISO-8859-15/ISO-8859-15 \
en_ZA.UTF-8/UTF-8 \
en_ZA/ISO-8859-1 \
2011-05-13 14:56:46 +00:00
en_ZM/UTF-8 \
@@ -313,6 +316,8 @@ nl_NL/ISO-8859-1 \
nl_NL@euro/ISO-8859-15 \
nn_NO.UTF-8/UTF-8 \
nn_NO/ISO-8859-1 \
+no_NO.UTF-8/UTF-8 \
+no_NO/ISO-8859-1 \
nr_ZA/UTF-8 \
nso_ZA/UTF-8 \
oc_FR.UTF-8/UTF-8 \
2011-05-13 14:56:46 +00:00
@@ -374,6 +379,7 @@ sv_FI/ISO-8859-1 \
sv_FI@euro/ISO-8859-15 \
sv_SE.UTF-8/UTF-8 \
sv_SE/ISO-8859-1 \
+sv_SE.ISO-8859-15/ISO-8859-15 \
2011-05-13 14:56:46 +00:00
sw_KE/UTF-8 \
sw_TZ/UTF-8 \
ta_IN/UTF-8 \
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/localedata/locales/cy_GB
+++ glibc-2.14-3/localedata/locales/cy_GB
2009-09-01 11:03:11 +00:00
@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061><U0077><U0072>";/
d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
t_fmt "<U0025><U0054>"
-am_pm "";""
-t_fmt_ampm ""
+am_pm "<U0041><U004D>";"<U0050><U004D>"
+t_fmt_ampm "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U005A><U0020><U0025><U0059>"
END LC_TIME
LC_MESSAGES
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/localedata/locales/en_GB
+++ glibc-2.14-3/localedata/locales/en_GB
2009-09-01 11:03:11 +00:00
@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
t_fmt "<U0025><U0054>"
-am_pm "";""
-t_fmt_ampm ""
+am_pm "<U0041><U004D>";"<U0050><U004D>"
+t_fmt_ampm "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>"
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/localedata/locales/no_NO
+++ glibc-2.14-3/localedata/locales/no_NO
@@ -0,0 +1,69 @@
+escape_char /
+comment_char %
+
+% Norwegian language locale for Norway
+% Source: Norsk Standardiseringsforbund
+% Address: University Library,
+% Drammensveien 41, N-9242 Oslo, Norge
+% Contact: Kolbjoern Aamboe
+% Tel: +47 - 22859109
+% Fax: +47 - 22434497
+% Email: kolbjorn.aambo@usit.uio.no
+% Language: no
+% Territory: NO
+% Revision: 4.3
+% Date: 1996-10-15
+% Application: general
+% Users: general
+% Repertoiremap: mnemonic.ds
+% Charset: ISO-8859-1
+% Distribution and use is free, also
+% for commercial purposes.
+
+LC_IDENTIFICATION
+copy "nb_NO"
+END LC_IDENTIFICATION
+
+LC_COLLATE
+copy "nb_NO"
+END LC_COLLATE
+
+LC_CTYPE
+copy "nb_NO"
+END LC_CTYPE
+
+LC_MONETARY
+copy "nb_NO"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "nb_NO"
+END LC_NUMERIC
+
+LC_TIME
+copy "nb_NO"
+END LC_TIME
+
+LC_MESSAGES
+copy "nb_NO"
+END LC_MESSAGES
+
+LC_PAPER
+copy "nb_NO"
+END LC_PAPER
+
+LC_TELEPHONE
+copy "nb_NO"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "nb_NO"
+END LC_MEASUREMENT
+
+LC_NAME
+copy "nb_NO"
+END LC_NAME
+
+LC_ADDRESS
+copy "nb_NO"
+END LC_ADDRESS
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/localedata/locales/zh_TW
+++ glibc-2.14-3/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
comment_char %
escape_char /
%
-% Chinese language locale for Taiwan R.O.C.
+% Chinese language locale for Taiwan
% charmap: BIG5-CP950
%
% Original Author:
@@ -17,7 +17,7 @@ escape_char /
% Reference: http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
LC_IDENTIFICATION
-title "Chinese locale for Taiwan R.O.C."
+title "Chinese locale for Taiwan"
source ""
address ""
contact ""
@@ -25,7 +25,7 @@ email "bug-glibc-locales@gnu.org"
tel ""
fax ""
language "Chinese"
-territory "Taiwan R.O.C."
+territory "Taiwan"
revision "0.2"
date "2000-08-02"
%
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/login/programs/pt_chown.c
+++ glibc-2.14-3/login/programs/pt_chown.c
2011-02-15 13:29:18 +00:00
@@ -29,6 +29,7 @@
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <fcntl.h>
#ifdef HAVE_LIBCAP
# include <sys/capability.h>
# include <sys/prctl.h>
@@ -143,7 +144,7 @@ main (int argc, char *argv[])
uid_t uid = getuid ();
int remaining;
- if (argc == 1 && euid == 0)
+ if (argc == 1 && fcntl (PTY_FILENO, F_GETFD) == 0)
{
#ifdef HAVE_LIBCAP
/* Drop privileges. */
@@ -176,6 +177,13 @@ main (int argc, char *argv[])
/* We aren't going to be using privileges, so drop them right now. */
setuid (uid);
+#ifdef HAVE_LIBCAP
+ cap_t caps = cap_init ();
+ if (caps == NULL)
+ error (1, errno, "cap_init");
+ cap_set_proc (caps);
+ cap_free (caps);
+#endif
/* Set locale via LC_ALL. */
setlocale (LC_ALL, "");
@@ -195,9 +203,5 @@ main (int argc, char *argv[])
return EXIT_FAILURE;
}
- /* Check if we are properly installed. */
- if (euid != 0)
- error (FAIL_EXEC, 0, gettext ("needs to be installed setuid `root'"));
-
return EXIT_SUCCESS;
}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/malloc/mcheck.c
+++ glibc-2.14-3/malloc/mcheck.c
2010-10-04 11:27:15 +00:00
@@ -25,10 +25,26 @@
# include <mcheck.h>
# include <stdint.h>
# include <stdio.h>
+# include <stdlib.h>
# include <libintl.h>
2010-10-04 11:27:15 +00:00
# include <errno.h>
#endif
+#ifdef _LIBC
+extern __typeof (malloc) __libc_malloc;
+extern __typeof (free) __libc_free;
+extern __typeof (realloc) __libc_realloc;
+libc_hidden_proto (__libc_malloc)
+libc_hidden_proto (__libc_realloc)
+libc_hidden_proto (__libc_free)
+libc_hidden_proto (__libc_memalign)
+#else
+# define __libc_malloc(sz) malloc (sz)
+# define __libc_free(ptr) free (ptr)
+# define __libc_realloc(ptr, sz) realloc (ptr, sz)
+# define __libc_memalign(al, sz) memalign (al, sz)
+#endif
+
/* Old hook values. */
static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t);
static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t);
2010-10-04 11:27:15 +00:00
@@ -199,7 +215,7 @@ freehook (__ptr_t ptr, const __ptr_t caller)
if (old_free_hook != NULL)
(*old_free_hook) (ptr, caller);
else
- free (ptr);
+ __libc_free (ptr);
__free_hook = freehook;
}
2010-10-04 11:27:15 +00:00
@@ -222,7 +238,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller)
hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1,
caller);
else
- hdr = (struct hdr *) malloc (sizeof (struct hdr) + size + 1);
+ hdr = (struct hdr *) __libc_malloc (sizeof (struct hdr) + size + 1);
__malloc_hook = mallochook;
if (hdr == NULL)
return NULL;
2010-10-04 11:27:15 +00:00
@@ -259,7 +275,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size,
if (old_memalign_hook != NULL)
block = (*old_memalign_hook) (alignment, slop + size + 1, caller);
else
- block = memalign (alignment, slop + size + 1);
+ block = __libc_memalign (alignment, slop + size + 1);
__memalign_hook = memalignhook;
if (block == NULL)
return NULL;
2010-10-04 11:27:15 +00:00
@@ -320,8 +336,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
sizeof (struct hdr) + size + 1,
caller);
else
- hdr = (struct hdr *) realloc ((__ptr_t) hdr,
- sizeof (struct hdr) + size + 1);
+ hdr = (struct hdr *) __libc_realloc ((__ptr_t) hdr,
+ sizeof (struct hdr) + size + 1);
__free_hook = freehook;
__malloc_hook = mallochook;
__memalign_hook = memalignhook;
2010-10-04 11:27:15 +00:00
@@ -381,8 +397,8 @@ mcheck (func)
if (__malloc_initialized <= 0 && !mcheck_used)
{
/* We call malloc() once here to ensure it is initialized. */
- void *p = malloc (0);
- free (p);
+ void *p = __libc_malloc (0);
+ __libc_free (p);
old_free_hook = __free_hook;
__free_hook = freehook;
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/manual/libc.texinfo
+++ glibc-2.14-3/manual/libc.texinfo
@@ -5,7 +5,7 @@
2007-07-31 18:24:22 +00:00
@c setchapternewpage odd
@comment Tell install-info what to do.
2007-07-31 18:24:22 +00:00
-@dircategory Software libraries
+@dircategory Libraries
@direntry
* Libc: (libc). C library.
@end direntry
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/misc/sys/cdefs.h
+++ glibc-2.14-3/misc/sys/cdefs.h
2007-10-03 19:54:48 +00:00
@@ -132,7 +132,10 @@
#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
#define __bos0(ptr) __builtin_object_size (ptr, 0)
-#if __GNUC_PREREQ (4,3)
+#if __GNUC_PREREQ (4,3) \
+ || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
+ && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
+ && __GNUC_RH_RELEASE__ >= 31)
# define __warndecl(name, msg) \
extern void name (void) __attribute__((__warning__ (msg)))
# define __warnattr(msg) __attribute__((__warning__ (msg)))
@@ -291,10 +294,16 @@
2007-09-18 20:12:30 +00:00
/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
inline semantics, unless -fgnu89-inline is used. */
-#if !defined __cplusplus || __GNUC_PREREQ (4,3)
+#if !defined __cplusplus || __GNUC_PREREQ (4,3) \
+ || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
+ && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
2007-10-03 19:54:48 +00:00
+ && __GNUC_RH_RELEASE__ >= 31)
2007-09-18 20:12:30 +00:00
# if defined __GNUC_STDC_INLINE__ || defined __cplusplus
# define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
2007-10-03 19:54:48 +00:00
-# if __GNUC_PREREQ (4,3)
+# if __GNUC_PREREQ (4,3) \
+ || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
+ && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
+ && __GNUC_RH_RELEASE__ >= 31)
# define __extern_always_inline \
extern __always_inline __attribute__ ((__gnu_inline__, __artificial__))
# else
2009-03-09 15:00:02 +00:00
@@ -314,7 +323,10 @@
2007-09-18 20:12:30 +00:00
/* GCC 4.3 and above allow passing all anonymous arguments of an
__extern_always_inline function to some other vararg function. */
-#if __GNUC_PREREQ (4,3)
+#if __GNUC_PREREQ (4,3) \
+ || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
+ && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
2007-10-03 19:54:48 +00:00
+ && __GNUC_RH_RELEASE__ >= 31)
2007-09-18 20:12:30 +00:00
# define __va_arg_pack() __builtin_va_arg_pack ()
# define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nis/Makefile
+++ glibc-2.14-3/nis/Makefile
2011-05-18 14:18:54 +00:00
@@ -23,9 +23,9 @@ subdir := nis
aux := nis_hash
+headers := $(wildcard rpcsvc/*.[hx])
distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
- nisplus-parser.h nis_xdr.h nss \
- $(wildcard rpcsvc/*.[hx])
+ nisplus-parser.h nis_xdr.h nss
# These are the databases available for the nis (and perhaps later nisplus)
# service. This must be a superset of the services in nss.
2010-05-31 15:10:22 +00:00
@@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
include ../Rules
2011-05-27 14:19:02 +00:00
+CFLAGS-nis_findserv.c += -fno-strict-aliasing
+CFLAGS-ypclnt.c += -fno-strict-aliasing
2010-05-31 15:10:22 +00:00
$(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
$(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nis/nss
+++ glibc-2.14-3/nis/nss
2010-05-19 12:00:46 +00:00
@@ -25,7 +25,7 @@
# memory with every getXXent() call. Otherwise each getXXent() call
# might result into a network communication with the server to get
# the next entry.
-#SETENT_BATCH_READ=TRUE
+SETENT_BATCH_READ=TRUE
2010-05-19 12:00:46 +00:00
#
# ADJUNCT_AS_SHADOW
# If set to TRUE, the passwd routines in the NIS NSS module will not
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/ChangeLog
+++ glibc-2.14-3/nptl/ChangeLog
@@ -14,6 +14,51 @@
2011-05-04 11:11:17 +00:00
clearing memory.
Patch partly by Robert Rex <robert.rex@exasol.com>.
2011-04-07 11:22:58 +00:00
+2011-02-22 Rayson Ho <rho@redhat.com>
+
+ * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Low-level SystemTap
+ probes for i386.
+ * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S: Likewise.
+
+2011-02-09 Rayson Ho <rho@redhat.com>
+
+ * DESIGN-systemtap-probes.txt: New file.
+ * pthread_cond_broadcast.c: SystemTap probes.
+ * pthread_cond_init.c: Likewise.
+ * pthread_cond_signal.c: Likewise.
+ * pthread_cond_wait.c: Likewise.
+ * pthread_cond_destroy.c: Likewise.
+ * pthread_create.c: Likewise.
+ * pthread_join.c: Likewise.
+ * pthread_mutex_destroy.c: Likewise.
+ * pthread_mutex_init.c: Likewise.
+ * pthread_mutex_lock.c: Likewise.
+ * pthread_mutex_timedlock.c: Likewise.
+ * pthread_mutex_unlock.c: Likewise.
+ * pthread_rwlock_destroy.c: Likewise.
+ * pthread_rwlock_rdlock.c: Likewise.
+ * pthread_rwlock_unlock.c: Likewise.
+ * pthread_rwlock_wrlock.c: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S: Likewise.
+
+2010-07-23 Roland McGrath <roland@redhat.com>
+
+ * pthread_create.c (start_thread): Define pthread_start LIBC_PROBE.
+
2011-01-19 Roland McGrath <roland@redhat.com>
* pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo.
2011-06-21 12:59:31 +00:00
@@ -4743,6 +4788,11 @@
Move definition inside libpthread, libc, librt check. Provide
definition for rtld.
+2004-09-02 Jakub Jelinek <jakub@redhat.com>
+
+ * pthread_cond_destroy.c (__pthread_cond_destroy): If there are
+ waiters, awake all waiters on the associated mutex.
+
2004-09-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
2011-06-21 12:59:31 +00:00
@@ -6817,6 +6867,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
+2003-07-22 Jakub Jelinek <jakub@redhat.com>
+
+ * descr.h: Don't include lowlevellock.h, pthreaddef.h and dl-sysdep.h
+ if __need_struct_pthread_size, instead define lll_lock_t.
+
2003-07-25 Jakub Jelinek <jakub@redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed.
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/DESIGN-systemtap-probes.txt
+++ glibc-2.14-3/nptl/DESIGN-systemtap-probes.txt
2011-04-07 11:22:58 +00:00
@@ -0,0 +1,89 @@
+Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes
+that are not fired at run time have close to zero overhead.
+
+The following probes are available for NPTL:
+
+Thread creation & Join Probes
+=============================
+pthread_create - probe for pthread_create
+ arg1 = pointer (pthread_t*) to thread
+ arg2 = pointer (pthread_attr_t*) to attr
+ arg3 = pointer (void *) to start_routine
+ arg4 = arguments to start_routine
+pthread_start - probe for actual thread creation
+ arg1 = struct pthread (members include thread ID, process ID)
+ arg2 = address of start_routine
+ arg3 = pointer to the list of arguments
+pthread_join - probe for pthread_join
+ arg1 = thread ID
+pthread_join_ret - probe for pthread_join return
+ arg1 = thread ID
+ arg2 = return value
+
+Lock-related Probes
+===================
+mutex_init - probe for pthread_mutex_init
+ arg1 = address of mutex lock
+mutex_acquired - probe for succ. return of pthread_mutex_lock
+ arg1 = address of mutex lock
+mutex_timedlock_acquired - probe for succ. return of pthread_mutex_timedlock
+ arg1 = address of mutex lock
+mutex_entry - probe for entry to the pthread_mutex_lock function
+ arg1 = address of mutex lock
+mutex_timedlock_entry - probe for entry to the pthread_mutex_timedlock function
+ arg1 = address of mutex lock, arg2 = address of timespec
+mutex_release - probe for pthread_mutex_unlock after the successful release of a
+ mutex lock
+ arg1 = address of mutex lock
+mutex_destroy - probe for pthread_mutex_destroy
+ arg1 = address of mutex lock
+
+wrlock_entry - probe for entry to the pthread_rwlock_wrlock function
+ arg1 = address of rw lock
+rdlock_entry - probe for entry to the pthread_rwlock_rdlock function
+ arg1 = address of rw lock
+
+rwlock_destroy - probe for pthread_rwlock_destroy
+ arg1 = address of rw lock
+wrlock_acquire_write - probe for pthread_rwlock_wrlock (after getting the lock)
+ arg1 = address of rw lock
+rdlock_acquire_read - probe for pthread_rwlock_rdlock after successfully getting
+ the lock
+ arg1 = address of rw lock
+rwlock_unlock - probe for pthread_rwlock_unlock
+ arg1 = address of rw lock
+
+lll_lock_wait - probe in low-level (assembly language) locking code, only fired
+ when futex/FUTEX_WAIT is called (i.e. when trying to acquire a
+ contented lock)
+ arg1 = pointer to futex
+ arg2 = flags passed to the futex system call
+lll_lock_wait_private - probe in low-level (assembly language) locking code,
+ only fired when futex/FUTEX_WAIT is called (i.e. when
+ trying to acquire a contented lock)
+ arg1 = pointer to futex
+
+lll_futex_wake - probe in low-level (assembly language) locking code, only fired
+ when futex (FUTEX_WAKE) is called
+ arg1 = pointer to futex
+ arg2 = number of processes to wake
+ arg3 = additional flags
+
+Condition variable Probes
+=========================
+cond_init - probe for pthread_cond_init
+ arg1 = condition
+ arg2 = attr
+cond_destroy - probe for pthread_cond_destroy
+ arg1 = cond
+cond_wait - probe for pthread_cond_wait
+ arg1 = condition
+ arg2 = mutex lock
+cond_timedwait - probe for pthread_cond_timedwait
+ arg1 = condition
+ arg2 = mutex lock
+ arg3 = timespec
+cond_signal - probe for pthread_cond_signal
+ arg1 = condition
+cond_broadcast - probe for pthread_cond_broadcast
+ arg1 = condition
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/Makefile
+++ glibc-2.14-3/nptl/Makefile
2010-07-02 12:42:07 +00:00
@@ -342,7 +342,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs)
omit-deps += crti crtn
-CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time)
+CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time) \
+ -fno-asynchronous-unwind-tables
endif
CFLAGS-flockfile.c = -D_IO_MTSAFE_IO
2010-07-02 12:42:07 +00:00
@@ -529,15 +530,19 @@ $(addprefix $(objpfx), \
$(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
$(objpfx)libpthread_nonshared.a
$(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so
-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
+# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
# since otherwise libpthread.so comes before libc.so when linking.
$(addprefix $(objpfx), $(tests-reverse)): \
- $(objpfx)../libc.so $(objpfx)libpthread.so \
+ $(objpfx)linklibc.so $(objpfx)libpthread.so \
$(objpfx)libpthread_nonshared.a
$(objpfx)../libc.so: $(common-objpfx)libc.so ;
$(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
$(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
+
+$(objpfx)linklibc.so: $(common-objpfx)libc.so
+ ln -s ../libc.so $@
+generated += libclink.so
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/Versions
+++ glibc-2.14-3/nptl/Versions
2011-01-18 15:41:09 +00:00
@@ -30,6 +30,7 @@ libc {
__libc_alloca_cutoff;
2010-06-15 08:43:24 +00:00
# Internal libc interface to libpthread
__libc_dl_error_tsd;
+ __getrlimit;
}
}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/allocatestack.c
+++ glibc-2.14-3/nptl/allocatestack.c
2011-05-04 11:11:17 +00:00
@@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t)
2010-07-02 12:42:07 +00:00
/* If the thread is exiting right now, ignore it. */
if ((ch & EXITING_BITMASK) != 0)
- return;
+ {
+ /* Release the futex if there is no other setxid in
+ progress. */
+ if ((ch & SETXID_BITMASK) == 0)
+ {
+ t->setxid_futex = 1;
+ lll_futex_wake (&t->setxid_futex, 1, LLL_PRIVATE);
+ }
+ return;
+ }
}
while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
ch | SETXID_BITMASK, ch));
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/nptl-init.c
+++ glibc-2.14-3/nptl/nptl-init.c
2010-06-15 08:43:24 +00:00
@@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void)
/* Determine the default allowed stack size. This is the size used
in case the user does not specify one. */
struct rlimit limit;
- if (getrlimit (RLIMIT_STACK, &limit) != 0
+ if (__getrlimit (RLIMIT_STACK, &limit) != 0
|| limit.rlim_cur == RLIM_INFINITY)
/* The system limit is not usable. Use an architecture-specific
default. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_cond_broadcast.c
+++ glibc-2.14-3/nptl/pthread_cond_broadcast.c
2011-04-07 11:22:58 +00:00
@@ -23,6 +23,7 @@
#include <lowlevellock.h>
#include <pthread.h>
#include <pthreadP.h>
+#include <stap-probe.h>
#include <shlib-compat.h>
#include <kernel-features.h>
@@ -32,6 +33,8 @@ int
__pthread_cond_broadcast (cond)
pthread_cond_t *cond;
{
+ LIBC_PROBE (cond_broadcast, 1, cond);
+
int pshared = (cond->__data.__mutex == (void *) ~0l)
? LLL_SHARED : LLL_PRIVATE;
/* Make sure we are alone. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_cond_destroy.c
+++ glibc-2.14-3/nptl/pthread_cond_destroy.c
2011-04-07 11:22:58 +00:00
@@ -20,6 +20,7 @@
#include <errno.h>
#include <shlib-compat.h>
#include "pthreadP.h"
+#include <stap-probe.h>
int
@@ -29,6 +30,8 @@ __pthread_cond_destroy (cond)
int pshared = (cond->__data.__mutex == (void *) ~0l)
? LLL_SHARED : LLL_PRIVATE;
+ LIBC_PROBE (cond_destroy, 1, cond);
+
/* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_cond_init.c
+++ glibc-2.14-3/nptl/pthread_cond_init.c
2011-04-07 11:22:58 +00:00
@@ -20,6 +20,7 @@
#include <shlib-compat.h>
#include "pthreadP.h"
+#include <stap-probe.h>
int
@@ -42,6 +43,8 @@ __pthread_cond_init (cond, cond_attr)
? NULL : (void *) ~0l);
cond->__data.__broadcast_seq = 0;
+ LIBC_PROBE (cond_init, 2, cond, cond_attr);
+
return 0;
}
versioned_symbol (libpthread, __pthread_cond_init,
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_cond_signal.c
+++ glibc-2.14-3/nptl/pthread_cond_signal.c
2011-04-07 11:22:58 +00:00
@@ -26,6 +26,7 @@
#include <shlib-compat.h>
#include <kernel-features.h>
+#include <stap-probe.h>
int
@@ -35,6 +36,8 @@ __pthread_cond_signal (cond)
int pshared = (cond->__data.__mutex == (void *) ~0l)
? LLL_SHARED : LLL_PRIVATE;
+ LIBC_PROBE (cond_signal, 1, cond);
+
/* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_cond_wait.c
+++ glibc-2.14-3/nptl/pthread_cond_wait.c
2011-04-07 11:22:58 +00:00
@@ -25,6 +25,7 @@
#include <pthreadP.h>
#include <shlib-compat.h>
+#include <stap-probe.h>
struct _condvar_cleanup_buffer
@@ -101,6 +102,8 @@ __pthread_cond_wait (cond, mutex)
int pshared = (cond->__data.__mutex == (void *) ~0l)
? LLL_SHARED : LLL_PRIVATE;
+ LIBC_PROBE (cond_wait, 2, cond, mutex);
+
/* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_create.c
+++ glibc-2.14-3/nptl/pthread_create.c
2011-04-07 11:22:58 +00:00
@@ -31,6 +31,8 @@
#include <shlib-compat.h>
+#include <stap-probe.h>
+
/* Local function to start thread and handle cleanup. */
static int start_thread (void *arg);
@@ -296,6 +298,8 @@ start_thread (void *arg)
CANCEL_RESET (oldtype);
}
+ LIBC_PROBE (pthread_start, 3, (pthread_t) pd, pd->start_routine, pd->arg);
+
/* Run the code the user provided. */
#ifdef CALL_THREAD_FCT
THREAD_SETMEM (pd, result, CALL_THREAD_FCT (pd));
@@ -552,6 +556,8 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
/* Pass the descriptor to the caller. */
*newthread = (pthread_t) pd;
+ LIBC_PROBE (pthread_create, 4, newthread, attr, start_routine, arg);
+
/* Start the thread. */
return create_thread (pd, iattr, STACK_VARIABLES_ARGS);
}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_join.c
+++ glibc-2.14-3/nptl/pthread_join.c
2011-04-07 11:22:58 +00:00
@@ -23,6 +23,8 @@
#include <atomic.h>
#include "pthreadP.h"
+#include <stap-probe.h>
+
static void
cleanup (void *arg)
@@ -55,6 +57,8 @@ pthread_join (threadid, thread_return)
struct pthread *self = THREAD_SELF;
int result = 0;
+ LIBC_PROBE (pthread_join, 1, threadid);
+
/* During the wait we change to asynchronous cancellation. If we
are canceled the thread we are waiting for must be marked as
un-wait-ed for again. */
@@ -110,5 +114,7 @@ pthread_join (threadid, thread_return)
__free_tcb (pd);
}
+ LIBC_PROBE (pthread_join_ret, 3, threadid, result, pd->result);
+
return result;
}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_mutex_destroy.c
+++ glibc-2.14-3/nptl/pthread_mutex_destroy.c
2011-04-07 11:22:58 +00:00
@@ -20,11 +20,15 @@
#include <errno.h>
#include "pthreadP.h"
+#include <stap-probe.h>
+
int
__pthread_mutex_destroy (mutex)
pthread_mutex_t *mutex;
{
+ LIBC_PROBE (mutex_destroy, 1, mutex);
+
if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0
&& mutex->__data.__nusers != 0)
return EBUSY;
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_mutex_init.c
+++ glibc-2.14-3/nptl/pthread_mutex_init.c
2011-04-07 11:22:58 +00:00
@@ -24,6 +24,8 @@
#include <kernel-features.h>
#include "pthreadP.h"
+#include <stap-probe.h>
+
static const struct pthread_mutexattr default_attr =
{
/* Default is a normal mutex, not shared between processes. */
@@ -135,6 +137,8 @@ __pthread_mutex_init (mutex, mutexattr)
// mutex->__spins = 0; already done by memset
// mutex->__next = NULL; already done by memset
+ LIBC_PROBE (mutex_init, 1, mutex);
+
return 0;
}
strong_alias (__pthread_mutex_init, pthread_mutex_init)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_mutex_lock.c
+++ glibc-2.14-3/nptl/pthread_mutex_lock.c
2011-04-07 11:22:58 +00:00
@@ -24,6 +24,7 @@
#include <not-cancel.h>
#include "pthreadP.h"
#include <lowlevellock.h>
+#include <stap-probe.h>
#ifndef LLL_MUTEX_LOCK
@@ -48,6 +49,9 @@ __pthread_mutex_lock (mutex)
assert (sizeof (mutex->__size) >= sizeof (mutex->__data));
unsigned int type = PTHREAD_MUTEX_TYPE (mutex);
+
+ LIBC_PROBE (mutex_entry, 1, mutex);
+
if (__builtin_expect (type & ~PTHREAD_MUTEX_KIND_MASK_NP, 0))
return __pthread_mutex_lock_full (mutex);
@@ -127,6 +131,8 @@ __pthread_mutex_lock (mutex)
++mutex->__data.__nusers;
#endif
+ LIBC_PROBE (mutex_acquired, 1, mutex);
+
return 0;
}
@@ -467,6 +473,8 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
++mutex->__data.__nusers;
#endif
+ LIBC_PROBE (mutex_acquired, 1, mutex);
+
return 0;
}
#ifndef __pthread_mutex_lock
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_mutex_timedlock.c
+++ glibc-2.14-3/nptl/pthread_mutex_timedlock.c
2011-04-07 11:22:58 +00:00
@@ -24,6 +24,8 @@
#include <lowlevellock.h>
#include <not-cancel.h>
+#include <stap-probe.h>
+
int
pthread_mutex_timedlock (mutex, abstime)
@@ -34,6 +36,8 @@ pthread_mutex_timedlock (mutex, abstime)
pid_t id = THREAD_GETMEM (THREAD_SELF, tid);
int result = 0;
+ LIBC_PROBE (mutex_timedlock_entry, 2, mutex, abstime);
+
/* We must not check ABSTIME here. If the thread does not block
abstime must not be checked for a valid value. */
@@ -172,6 +176,8 @@ pthread_mutex_timedlock (mutex, abstime)
++mutex->__data.__count;
+ LIBC_PROBE (mutex_timedlock_acquired, 1, mutex);
+
return 0;
}
}
@@ -242,6 +248,8 @@ pthread_mutex_timedlock (mutex, abstime)
++mutex->__data.__count;
+ LIBC_PROBE (mutex_timedlock_acquired, 1, mutex);
+
return 0;
}
}
@@ -377,6 +385,8 @@ pthread_mutex_timedlock (mutex, abstime)
++mutex->__data.__count;
+ LIBC_PROBE (mutex_timedlock_acquired, 1, mutex);
+
return 0;
}
}
@@ -477,6 +487,8 @@ pthread_mutex_timedlock (mutex, abstime)
/* Record the ownership. */
mutex->__data.__owner = id;
++mutex->__data.__nusers;
+
+ LIBC_PROBE (mutex_timedlock_acquired, 1, mutex);
}
out:
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_mutex_unlock.c
+++ glibc-2.14-3/nptl/pthread_mutex_unlock.c
2011-04-07 11:22:58 +00:00
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include "pthreadP.h"
#include <lowlevellock.h>
+#include <stap-probe.h>
static int
internal_function
@@ -50,6 +51,9 @@ __pthread_mutex_unlock_usercnt (mutex, decr)
/* Unlock. */
lll_unlock (mutex->__data.__lock, PTHREAD_MUTEX_PSHARED (mutex));
+
+ LIBC_PROBE (mutex_release, 1, mutex);
+
return 0;
}
else if (__builtin_expect (type == PTHREAD_MUTEX_RECURSIVE_NP, 1))
@@ -272,6 +276,9 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
PTHREAD_MUTEX_PSHARED (mutex));
int oldprio = newval >> PTHREAD_MUTEX_PRIO_CEILING_SHIFT;
+
+ LIBC_PROBE (mutex_release, 1, mutex);
+
return __pthread_tpp_change_priority (oldprio, -1);
default:
@@ -279,6 +286,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
return EINVAL;
}
+ LIBC_PROBE (mutex_release, 1, mutex);
return 0;
}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_rwlock_destroy.c
+++ glibc-2.14-3/nptl/pthread_rwlock_destroy.c
2011-04-07 11:22:58 +00:00
@@ -18,12 +18,15 @@
02111-1307 USA. */
#include "pthreadP.h"
+#include <stap-probe.h>
int
__pthread_rwlock_destroy (rwlock)
pthread_rwlock_t *rwlock;
{
+ LIBC_PROBE (rwlock_destroy, 1, rwlock);
+
/* Nothing to be done. For now. */
return 0;
}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_rwlock_rdlock.c
+++ glibc-2.14-3/nptl/pthread_rwlock_rdlock.c
2011-04-07 11:22:58 +00:00
@@ -22,6 +22,7 @@
#include <lowlevellock.h>
#include <pthread.h>
#include <pthreadP.h>
+#include <stap-probe.h>
/* Acquire read lock for RWLOCK. */
@@ -31,6 +32,8 @@ __pthread_rwlock_rdlock (rwlock)
{
int result = 0;
+ LIBC_PROBE (rdlock_entry, 1, rwlock);
+
/* Make sure we are alone. */
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
@@ -49,6 +52,8 @@ __pthread_rwlock_rdlock (rwlock)
--rwlock->__data.__nr_readers;
result = EAGAIN;
}
+ else
+ LIBC_PROBE (rdlock_acquire_read, 1, rwlock);
break;
}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_rwlock_unlock.c
+++ glibc-2.14-3/nptl/pthread_rwlock_unlock.c
2011-04-07 11:22:58 +00:00
@@ -22,11 +22,14 @@
#include <lowlevellock.h>
#include <pthread.h>
#include <pthreadP.h>
+#include <stap-probe.h>
/* Unlock RWLOCK. */
int
__pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
{
+ LIBC_PROBE (rwlock_unlock, 1, rwlock);
+
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
if (rwlock->__data.__writer)
rwlock->__data.__writer = 0;
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/pthread_rwlock_wrlock.c
+++ glibc-2.14-3/nptl/pthread_rwlock_wrlock.c
2011-04-07 11:22:58 +00:00
@@ -22,6 +22,7 @@
#include <lowlevellock.h>
#include <pthread.h>
#include <pthreadP.h>
+#include <stap-probe.h>
/* Acquire write lock for RWLOCK. */
@@ -31,6 +32,8 @@ __pthread_rwlock_wrlock (rwlock)
{
int result = 0;
+ LIBC_PROBE (wrlock_entry, 1, rwlock);
+
/* Make sure we are alone. */
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
@@ -41,6 +44,8 @@ __pthread_rwlock_wrlock (rwlock)
{
/* Mark self as writer. */
rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid);
+
+ LIBC_PROBE (wrlock_acquire_write, 1, rwlock);
break;
}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
2009-08-24 09:22:26 +00:00
@@ -189,4 +189,7 @@
2009-06-26 15:46:27 +00:00
/* Typed memory objects are not available. */
#define _POSIX_TYPED_MEMORY_OBJECTS -1
+/* Streams are not available. */
+#define _XOPEN_STREAMS -1
+
#endif /* bits/posix_opt.h */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/Versions
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/Versions
2010-06-15 08:43:24 +00:00
@@ -0,0 +1,6 @@
+libc {
+ GLIBC_PRIVATE {
+ # Internal libc interface to libpthread
+ __uname;
+ }
+}
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
2011-04-07 11:22:58 +00:00
@@ -22,6 +22,8 @@
#include <kernel-features.h>
#include <lowlevellock.h>
+#include <stap-probe.h>
+
.text
#ifdef __ASSUME_PRIVATE_FUTEX
@@ -91,7 +93,8 @@ __lll_lock_wait_private:
cmpl %edx, %eax /* NB: %edx == 2 */
jne 2f
-1: movl $SYS_futex, %eax
+1: LIBC_PROBE (lll_lock_wait_private, 1, %ebx)
+ movl $SYS_futex, %eax
ENTER_KERNEL
2: movl %edx, %eax
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
2011-04-07 11:22:58 +00:00
@@ -24,6 +24,7 @@
#include <kernel-features.h>
#include <pthread-pi-defines.h>
#include <pthread-errnos.h>
+#include <stap-probe.h>
.text
@@ -49,6 +50,8 @@ __pthread_cond_broadcast:
movl 20(%esp), %ebx
+ LIBC_PROBE (cond_broadcast, 1, %edx)
+
/* Get internal lock. */
movl $1, %edx
xorl %eax, %eax
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
2011-04-07 11:22:58 +00:00
@@ -24,7 +24,7 @@
#include <kernel-features.h>
#include <pthread-pi-defines.h>
#include <pthread-errnos.h>
-
+#include <stap-probe.h>
.text
@@ -45,6 +45,8 @@ __pthread_cond_signal:
movl 12(%esp), %edi
+ LIBC_PROBE (cond_signal, 1, %edi)
+
/* Get internal lock. */
movl $1, %edx
xorl %eax, %eax
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
2011-04-07 11:22:58 +00:00
@@ -24,7 +24,7 @@
#include <pthread-errnos.h>
#include <pthread-pi-defines.h>
#include <kernel-features.h>
-
+#include <stap-probe.h>
.text
@@ -61,6 +61,8 @@ __pthread_cond_timedwait:
movl 20(%esp), %ebx
movl 28(%esp), %ebp
+ LIBC_PROBE (cond_timedwait, 3, %ebx, 24(%esp), %ebp)
+
cmpl $1000000000, 4(%ebp)
movl $EINVAL, %eax
jae 18f
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
2011-04-07 11:22:58 +00:00
@@ -25,6 +25,7 @@
#include <pthread-errnos.h>
#include <pthread-pi-defines.h>
#include <kernel-features.h>
+#include <stap-probe.h>
.text
@@ -61,6 +62,8 @@ __pthread_cond_wait:
xorl %esi, %esi
movl 20(%esp), %ebx
+ LIBC_PROBE (cond_wait, 2, 24(%esp), %ebx)
+
/* Get internal lock. */
movl $1, %edx
xorl %eax, %eax
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
2011-04-07 11:22:58 +00:00
@@ -23,6 +23,7 @@
#include <pthread-errnos.h>
#include <kernel-features.h>
+#include <stap-probe.h>
.text
@@ -41,6 +42,8 @@ __pthread_rwlock_rdlock:
xorl %esi, %esi
movl 12(%esp), %ebx
+ LIBC_PROBE (rdlock_entry, 1, %ebx)
+
/* Get the lock. */
movl $1, %edx
xorl %eax, %eax
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
2011-04-07 11:22:58 +00:00
@@ -23,6 +23,7 @@
#include <pthread-errnos.h>
#include <kernel-features.h>
+#include <stap-probe.h>
.text
@@ -41,6 +42,8 @@ __pthread_rwlock_wrlock:
xorl %esi, %esi
movl 12(%esp), %ebx
+ LIBC_PROBE (wrlock_entry, 1, %ebx)
+
/* Get the lock. */
movl $1, %edx
xorl %eax, %eax
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
2011-04-07 11:22:58 +00:00
@@ -20,6 +20,8 @@
#ifndef _LOWLEVELLOCK_H
#define _LOWLEVELLOCK_H 1
+#include <stap-probe.h>
+
#ifndef __ASSEMBLER__
# include <time.h>
# include <sys/param.h>
@@ -226,6 +228,7 @@ LLL_STUB_UNWIND_INFO_END
do { \
int __ignore; \
register __typeof (nr) _nr asm ("edx") = (nr); \
+ LIBC_PROBE (lll_futex_wake, 3, futex, nr, private); \
__asm __volatile (LLL_EBX_LOAD \
LLL_ENTER_KERNEL \
LLL_EBX_LOAD \
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/smp.h
2010-06-15 08:43:24 +00:00
@@ -37,7 +37,7 @@ is_smp_system (void)
char *cp;
/* Try reading the number using `sysctl' first. */
- if (uname (&u.uts) == 0)
+ if (__uname (&u.uts) == 0)
cp = u.uts.version;
else
{
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/kernel-features.h
2009-06-26 15:46:27 +00:00
@@ -0,0 +1,6 @@
+#include_next <kernel-features.h>
+
+/* NPTL can always assume all clone thread flags work. */
+#ifndef __ASSUME_CLONE_THREAD_FLAGS
+# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
2011-04-07 11:22:58 +00:00
@@ -22,6 +22,8 @@
#include <kernel-features.h>
#include <lowlevellock.h>
+#include <stap-probe.h>
+
.text
#ifdef __ASSUME_PRIVATE_FUTEX
@@ -91,7 +93,8 @@ __lll_lock_wait_private:
cmpl %edx, %eax /* NB: %edx == 2 */
jne 2f
-1: movl $SYS_futex, %eax
+1: LIBC_PROBE (lll_lock_wait_private, 1, %rdi)
+ movl $SYS_futex, %eax
syscall
2: movl %edx, %eax
@@ -130,7 +133,8 @@ __lll_lock_wait:
cmpl %edx, %eax /* NB: %edx == 2 */
jne 2f
-1: movl $SYS_futex, %eax
+1: LIBC_PROBE (lll_lock_wait, 2, %rdi, %rsi)
+ movl $SYS_futex, %eax
syscall
2: movl %edx, %eax
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
2011-04-07 11:22:58 +00:00
@@ -20,6 +20,8 @@
#ifndef _LOWLEVELLOCK_H
#define _LOWLEVELLOCK_H 1
+#include <stap-probe.h>
+
#ifndef __ASSEMBLER__
# include <time.h>
# include <sys/param.h>
@@ -227,6 +229,7 @@ LLL_STUB_UNWIND_INFO_END
do { \
int __ignore; \
register __typeof (nr) _nr __asm ("edx") = (nr); \
+ LIBC_PROBE (lll_futex_wake, 3, futex, nr, private); \
__asm __volatile ("syscall" \
: "=a" (__ignore) \
: "0" (SYS_futex), "D" (futex), \
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
2011-04-07 11:22:58 +00:00
@@ -25,7 +25,7 @@
#include <kernel-features.h>
#include <pthread-pi-defines.h>
#include <pthread-errnos.h>
-
+#include <stap-probe.h>
.text
@@ -35,6 +35,8 @@
.align 16
__pthread_cond_broadcast:
+ LIBC_PROBE (cond_broadcast, 1, %rdi)
+
/* Get internal lock. */
movl $1, %esi
xorl %eax, %eax
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
2011-04-07 11:22:58 +00:00
@@ -24,6 +24,7 @@
#include <pthread-pi-defines.h>
#include <kernel-features.h>
#include <pthread-errnos.h>
+#include <stap-probe.h>
.text
@@ -34,6 +35,8 @@
.align 16
__pthread_cond_signal:
+ LIBC_PROBE (cond_signal, 1, %rdi)
+
/* Get internal lock. */
movq %rdi, %r8
movl $1, %esi
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
2011-04-07 11:22:58 +00:00
@@ -23,6 +23,7 @@
#include <lowlevelcond.h>
#include <pthread-pi-defines.h>
#include <pthread-errnos.h>
+#include <stap-probe.h>
#include <kernel-features.h>
@@ -71,6 +72,8 @@ __pthread_cond_timedwait:
cfi_adjust_cfa_offset(FRAME_SIZE)
cfi_remember_state
+ LIBC_PROBE (cond_timedwait, 3, %rdi, %rsi, %rdx)
+
cmpq $1000000000, 8(%rdx)
movl $EINVAL, %eax
jae 48f
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
2011-04-07 11:22:58 +00:00
@@ -23,6 +23,7 @@
#include <lowlevelcond.h>
#include <tcb-offsets.h>
#include <pthread-pi-defines.h>
+#include <stap-probe.h>
#include <kernel-features.h>
@@ -65,6 +66,8 @@ __pthread_cond_wait:
+--------------------------+
*/
+ LIBC_PROBE (cond_wait, 2, %rdi, %rsi)
+
cmpq $-1, dep_mutex(%rdi)
/* Prepare structure passed to cancellation handler. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
2011-04-07 11:22:58 +00:00
@@ -22,7 +22,7 @@
#include <lowlevelrwlock.h>
#include <pthread-errnos.h>
#include <kernel-features.h>
-
+#include <stap-probe.h>
.text
@@ -31,6 +31,9 @@
.align 16
__pthread_rwlock_rdlock:
cfi_startproc
+
+ LIBC_PROBE (rdlock_entry, 1, %rdi)
+
xorq %r10, %r10
/* Get the lock. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
2011-04-07 11:22:58 +00:00
@@ -22,7 +22,7 @@
#include <lowlevelrwlock.h>
#include <pthread-errnos.h>
#include <kernel-features.h>
-
+#include <stap-probe.h>
.text
@@ -31,6 +31,9 @@
.align 16
__pthread_rwlock_wrlock:
cfi_startproc
+
+ LIBC_PROBE (wrlock_entry, 1, %rdi)
+
xorq %r10, %r10
/* Get the lock. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nscd/nscd.conf
+++ glibc-2.14-3/nscd/nscd.conf
2007-12-12 20:47:44 +00:00
@@ -33,7 +33,7 @@
# logfile /var/log/nscd.log
2007-12-12 20:47:44 +00:00
# threads 4
# max-threads 32
-# server-user nobody
+ server-user nscd
2007-12-12 20:47:44 +00:00
# stat-user somebody
debug-level 0
# reload-count 5
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nscd/nscd.init
+++ glibc-2.14-3/nscd/nscd.init
@@ -9,6 +9,7 @@
# slow naming services like NIS, NIS+, LDAP, or hesiod.
# processname: /usr/sbin/nscd
# config: /etc/nscd.conf
+# config: /etc/sysconfig/nscd
#
### BEGIN INIT INFO
# Provides: nscd
@@ -28,20 +29,8 @@
# Source function library.
. /etc/init.d/functions
-# nscd does not run on any kernel lower than 2.2.0 because of threading
-# problems, so we require that in first place.
-case $(uname -r) in
- 2.[2-9].*)
- # this is okay
- ;;
- [3-9]*)
- # these are of course also okay
- ;;
- *)
- #this is not
- exit 1
- ;;
-esac
+# Source an auxiliary options file if we have one, and pick up NSCD_OPTIONS.
+[ -r /etc/sysconfig/nscd ] && . /etc/sysconfig/nscd
RETVAL=0
prog=nscd
@@ -50,7 +39,7 @@ start () {
[ -d /var/run/nscd ] || mkdir /var/run/nscd
[ -d /var/db/nscd ] || mkdir /var/db/nscd
echo -n $"Starting $prog: "
- daemon /usr/sbin/nscd
+ daemon /usr/sbin/nscd $NSCD_OPTIONS
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
2010-05-19 12:00:46 +00:00
@@ -83,11 +72,11 @@ restart() {
2009-09-14 12:23:30 +00:00
# See how we were called.
case "$1" in
start)
- start
+ [ -e /var/lock/subsys/nscd ] || start
RETVAL=$?
;;
stop)
2010-05-19 12:00:46 +00:00
- stop
+ [ ! -e /var/lock/subsys/nscd ] || stop
RETVAL=$?
;;
status)
2009-09-14 12:23:30 +00:00
@@ -99,14 +88,17 @@ case "$1" in
RETVAL=$?
;;
try-restart | condrestart)
- [ -e /var/lock/subsys/nscd ] && restart
+ [ ! -e /var/lock/subsys/nscd ] || restart
RETVAL=$?
2007-12-12 20:47:44 +00:00
;;
force-reload | reload)
echo -n $"Reloading $prog: "
- killproc /usr/sbin/nscd -HUP
- RETVAL=$?
- echo
+ RETVAL=0
+ /usr/sbin/nscd -i passwd || RETVAL=$?
+ /usr/sbin/nscd -i group || RETVAL=$?
+ /usr/sbin/nscd -i hosts || RETVAL=$?
+ /usr/sbin/nscd -i services || RETVAL=$?
+ echo
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nss/Makefile
+++ glibc-2.14-3/nss/Makefile
2010-08-23 12:09:35 +00:00
@@ -75,6 +75,7 @@ endif
2010-05-31 15:10:22 +00:00
include ../Rules
2011-05-27 14:19:02 +00:00
+CFLAGS-files-hosts.c += -fno-strict-aliasing
2010-05-31 15:10:22 +00:00
ifeq (yes,$(build-static-nss))
$(objpfx)getent: $(objpfx)libnss_files.a
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/nss/nss_files/files-XXX.c
+++ glibc-2.14-3/nss/nss_files/files-XXX.c
2010-09-27 14:48:52 +00:00
@@ -1,5 +1,5 @@
/* Common code for file-based databases in nss_files module.
- Copyright (C) 1996-1999,2001,2002,2004,2007,2008
+ Copyright (C) 1996-1999,2001,2002,2004,2007,2008,2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result,
{
char *p;
struct parser_data *data = (void *) buffer;
- int linebuflen = buffer + buflen - data->linebuffer;
+ size_t linebuflen = buffer + buflen - data->linebuffer;
int parse_result;
if (buflen < sizeof *data + 2)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/posix/Makefile
+++ glibc-2.14-3/posix/Makefile
2010-11-12 12:29:24 +00:00
@@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
2007-08-04 21:28:38 +00:00
mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist
-$(objpfx)getconf.speclist: $(objpfx)getconf
2007-09-18 20:12:30 +00:00
-ifeq (no,$(cross-compiling))
2007-08-04 21:28:38 +00:00
- LC_ALL=C GETCONF_DIR=/dev/null \
2009-02-18 20:47:04 +00:00
- $(run-program-prefix) $< _POSIX_V7_WIDTH_RESTRICTED_ENVS > $@.new
- LC_ALL=C GETCONF_DIR=/dev/null \
- $(run-program-prefix) $< _POSIX_V6_WIDTH_RESTRICTED_ENVS >> $@.new
- LC_ALL=C GETCONF_DIR=/dev/null \
- $(run-program-prefix) $< _XBS5_WIDTH_RESTRICTED_ENVS >> $@.new
2007-09-18 20:12:30 +00:00
-else
- > $@.new
-endif
+$(objpfx)getconf.speclist: getconf.speclist.h
+ $(CC) -E $(CFLAGS) $(CPPFLAGS) $< \
2009-02-18 20:47:04 +00:00
+ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
+ > $@.new
2007-08-10 01:55:13 +00:00
mv -f $@.new $@
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/posix/gai.conf
+++ glibc-2.14-3/posix/gai.conf
2010-05-19 12:00:46 +00:00
@@ -41,7 +41,7 @@
#
# precedence <mask> <value>
# Add another rule to the RFC 3484 precedence table. See section 2.1
-# and 10.3 in RFC 3484. The default is:
+# and 10.3 in RFC 3484. The RFC requires:
#
#precedence ::1/128 50
#precedence ::/0 40
@@ -58,7 +58,7 @@
# Add another rule to the RFC 3484 scope table for IPv4 addresses.
# By default the scope IDs described in section 3.2 in RFC 3484 are
# used. Changing these defaults should hardly ever be necessary.
-# The defaults are equivalent to:
+# The definitions in RFC 1918 are equivalent to:
#
#scopev4 ::ffff:169.254.0.0/112 2
#scopev4 ::ffff:127.0.0.0/104 2
@@ -75,3 +75,5 @@
#scopev4 ::ffff:169.254.0.0/112 2
#scopev4 ::ffff:127.0.0.0/104 2
#scopev4 ::ffff:0.0.0.0/96 14
+#
+# This is what the Red Hat setting currently uses.
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/posix/getconf.speclist.h
+++ glibc-2.14-3/posix/getconf.speclist.h
2009-02-18 20:47:04 +00:00
@@ -0,0 +1,39 @@
+#include <unistd.h>
+const char *START_OF_STRINGS =
2009-02-18 20:47:04 +00:00
+#if _POSIX_V7_ILP32_OFF32 == 1
+"POSIX_V7_ILP32_OFF32"
+#endif
+#if _POSIX_V7_ILP32_OFFBIG == 1
+"POSIX_V7_ILP32_OFFBIG"
+#endif
+#if _POSIX_V7_LP64_OFF64 == 1
+"POSIX_V7_LP64_OFF64"
+#endif
+#if _POSIX_V7_LPBIG_OFFBIG == 1
+"POSIX_V7_LPBIG_OFFBIG"
+#endif
+#if _POSIX_V6_ILP32_OFF32 == 1
+"POSIX_V6_ILP32_OFF32"
+#endif
+#if _POSIX_V6_ILP32_OFFBIG == 1
+"POSIX_V6_ILP32_OFFBIG"
+#endif
+#if _POSIX_V6_LP64_OFF64 == 1
+"POSIX_V6_LP64_OFF64"
+#endif
+#if _POSIX_V6_LPBIG_OFFBIG == 1
+"POSIX_V6_LPBIG_OFFBIG"
+#endif
2009-02-18 20:47:04 +00:00
+#if _XBS5_ILP32_OFF32 == 1
+"XBS5_ILP32_OFF32"
+#endif
+#if _XBS5_ILP32_OFFBIG == 1
+"XBS5_ILP32_OFFBIG"
+#endif
+#if _XBS5_LP64_OFF64 == 1
+"XBS5_LP64_OFF64"
+#endif
+#if _XBS5_LPBIG_OFFBIG == 1
+"XBS5_LPBIG_OFFBIG"
+#endif
+"";
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/posix/regcomp.c
+++ glibc-2.14-3/posix/regcomp.c
2010-10-14 10:30:32 +00:00
@@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
2010-09-27 14:48:52 +00:00
/* Local function for parse_bracket_exp used in _LIBC environement.
Seek the collating symbol entry correspondings to NAME.
- Return the index of the symbol in the SYMB_TABLE. */
+ Return the index of the symbol in the SYMB_TABLE,
+ or -1 if not found. */
auto inline int32_t
__attribute ((always_inline))
- seek_collating_symbol_entry (name, name_len)
- const unsigned char *name;
- size_t name_len;
+ seek_collating_symbol_entry (const unsigned char *name, size_t name_len)
{
- int32_t hash = elem_hash ((const char *) name, name_len);
- int32_t elem = hash % table_size;
- if (symb_table[2 * elem] != 0)
- {
- int32_t second = hash % (table_size - 2) + 1;
-
- do
- {
- /* First compare the hashing value. */
- if (symb_table[2 * elem] == hash
- /* Compare the length of the name. */
- && name_len == extra[symb_table[2 * elem + 1]]
- /* Compare the name. */
- && memcmp (name, &extra[symb_table[2 * elem + 1] + 1],
- name_len) == 0)
- {
- /* Yep, this is the entry. */
- break;
- }
+ int32_t elem;
- /* Next entry. */
- elem += second;
- }
- while (symb_table[2 * elem] != 0);
- }
- return elem;
+ for (elem = 0; elem < table_size; elem++)
+ if (symb_table[2 * elem] != 0)
+ {
+ int32_t idx = symb_table[2 * elem + 1];
+ /* Skip the name of collating element name. */
+ idx += 1 + extra[idx];
+ if (/* Compare the length of the name. */
+ name_len == extra[idx]
+ /* Compare the name. */
+ && memcmp (name, &extra[idx + 1], name_len) == 0)
+ /* Yep, this is the entry. */
+ return elem;
+ }
+ return -1;
}
/* Local function for parse_bracket_exp used in _LIBC environment.
2010-10-14 10:30:32 +00:00
@@ -2787,8 +2776,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
2010-09-27 14:48:52 +00:00
auto inline unsigned int
__attribute ((always_inline))
- lookup_collation_sequence_value (br_elem)
- bracket_elem_t *br_elem;
+ lookup_collation_sequence_value (bracket_elem_t *br_elem)
{
if (br_elem->type == SB_CHAR)
{
2010-10-14 10:30:32 +00:00
@@ -2816,7 +2804,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
2010-09-27 14:48:52 +00:00
int32_t elem, idx;
elem = seek_collating_symbol_entry (br_elem->opr.name,
sym_name_len);
- if (symb_table[2 * elem] != 0)
+ if (elem != -1)
{
/* We found the entry. */
idx = symb_table[2 * elem + 1];
2010-10-14 10:30:32 +00:00
@@ -2834,7 +2822,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
2010-09-27 14:48:52 +00:00
/* Return the collation sequence value. */
return *(unsigned int *) (extra + idx);
}
- else if (symb_table[2 * elem] == 0 && sym_name_len == 1)
+ else if (sym_name_len == 1)
{
/* No valid character. Match it as a single byte
character. */
2010-10-14 10:30:32 +00:00
@@ -2856,11 +2844,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
2010-09-27 14:48:52 +00:00
auto inline reg_errcode_t
__attribute ((always_inline))
- build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
- re_charset_t *mbcset;
- int *range_alloc;
- bitset_t sbcset;
- bracket_elem_t *start_elem, *end_elem;
+ build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc,
+ bracket_elem_t *start_elem, bracket_elem_t *end_elem)
{
unsigned int ch;
uint32_t start_collseq;
2010-10-14 10:30:32 +00:00
@@ -2939,25 +2924,22 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
2010-09-27 14:48:52 +00:00
auto inline reg_errcode_t
__attribute ((always_inline))
- build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
- re_charset_t *mbcset;
- int *coll_sym_alloc;
- bitset_t sbcset;
- const unsigned char *name;
+ build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
+ int *coll_sym_alloc, const unsigned char *name)
{
int32_t elem, idx;
size_t name_len = strlen ((const char *) name);
if (nrules != 0)
{
elem = seek_collating_symbol_entry (name, name_len);
- if (symb_table[2 * elem] != 0)
+ if (elem != -1)
{
/* We found the entry. */
idx = symb_table[2 * elem + 1];
/* Skip the name of collating element name. */
idx += 1 + extra[idx];
}
- else if (symb_table[2 * elem] == 0 && name_len == 1)
+ else if (name_len == 1)
{
/* No valid character, treat it as a normal
character. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/resolv/Makefile
+++ glibc-2.14-3/resolv/Makefile
2010-05-31 15:10:22 +00:00
@@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
-Dgetnetbyaddr=res_getnetbyaddr
CFLAGS-res_hconf.c = -fexceptions
2011-05-27 14:19:02 +00:00
+CFLAGS-res_send.c += -fno-strict-aliasing
2010-05-31 15:10:22 +00:00
# The BIND code elicits some harmless warnings.
+cflags += -Wno-strict-prototypes -Wno-write-strings
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/resource/getrlimit.c
+++ glibc-2.14-3/resource/getrlimit.c
2010-07-02 12:42:07 +00:00
@@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
__set_errno (ENOSYS);
return -1;
}
+libc_hidden_def (__getrlimit)
weak_alias (__getrlimit, getrlimit)
stub_warning (getrlimit)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/scripts/check-local-headers.sh
+++ glibc-2.14-3/scripts/check-local-headers.sh
2011-04-07 11:22:58 +00:00
@@ -31,6 +31,8 @@ fgrep -v "$includedir/asm" |
fgrep -v "$includedir/linux" |
fgrep -v "$includedir/selinux" |
fgrep -v "$includedir/sys/capability.h" |
+fgrep -v "$includedir/sys/sdt.h" |
+fgrep -v "$includedir/sys/sdt-config.h" |
fgrep -v "$includedir/gd" |
fgrep -v "$includedir/nss3"; then
# If we found a match something is wrong.
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/stdio-common/vfprintf.c
+++ glibc-2.14-3/stdio-common/vfprintf.c
2011-05-27 14:19:02 +00:00
@@ -1161,41 +1161,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
2010-09-27 14:48:52 +00:00
else if (!is_long && spec != L_('S')) \
{ \
if (prec != -1) \
- { \
- /* Search for the end of the string, but don't search past \
- the length (in bytes) specified by the precision. Also \
- don't use incomplete characters. */ \
- if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX) == 1) \
- len = __strnlen (string, prec); \
- else \
- { \
- /* In case we have a multibyte character set the \
- situation is more complicated. We must not copy \
- bytes at the end which form an incomplete character. */\
- size_t ignore_size = (unsigned) prec > 1024 ? 1024 : prec;\
- wchar_t ignore[ignore_size]; \
- const char *str2 = string; \
- const char *strend = string + prec; \
- if (strend < string) \
- strend = (const char *) UINTPTR_MAX; \
- \
- mbstate_t ps; \
- memset (&ps, '\0', sizeof (ps)); \
- \
- while (str2 != NULL && str2 < strend) \
- if (__mbsnrtowcs (ignore, &str2, strend - str2, \
- ignore_size, &ps) == (size_t) -1) \
- { \
- done = -1; \
- goto all_done; \
- } \
- \
- if (str2 == NULL) \
- len = strlen (string); \
- else \
- len = str2 - string - (ps.__count & 7); \
- } \
- } \
+ /* Search for the end of the string, but don't search past \
+ the length (in bytes) specified by the precision. */ \
+ len = __strnlen (string, prec); \
else \
len = strlen (string); \
} \
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/streams/Makefile
+++ glibc-2.14-3/streams/Makefile
2008-03-14 23:00:20 +00:00
@@ -21,7 +21,7 @@
#
subdir := streams
-headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h
+#headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sunrpc/Makefile
+++ glibc-2.14-3/sunrpc/Makefile
2011-05-13 14:56:46 +00:00
@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
2011-05-06 10:41:38 +00:00
des_crypt.h)
2011-05-13 14:56:46 +00:00
headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
2011-05-06 10:41:38 +00:00
$(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
2011-05-13 14:56:46 +00:00
-headers = rpc/netdb.h
+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
2011-05-06 10:41:38 +00:00
install-others = $(inst_sysconfdir)/rpc
generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
$(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
2011-05-13 14:56:46 +00:00
@@ -152,6 +152,10 @@ CFLAGS-openchild.c = -fexceptions
2010-05-31 15:10:22 +00:00
CPPFLAGS += -D_RPC_THREAD_SAFE_
2011-05-27 14:19:02 +00:00
+CFLAGS-clnt_tcp.c += -fno-strict-aliasing
+CFLAGS-clnt_udp.c += -fno-strict-aliasing
+CFLAGS-clnt_unix.c += -fno-strict-aliasing
2010-05-31 15:10:22 +00:00
+
2011-05-04 11:11:17 +00:00
$(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so
$(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
$(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/generic/dl-cache.h
+++ glibc-2.14-3/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir)
#endif
+#ifndef arch_startup
+# define arch_startup(argc, argv) do { } while (0)
+#endif
+
+#ifndef add_arch_dirs
+# define add_arch_dirs(config_file) do { } while (0)
+#endif
+
#define CACHEMAGIC "ld.so-1.7.0"
/* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/i386/Makefile
+++ glibc-2.14-3/sysdeps/i386/Makefile
2009-07-22 13:05:11 +00:00
@@ -2,6 +2,8 @@
# Every i386 port in use uses gas syntax (I think).
asm-CPPFLAGS += -DGAS_SYNTAX
+sysdep-ASFLAGS += -U__i686
+
# The i386 `long double' is a distinct type we support.
long-double-fcts = yes
2011-01-18 15:41:09 +00:00
@@ -65,6 +67,14 @@ endif
ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
defines += -DNO_TLS_DIRECT_SEG_REFS
+else
+# .a libraries are not performance critical and so we
+# build them without direct TLS segment references
+# always.
+CPPFLAGS-.o += -DNO_TLS_DIRECT_SEG_REFS
+CFLAGS-.o += -mno-tls-direct-seg-refs
+CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
+CFLAGS-.oS += -mno-tls-direct-seg-refs
endif
2008-08-29 07:56:43 +00:00
ifeq ($(subdir),elf)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/i386/__longjmp.S
+++ glibc-2.14-3/sysdeps/i386/__longjmp.S
2011-04-07 11:22:58 +00:00
@@ -1,5 +1,5 @@
/* longjmp for i386.
- Copyright (C) 1995-1998,2000,2002,2005,2006,2009
+ Copyright (C) 1995-1998,2000,2002,2005,2006,2009,2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -21,6 +21,7 @@
#include <sysdep.h>
#include <jmpbuf-offsets.h>
#include <asm-syntax.h>
+#include <stap-probe.h>
.text
ENTRY (__longjmp)
@@ -33,6 +34,7 @@ ENTRY (__longjmp)
movl (JB_SP*4)(%eax), %ecx
PTR_DEMANGLE (%edx)
PTR_DEMANGLE (%ecx)
+ LIBC_PROBE (longjmp, 3, 4@%eax, -4@8(%esp), 4@%edx)
cfi_def_cfa(%eax, 0)
cfi_register(%eip, %edx)
cfi_register(%esp, %ecx)
@@ -50,6 +52,7 @@ ENTRY (__longjmp)
cfi_restore(%edi)
cfi_restore(%ebp)
+ LIBC_PROBE (longjmp_target, 3, 4@%eax, -4@8(%esp), 4@%edx)
movl 8(%esp), %eax /* Second argument is return value. */
movl %ecx, %esp
#else
@@ -57,12 +60,14 @@ ENTRY (__longjmp)
movl 8(%esp), %eax /* Second argument is return value. */
/* Save the return address now. */
movl (JB_PC*4)(%ecx), %edx
+ LIBC_PROBE (longjmp, 3, 4@%ecx, -4@%eax, 4@%edx)
/* Restore registers. */
movl (JB_BX*4)(%ecx), %ebx
movl (JB_SI*4)(%ecx), %esi
movl (JB_DI*4)(%ecx), %edi
movl (JB_BP*4)(%ecx), %ebp
movl (JB_SP*4)(%ecx), %esp
+ LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%ecx, 4@%edx)
#endif
/* Jump to saved PC. */
jmp *%edx
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/i386/bsd-_setjmp.S
+++ glibc-2.14-3/sysdeps/i386/bsd-_setjmp.S
2011-04-07 11:22:58 +00:00
@@ -1,5 +1,6 @@
/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version.
- Copyright (C) 1994-1997,2000-2002,2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1994-1997,2000-2002,2005,2006,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
@@ -25,6 +26,7 @@
#include <jmpbuf-offsets.h>
#include "bp-sym.h"
#include "bp-asm.h"
+#include <stap-probe.h>
#define PARMS LINKAGE /* no space for saved regs */
#define JMPBUF PARMS
@@ -47,6 +49,7 @@ ENTRY (BP_SYM (_setjmp))
#endif
movl %ecx, (JB_SP*4)(%edx)
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
+ LIBC_PROBE (setjmp, 3, 4@%edx, -4@$0, 4@%ecx)
#ifdef PTR_MANGLE
PTR_MANGLE (%ecx)
#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/i386/bsd-setjmp.S
+++ glibc-2.14-3/sysdeps/i386/bsd-setjmp.S
2011-04-07 11:22:58 +00:00
@@ -1,5 +1,6 @@
/* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version.
- Copyright (C) 1994-1997,2000,2001,2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1994-1997,2000,2001,2005,2006,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
@@ -25,6 +26,7 @@
#include <jmpbuf-offsets.h>
#include "bp-sym.h"
#include "bp-asm.h"
+#include <stap-probe.h>
#define PARMS LINKAGE /* no space for saved regs */
#define JMPBUF PARMS
@@ -49,6 +51,7 @@ ENTRY (BP_SYM (setjmp))
#endif
movl %ecx, (JB_SP*4)(%eax)
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
+ LIBC_PROBE (setjmp, 3, 4@%eax, -4@$1, 4@%ecx)
#ifdef PTR_MANGLE
PTR_MANGLE (%ecx)
#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/i386/i686/Makefile
+++ glibc-2.14-3/sysdeps/i386/i686/Makefile
2011-02-15 13:29:18 +00:00
@@ -9,19 +9,3 @@ stack-align-test-flags += -msse
ifeq ($(subdir),string)
sysdep_routines += cacheinfo
endif
-
-ifeq (yes,$(config-asflags-i686))
-CFLAGS-.o += -Wa,-mtune=i686
-CFLAGS-.os += -Wa,-mtune=i686
-CFLAGS-.op += -Wa,-mtune=i686
-CFLAGS-.og += -Wa,-mtune=i686
-CFLAGS-.ob += -Wa,-mtune=i686
-CFLAGS-.oS += -Wa,-mtune=i686
-
-ASFLAGS-.o += -Wa,-mtune=i686
-ASFLAGS-.os += -Wa,-mtune=i686
-ASFLAGS-.op += -Wa,-mtune=i686
-ASFLAGS-.og += -Wa,-mtune=i686
-ASFLAGS-.ob += -Wa,-mtune=i686
-ASFLAGS-.oS += -Wa,-mtune=i686
-endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/i386/i686/multiarch/strspn.S
+++ glibc-2.14-3/sysdeps/i386/i686/multiarch/strspn.S
2010-09-27 14:48:52 +00:00
@@ -76,8 +76,8 @@ END(strspn)
# define ENTRY(name) \
.type __strspn_ia32, @function; \
.globl __strspn_ia32; \
- .p2align 4
- __strspn_ia32: cfi_startproc; \
+ .p2align 4; \
+__strspn_ia32: cfi_startproc; \
CALL_MCOUNT
# undef END
# define END(name) \
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/i386/setjmp.S
+++ glibc-2.14-3/sysdeps/i386/setjmp.S
2011-04-07 11:22:58 +00:00
@@ -1,5 +1,5 @@
/* setjmp for i386.
- Copyright (C) 1995,1996,1997,2000,2001,2005,2006
+ Copyright (C) 1995,1996,1997,2000,2001,2005,2006,2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -23,6 +23,7 @@
#include <asm-syntax.h>
#include "bp-sym.h"
#include "bp-asm.h"
+#include <stap-probe.h>
#define PARMS LINKAGE /* no space for saved regs */
#define JMPBUF PARMS
@@ -44,6 +45,7 @@ ENTRY (BP_SYM (__sigsetjmp))
#endif
movl %ecx, (JB_SP*4)(%eax)
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
+ LIBC_PROBE (setjmp, 3, 4@%eax, -4@SIGMSK(%esp), 4@%ecx)
#ifdef PTR_MANGLE
PTR_MANGLE (%ecx)
#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/ia64/Makefile
+++ glibc-2.14-3/sysdeps/ia64/Makefile
2010-05-19 12:00:46 +00:00
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
2010-01-20 16:50:57 +00:00
2010-05-19 12:00:46 +00:00
ifeq (yes,$(build-shared))
# Compatibility
-sysdep_routines += ia64libgcc
-shared-only-routines += ia64libgcc
+sysdep_routines += libgcc-compat
+shared-only-routines += libgcc-compat
endif
endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.14-3/sysdeps/ia64/ia64libgcc.S
2010-05-19 12:00:46 +00:00
@@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency
- alternative. */
-
-#include <sysdep.h>
2010-05-19 12:00:46 +00:00
-#undef ret
-
2010-05-19 12:00:46 +00:00
-#include <shlib-compat.h>
-
2010-05-19 12:00:46 +00:00
-#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_2_6)
-
2010-05-19 12:00:46 +00:00
-/* __divtf3
- Compute a 80-bit IEEE double-extended quotient.
- farg0 holds the dividend. farg1 holds the divisor. */
-
2010-05-19 12:00:46 +00:00
-ENTRY(___divtf3)
- cmp.eq p7, p0 = r0, r0
- frcpa.s0 f10, p6 = farg0, farg1
- ;;
-(p6) cmp.ne p7, p0 = r0, r0
- .pred.rel.mutex p6, p7
-(p6) fnma.s1 f11 = farg1, f10, f1
-(p6) fma.s1 f12 = farg0, f10, f0
- ;;
-(p6) fma.s1 f13 = f11, f11, f0
-(p6) fma.s1 f14 = f11, f11, f11
- ;;
-(p6) fma.s1 f11 = f13, f13, f11
-(p6) fma.s1 f13 = f14, f10, f10
- ;;
-(p6) fma.s1 f10 = f13, f11, f10
-(p6) fnma.s1 f11 = farg1, f12, farg0
- ;;
-(p6) fma.s1 f11 = f11, f10, f12
-(p6) fnma.s1 f12 = farg1, f10, f1
- ;;
-(p6) fma.s1 f10 = f12, f10, f10
-(p6) fnma.s1 f12 = farg1, f11, farg0
- ;;
-(p6) fma.s0 fret0 = f12, f10, f11
-(p7) mov fret0 = f10
- br.ret.sptk rp
-END(___divtf3)
- .symver ___divtf3, __divtf3@GLIBC_2.2
-
2010-05-19 12:00:46 +00:00
-/* __divdf3
- Compute a 64-bit IEEE double quotient.
- farg0 holds the dividend. farg1 holds the divisor. */
-
2010-05-19 12:00:46 +00:00
-ENTRY(___divdf3)
- cmp.eq p7, p0 = r0, r0
- frcpa.s0 f10, p6 = farg0, farg1
- ;;
-(p6) cmp.ne p7, p0 = r0, r0
- .pred.rel.mutex p6, p7
-(p6) fmpy.s1 f11 = farg0, f10
-(p6) fnma.s1 f12 = farg1, f10, f1
- ;;
-(p6) fma.s1 f11 = f12, f11, f11
-(p6) fmpy.s1 f13 = f12, f12
- ;;
-(p6) fma.s1 f10 = f12, f10, f10
-(p6) fma.s1 f11 = f13, f11, f11
- ;;
-(p6) fmpy.s1 f12 = f13, f13
-(p6) fma.s1 f10 = f13, f10, f10
- ;;
-(p6) fma.d.s1 f11 = f12, f11, f11
-(p6) fma.s1 f10 = f12, f10, f10
- ;;
-(p6) fnma.d.s1 f8 = farg1, f11, farg0
- ;;
-(p6) fma.d fret0 = f8, f10, f11
-(p7) mov fret0 = f10
- br.ret.sptk rp
- ;;
-END(___divdf3)
- .symver ___divdf3, __divdf3@GLIBC_2.2
-
2010-05-19 12:00:46 +00:00
-/* __divsf3
- Compute a 32-bit IEEE float quotient.
- farg0 holds the dividend. farg1 holds the divisor. */
2010-01-20 16:50:57 +00:00
-
-ENTRY(___divsf3)
- cmp.eq p7, p0 = r0, r0
- frcpa.s0 f10, p6 = farg0, farg1
- ;;
-(p6) cmp.ne p7, p0 = r0, r0
- .pred.rel.mutex p6, p7
-(p6) fmpy.s1 f8 = farg0, f10
-(p6) fnma.s1 f9 = farg1, f10, f1
- ;;
-(p6) fma.s1 f8 = f9, f8, f8
-(p6) fmpy.s1 f9 = f9, f9
- ;;
-(p6) fma.s1 f8 = f9, f8, f8
-(p6) fmpy.s1 f9 = f9, f9
- ;;
-(p6) fma.d.s1 f10 = f9, f8, f8
- ;;
-(p6) fnorm.s.s0 fret0 = f10
-(p7) mov fret0 = f10
- br.ret.sptk rp
- ;;
-END(___divsf3)
- .symver ___divsf3, __divsf3@GLIBC_2.2
-
-/* __divdi3
- Compute a 64-bit integer quotient.
- in0 holds the dividend. in1 holds the divisor. */
-
-ENTRY(___divdi3)
- .regstk 2,0,0,0
- /* Transfer inputs to FP registers. */
- setf.sig f8 = in0
- setf.sig f9 = in1
- ;;
- /* Convert the inputs to FP, so that they won't be treated as
- unsigned. */
- fcvt.xf f8 = f8
- fcvt.xf f9 = f9
- ;;
- /* Compute the reciprocal approximation. */
- frcpa.s1 f10, p6 = f8, f9
- ;;
- /* 3 Newton-Raphson iterations. */
-(p6) fnma.s1 f11 = f9, f10, f1
-(p6) fmpy.s1 f12 = f8, f10
- ;;
-(p6) fmpy.s1 f13 = f11, f11
-(p6) fma.s1 f12 = f11, f12, f12
- ;;
-(p6) fma.s1 f10 = f11, f10, f10
-(p6) fma.s1 f11 = f13, f12, f12
- ;;
-(p6) fma.s1 f10 = f13, f10, f10
-(p6) fnma.s1 f12 = f9, f11, f8
- ;;
-(p6) fma.s1 f10 = f12, f10, f11
- ;;
- /* Round quotient to an integer. */
- fcvt.fx.trunc.s1 f10 = f10
- ;;
- /* Transfer result to GP registers. */
- getf.sig ret0 = f10
- br.ret.sptk rp
- ;;
-END(___divdi3)
- .symver ___divdi3, __divdi3@GLIBC_2.2
-
-/* __moddi3
- Compute a 64-bit integer modulus.
- in0 holds the dividend (a). in1 holds the divisor (b). */
-
-ENTRY(___moddi3)
- .regstk 2,0,0,0
- /* Transfer inputs to FP registers. */
- setf.sig f14 = in0
- setf.sig f9 = in1
- ;;
- /* Convert the inputs to FP, so that they won't be treated as
- unsigned. */
- fcvt.xf f8 = f14
- fcvt.xf f9 = f9
- ;;
- /* Compute the reciprocal approximation. */
- frcpa.s1 f10, p6 = f8, f9
- ;;
- /* 3 Newton-Raphson iterations. */
-(p6) fmpy.s1 f12 = f8, f10
-(p6) fnma.s1 f11 = f9, f10, f1
- ;;
-(p6) fma.s1 f12 = f11, f12, f12
-(p6) fmpy.s1 f13 = f11, f11
- ;;
-(p6) fma.s1 f10 = f11, f10, f10
-(p6) fma.s1 f11 = f13, f12, f12
- ;;
- sub in1 = r0, in1
-(p6) fma.s1 f10 = f13, f10, f10
-(p6) fnma.s1 f12 = f9, f11, f8
- ;;
- setf.sig f9 = in1
-(p6) fma.s1 f10 = f12, f10, f11
- ;;
- fcvt.fx.trunc.s1 f10 = f10
- ;;
- /* r = q * (-b) + a */
- xma.l f10 = f10, f9, f14
- ;;
- /* Transfer result to GP registers. */
- getf.sig ret0 = f10
- br.ret.sptk rp
- ;;
-END(___moddi3)
- .symver ___moddi3, __moddi3@GLIBC_2.2
-
-/* __udivdi3
- Compute a 64-bit unsigned integer quotient.
- in0 holds the dividend. in1 holds the divisor. */
-
-ENTRY(___udivdi3)
- .regstk 2,0,0,0
- /* Transfer inputs to FP registers. */
- setf.sig f8 = in0
- setf.sig f9 = in1
- ;;
- /* Convert the inputs to FP, to avoid FP software-assist faults. */
- fcvt.xuf.s1 f8 = f8
- fcvt.xuf.s1 f9 = f9
- ;;
- /* Compute the reciprocal approximation. */
- frcpa.s1 f10, p6 = f8, f9
- ;;
- /* 3 Newton-Raphson iterations. */
-(p6) fnma.s1 f11 = f9, f10, f1
-(p6) fmpy.s1 f12 = f8, f10
- ;;
-(p6) fmpy.s1 f13 = f11, f11
-(p6) fma.s1 f12 = f11, f12, f12
- ;;
-(p6) fma.s1 f10 = f11, f10, f10
-(p6) fma.s1 f11 = f13, f12, f12
- ;;
-(p6) fma.s1 f10 = f13, f10, f10
-(p6) fnma.s1 f12 = f9, f11, f8
- ;;
-(p6) fma.s1 f10 = f12, f10, f11
- ;;
- /* Round quotient to an unsigned integer. */
- fcvt.fxu.trunc.s1 f10 = f10
- ;;
- /* Transfer result to GP registers. */
- getf.sig ret0 = f10
- br.ret.sptk rp
- ;;
-END(___udivdi3)
- .symver ___udivdi3, __udivdi3@GLIBC_2.2
-
-/* __umoddi3
- Compute a 64-bit unsigned integer modulus.
- in0 holds the dividend (a). in1 holds the divisor (b). */
-
-ENTRY(___umoddi3)
- .regstk 2,0,0,0
- /* Transfer inputs to FP registers. */
- setf.sig f14 = in0
- setf.sig f9 = in1
- ;;
- /* Convert the inputs to FP, to avoid FP software assist faults. */
- fcvt.xuf.s1 f8 = f14
- fcvt.xuf.s1 f9 = f9
- ;;
- /* Compute the reciprocal approximation. */
- frcpa.s1 f10, p6 = f8, f9
- ;;
- /* 3 Newton-Raphson iterations. */
-(p6) fmpy.s1 f12 = f8, f10
-(p6) fnma.s1 f11 = f9, f10, f1
- ;;
-(p6) fma.s1 f12 = f11, f12, f12
-(p6) fmpy.s1 f13 = f11, f11
- ;;
-(p6) fma.s1 f10 = f11, f10, f10
-(p6) fma.s1 f11 = f13, f12, f12
- ;;
- sub in1 = r0, in1
-(p6) fma.s1 f10 = f13, f10, f10
-(p6) fnma.s1 f12 = f9, f11, f8
- ;;
- setf.sig f9 = in1
-(p6) fma.s1 f10 = f12, f10, f11
- ;;
- /* Round quotient to an unsigned integer. */
- fcvt.fxu.trunc.s1 f10 = f10
- ;;
- /* r = q * (-b) + a */
- xma.l f10 = f10, f9, f14
- ;;
- /* Transfer result to GP registers. */
- getf.sig ret0 = f10
- br.ret.sptk rp
- ;;
-END(___umoddi3)
- .symver ___umoddi3, __umoddi3@GLIBC_2.2
-
-/* __multi3
- Compute a 128-bit multiply of 128-bit multiplicands.
- in0/in1 holds one multiplicand (a), in2/in3 holds the other one (b). */
-
-ENTRY(___multi3)
- .regstk 4,0,0,0
- setf.sig f6 = in1
- movl r19 = 0xffffffff
- setf.sig f7 = in2
- ;;
- and r14 = r19, in0
- ;;
- setf.sig f10 = r14
- and r14 = r19, in2
- xmpy.l f9 = f6, f7
- ;;
- setf.sig f6 = r14
- shr.u r14 = in0, 32
- ;;
- setf.sig f7 = r14
- shr.u r14 = in2, 32
- ;;
- setf.sig f8 = r14
- xmpy.l f11 = f10, f6
- xmpy.l f6 = f7, f6
- ;;
- getf.sig r16 = f11
- xmpy.l f7 = f7, f8
- ;;
- shr.u r14 = r16, 32
- and r16 = r19, r16
- getf.sig r17 = f6
- setf.sig f6 = in0
- ;;
- setf.sig f11 = r14
- getf.sig r21 = f7
- setf.sig f7 = in3
- ;;
- xma.l f11 = f10, f8, f11
- xma.l f6 = f6, f7, f9
- ;;
- getf.sig r18 = f11
- ;;
- add r18 = r18, r17
- ;;
- and r15 = r19, r18
- cmp.ltu p7, p6 = r18, r17
- ;;
- getf.sig r22 = f6
-(p7) adds r14 = 1, r19
- ;;
-(p7) add r21 = r21, r14
- shr.u r14 = r18, 32
- shl r15 = r15, 32
- ;;
- add r20 = r21, r14
- ;;
- add ret0 = r15, r16
- add ret1 = r22, r20
- br.ret.sptk rp
- ;;
-END(___multi3)
- .symver ___multi3, __multi3@GLIBC_2.2
-
-#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.14-3/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 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
+ 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+
+#include <stdint.h>
+#include <shlib-compat.h>
+
+#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_2_6)
+
+typedef int int128_t __attribute__((__mode__(TI)));
+
+extern long double __divtf3 (long double, long double) attribute_hidden;
+long double INTUSE (__divtf3) (long double x, long double y)
+{
+ return __divtf3 (x, y);
+}
+symbol_version (INTUSE (__divtf3), __divtf3, GLIBC_2.2);
+
+extern double __divdf3 (double, double) attribute_hidden;
+double INTUSE (__divdf3) (double x, double y)
+{
+ return __divdf3 (x, y);
+}
+symbol_version (INTUSE (__divdf3), __divdf3, GLIBC_2.2);
+
+extern float __divsf3 (float, float) attribute_hidden;
+float INTUSE (__divsf3) (float x, float y)
+{
+ return __divsf3 (x, y);
+}
+symbol_version (INTUSE (__divsf3), __divsf3, GLIBC_2.2);
+
+extern int64_t __divdi3 (int64_t, int64_t) attribute_hidden;
+int64_t INTUSE (__divdi3) (int64_t x, int64_t y)
+{
+ return __divdi3 (x, y);
+}
+symbol_version (INTUSE (__divdi3), __divdi3, GLIBC_2.2);
+
+extern int64_t __moddi3 (int64_t, int64_t) attribute_hidden;
+int64_t INTUSE (__moddi3) (int64_t x, int64_t y)
+{
+ return __moddi3 (x, y);
+}
+symbol_version (INTUSE (__moddi3), __moddi3, GLIBC_2.2);
+
+extern uint64_t __udivdi3 (uint64_t, uint64_t) attribute_hidden;
+uint64_t INTUSE (__udivdi3) (uint64_t x, uint64_t y)
+{
+ return __udivdi3 (x, y);
+}
+symbol_version (INTUSE (__udivdi3), __udivdi3, GLIBC_2.2);
+
+extern uint64_t __umoddi3 (uint64_t, uint64_t) attribute_hidden;
+uint64_t INTUSE (__umoddi3) (uint64_t x, uint64_t y)
+{
+ return __umoddi3 (x, y);
+}
+symbol_version (INTUSE (__umoddi3), __umoddi3, GLIBC_2.2);
+
+extern int128_t __multi3 (int128_t, int128_t) attribute_hidden;
+int128_t INTUSE (__multi3) (int128_t x, int128_t y)
+{
+ return __multi3 (x, y);
+}
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+
+#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/mach/hurd/getrlimit.c
+++ glibc-2.14-3/sysdeps/mach/hurd/getrlimit.c
2010-07-02 12:42:07 +00:00
@@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
return 0;
}
+libc_hidden_def (__getrlimit)
weak_alias (__getrlimit, getrlimit)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/posix/getaddrinfo.c
+++ glibc-2.14-3/sysdeps/posix/getaddrinfo.c
2011-06-21 15:12:12 +00:00
@@ -881,16 +881,48 @@ gaih_inet (const char *name, const struct gaih_service *service,
}
}
- no_inet6_data = no_data;
-
if (status == NSS_STATUS_SUCCESS)
{
if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL)
2011-06-21 12:59:31 +00:00
canon = (*pat)->name;
while (*pat != NULL)
- pat = &((*pat)->next);
+ {
+ if ((*pat)->family == AF_INET
+ && req->ai_family == AF_INET6
+ && (req->ai_flags & AI_V4MAPPED) != 0)
+ {
+ uint32_t *pataddr = (*pat)->addr;
+ (*pat)->family = AF_INET6;
+ pataddr[3] = pataddr[0];
+ pataddr[2] = htonl (0xffff);
+ pataddr[1] = 0;
+ pataddr[0] = 0;
+ pat = &(*pat)->next;
+ }
+ else if ((req->ai_family == AF_UNSPEC
+ || (*pat)->family == req->ai_family))
+ {
+ if ((*pat)->family == AF_INET6)
+ got_ipv6 = true;
+ pat = &(*pat)->next;
+ }
2011-06-21 15:12:12 +00:00
+ else if (*pat == at)
+ {
+ if ((*pat)->next != NULL)
+ memcpy (*pat, (*pat)->next, sizeof (**pat));
+ else
+ {
+ no_data = 1;
+ break;
+ }
+ }
2011-06-21 12:59:31 +00:00
+ else
+ *pat = (*pat)->next;
+ }
}
2011-06-21 15:12:12 +00:00
+
+ no_inet6_data = no_data;
2011-06-21 12:59:31 +00:00
}
else
2011-06-21 15:12:12 +00:00
{
@@ -1335,10 +1367,12 @@ static const struct scopeentry
2010-05-19 12:00:46 +00:00
/* Link-local addresses: scope 2. */
{ { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
{ { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 },
+#if 0
/* Site-local addresses: scope 5. */
{ { { 10, 0, 0, 0 } }, htonl_c (0xff000000), 5 },
{ { { 172, 16, 0, 0 } }, htonl_c (0xfff00000), 5 },
{ { { 192, 168, 0, 0 } }, htonl_c (0xffff0000), 5 },
+#endif
/* Default: scope 14. */
{ { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
};
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.14-3/sysdeps/powerpc/powerpc64/Makefile
2011-05-27 14:19:02 +00:00
@@ -33,6 +33,7 @@ ifneq ($(elf),no)
# we use -fpic instead which is much better.
CFLAGS-initfini.s += -fpic -O1
endif
+CFLAGS-libc-start.c += -fno-asynchronous-unwind-tables
endif
ifeq ($(subdir),elf)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/powerpc/powerpc64/elf/Makefile
+++ glibc-2.14-3/sysdeps/powerpc/powerpc64/elf/Makefile
2010-05-31 15:10:22 +00:00
@@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs)
CFLAGS-rtld-memmove.os = $(no-special-regs)
CFLAGS-rtld-memchr.os = $(no-special-regs)
CFLAGS-rtld-strnlen.os = $(no-special-regs)
+
+CFLAGS-gmon-start.c = -fno-strict-aliasing
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/s390/s390-64/utf16-utf32-z9.c
+++ glibc-2.14-3/sysdeps/s390/s390-64/utf16-utf32-z9.c
@@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data)
register unsigned long long outlen asm("11") = outend - outptr; \
uint64_t cc = 0; \
\
- asm volatile (".machine push \n\t" \
- ".machine \"z9-109\" \n\t" \
- "0: " INSTRUCTION " \n\t" \
- ".machine pop \n\t" \
+ asm volatile ("0: " INSTRUCTION " \n\t" \
" jo 0b \n\t" \
" ipm %2 \n" \
: "+a" (pOutput), "+a" (pInput), "+d" (cc), \
--- glibc-2.14-12-g5babac1/sysdeps/s390/s390-64/utf8-utf16-z9.c
+++ glibc-2.14-3/sysdeps/s390/s390-64/utf8-utf16-z9.c
@@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data)
register unsigned long long outlen asm("11") = outend - outptr; \
uint64_t cc = 0; \
\
- asm volatile (".machine push \n\t" \
- ".machine \"z9-109\" \n\t" \
- "0: " INSTRUCTION " \n\t" \
- ".machine pop \n\t" \
+ asm volatile ("0: " INSTRUCTION " \n\t" \
" jo 0b \n\t" \
" ipm %2 \n" \
: "+a" (pOutput), "+a" (pInput), "+d" (cc), \
--- glibc-2.14-12-g5babac1/sysdeps/s390/s390-64/utf8-utf32-z9.c
+++ glibc-2.14-3/sysdeps/s390/s390-64/utf8-utf32-z9.c
@@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data)
register unsigned long long outlen asm("11") = outend - outptr; \
uint64_t cc = 0; \
\
- asm volatile (".machine push \n\t" \
- ".machine \"z9-109\" \n\t" \
- "0: " INSTRUCTION " \n\t" \
- ".machine pop \n\t" \
+ asm volatile ("0: " INSTRUCTION " \n\t" \
" jo 0b \n\t" \
" ipm %2 \n" \
: "+a" (pOutput), "+a" (pInput), "+d" (cc), \
--- glibc-2.14-12-g5babac1/sysdeps/unix/nice.c
+++ glibc-2.14-3/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save);
}
- result = setpriority (PRIO_PROCESS, 0, prio + incr);
+ prio += incr;
+ if (prio < PRIO_MIN)
+ prio = PRIO_MIN;
+ else if (prio >= PRIO_MAX)
+ prio = PRIO_MAX - 1;
+ result = setpriority (PRIO_PROCESS, 0, prio);
if (result == -1)
{
if (errno == EACCES)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@
#include <unistd.h>
#include <sys/socket.h>
-#include <asm/types.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-
#include <not-cancel.h>
#include <kernel-features.h>
+#include "netlinkaccess.h"
2007-12-12 20:47:44 +00:00
#ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
{
int result;
+ if (file == NULL)
+ return __futimes (fd, tvp);
+
#ifdef __NR_futimesat
# ifndef __ASSUME_ATFCTS
if (__have_atfcts >= 0)
# endif
{
- if (file == NULL)
- return __futimes (fd, tvp);
-
result = INLINE_SYSCALL (futimesat, 3, fd, file, tvp);
# ifndef __ASSUME_ATFCTS
if (result == -1 && errno == ENOSYS)
@@ -58,22 +58,7 @@ futimesat (fd, file, tvp)
#ifndef __ASSUME_ATFCTS
char *buf = NULL;
- if (file == NULL)
- {
- static const char procfd[] = "/proc/self/fd/%d";
- /* Buffer for the path name we are going to use. It consists of
- - the string /proc/self/fd/
- - the file descriptor number.
- The final NUL is included in the sizeof. A bit of overhead
- due to the format elements compensates for possible negative
- numbers. */
- size_t buflen = sizeof (procfd) + sizeof (int) * 3;
- buf = alloca (buflen);
-
- __snprintf (buf, buflen, procfd, fd);
- file = buf;
- }
- else if (fd != AT_FDCWD && file[0] != '/')
+ if (fd != AT_FDCWD && file[0] != '/')
{
size_t filelen = strlen (file);
2009-11-12 17:51:25 +00:00
if (__builtin_expect (filelen == 0, 0))
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/getpagesize.c
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/getpagesize.c
2010-06-15 08:43:24 +00:00
@@ -28,7 +28,7 @@
int
__getpagesize ()
{
-#ifdef __ASSUME_AT_PAGESIZE
+#if 0 && defined __ASSUME_AT_PAGESIZE
assert (GLRO(dl_pagesize) != 0);
return GLRO(dl_pagesize);
#else
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
2011-04-07 11:22:58 +00:00
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2004,2005,2006,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
@@ -19,6 +20,7 @@
#include <sysdep.h>
#include <jmpbuf-offsets.h>
#include <asm-syntax.h>
+#include <stap-probe.h>
.section .rodata.str1.1,"aMS",@progbits,1
@@ -79,7 +81,9 @@ ENTRY (____longjmp_chk)
cfi_adjust_cfa_offset(-12)
movl 4(%esp), %ecx
-.Lok: /* We add unwind information for the target here. */
+.Lok:
+ LIBC_PROBE (longjmp, 3, 4@%ecx, -4@8(%esp), 4@%edx)
+ /* We add unwind information for the target here. */
cfi_def_cfa(%ecx, 0)
cfi_register(%eip, %edx)
cfi_register(%esp, %edi)
@@ -102,5 +106,6 @@ ENTRY (____longjmp_chk)
cfi_restore(%ebp)
/* Jump to saved PC. */
+ LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx)
jmp *%edx
END (____longjmp_chk)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/i386/dl-cache.h
@@ -0,0 +1,59 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+ Copyright (C) 2004 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
+ 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+static inline int
+is_ia64 (void)
+{
+ unsigned int fl1, fl2;
+
+ /* See if we can use cpuid. */
+ __asm__ ("pushfl; pushfl; popl %0; movl %0,%1; xorl %2,%0;"
+ "pushl %0; popfl; pushfl; popl %0; popfl"
+ : "=&r" (fl1), "=&r" (fl2)
+ : "i" (0x00200000));
+ if (((fl1 ^ fl2) & 0x00200000) == 0)
+ return 0;
+
+ /* Host supports cpuid. See if cpuid gives capabilities, try
+ CPUID(0). Preserve %ebx and %ecx; cpuid insn clobbers these, we
+ don't need their CPUID values here, and %ebx may be the PIC
+ register. */
+ __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
+ : "=a" (fl1) : "0" (0) : "edx", "cc");
+ if (fl1 == 0)
+ return 0;
+
+ /* Invoke CPUID(1), return %edx; caller can examine bits to
+ determine what's supported. */
+ __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
+ : "=d" (fl2), "=a" (fl1) : "1" (1) : "cc");
+ return (fl2 & (1 << 30)) != 0;
+}
+
+#define arch_startup(argc, argv) \
+ do { \
+ /* On IA-64, try to execute 64-bit ldconfig if possible. \
+ This is because the badly designed /emul/ia32-linux hack \
+ will cause 32-bit ldconfig to do all sorts of weird things. */ \
+ if (is_ia64 ()) \
+ execv ("/emul/ia32-linux/../../sbin/ldconfig", \
+ (char *const *) argv); \
+ } while (0)
+
+#include_next <dl-cache.h>
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/i386/getrlimit.c
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/i386/getrlimit.c
2010-07-02 12:42:07 +00:00
@@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
}
weak_alias (__new_getrlimit, __getrlimit);
+libc_hidden_weak (__getrlimit)
versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID)
+#define EMUL_HACK "/emul/ia32-linux"
+
+#define arch_startup(argc, argv) unlink (EMUL_HACK LD_SO_CACHE)
+
+#define add_arch_dirs(config_file) \
+ do { \
+ int save_verbose = opt_verbose; \
+ opt_verbose = 0; \
+ \
+ parse_conf (config_file, EMUL_HACK, true); \
+ \
+ /* Always add the standard search paths. */ \
+ add_system_dir (EMUL_HACK SLIBDIR); \
+ if (strcmp (SLIBDIR, LIBDIR)) \
+ add_system_dir (EMUL_HACK LIBDIR); \
+ \
+ char emul_config_file[strlen (config_file) \
+ + sizeof EMUL_HACK]; \
+ strcpy (mempcpy (emul_config_file, EMUL_HACK, \
+ strlen (EMUL_HACK)), config_file); \
+ \
+ if (! access (emul_config_file, R_OK)) \
+ parse_conf (emul_config_file, EMUL_HACK, true); \
+ \
+ opt_verbose = save_verbose; \
+ } while (0)
+
#include_next <dl-cache.h>
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/i386/dl-procinfo.c>
+#else
+#include <sysdeps/generic/dl-procinfo.c>
+#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
+#else
+#include <sysdeps/generic/dl-procinfo.h>
+#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
@@ -1 +1 @@
-s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_
+s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/netlinkaccess.h
2009-06-26 15:46:27 +00:00
@@ -25,6 +25,24 @@
#include <kernel-features.h>
+#ifndef IFA_MAX
+/* 2.6.19 kernel headers helpfully removed some macros and
+ moved lots of stuff into new headers, some of which aren't
+ included by linux/rtnetlink.h. */
+#include <linux/if_addr.h>
+#endif
+
+#ifndef IFA_RTA
+# define IFA_RTA(r) \
+ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifaddrmsg))))
+# define IFA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifaddrmsg))
+#endif
+
+#ifndef IFLA_RTA
+# define IFLA_RTA(r) \
+ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifinfomsg))))
+# define IFLA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifinfomsg))
+#endif
struct netlink_res
{
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/paths.h
2009-06-26 15:46:27 +00:00
@@ -62,7 +62,7 @@
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux"
#define _PATH_UTMP "/var/run/utmp"
-#define _PATH_VI "/usr/bin/vi"
+#define _PATH_VI "/bin/vi"
#define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/tcsetattr.c
2009-09-01 11:03:11 +00:00
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
2009-06-26 15:46:27 +00:00
{
struct __kernel_termios k_termios;
unsigned long int cmd;
+ int retval;
switch (optional_actions)
{
2009-09-01 11:03:11 +00:00
@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios_p)
2009-06-26 15:46:27 +00:00
memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
__KERNEL_NCCS * sizeof (cc_t));
- return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
+ retval = INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
+
+ if (retval == 0 && cmd == TCSETS)
+ {
+ /* The Linux kernel has a bug which silently ignore the invalid
+ c_cflag on pty. We have to check it here. */
+ int save = errno;
+ retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
+ if (retval)
+ {
+ /* We cannot verify if the setting is ok. We don't return
+ an error (?). */
+ __set_errno (save);
+ retval = 0;
+ }
+ else if ((termios_p->c_cflag & (PARENB | CREAD))
+ != (k_termios.c_cflag & (PARENB | CREAD))
+ || ((termios_p->c_cflag & CSIZE)
+ && ((termios_p->c_cflag & CSIZE)
+ != (k_termios.c_cflag & CSIZE))))
+ {
+ /* It looks like the Linux kernel silently changed the
+ PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
+ error. */
+ __set_errno (EINVAL);
+ retval = -1;
+ }
+ }
+
+ return retval;
}
libc_hidden_def (tcsetattr)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+++ glibc-2.14-3/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
2011-05-04 11:11:17 +00:00
@@ -19,6 +19,7 @@
2011-04-07 11:22:58 +00:00
#include <sysdep.h>
#include <jmpbuf-offsets.h>
#include <asm-syntax.h>
+#include <stap-probe.h>
.section .rodata.str1.1,"aMS",@progbits,1
.type longjmp_msg,@object
2011-05-04 11:11:17 +00:00
@@ -94,7 +95,9 @@ ENTRY(____longjmp_chk)
2011-04-07 11:22:58 +00:00
movl %ebx, %esi
cfi_restore (%rsi)
-.Lok: /* We add unwind information for the target here. */
+.Lok:
+ LIBC_PROBE (longjmp, 3, 8@%rdi, -4@%esi, 8@%rdx)
+ /* We add unwind information for the target here. */
cfi_def_cfa(%rdi, 0)
cfi_register(%rsp,%r8)
cfi_register(%rbp,%r9)
2011-05-04 11:11:17 +00:00
@@ -113,5 +116,6 @@ ENTRY(____longjmp_chk)
2011-04-07 11:22:58 +00:00
movl %esi, %eax
movq %r8,%rsp
movq %r9,%rbp
+ LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx)
jmpq *%rdx
END (____longjmp_chk)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/x86_64/__longjmp.S
+++ glibc-2.14-3/sysdeps/x86_64/__longjmp.S
2011-04-07 11:22:58 +00:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2004,2005,2006,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
@@ -19,6 +19,7 @@
#include <sysdep.h>
#include <jmpbuf-offsets.h>
#include <asm-syntax.h>
+#include <stap-probe.h>
/* Jump to the position specified by ENV, causing the
setjmp call there to return VAL, or 1 if VAL is 0.
@@ -34,6 +35,7 @@ ENTRY(__longjmp)
PTR_DEMANGLE (%r9)
PTR_DEMANGLE (%rdx)
#endif
+ LIBC_PROBE (longjmp, 3, 8@%rdi, -4@%esi, 8@%rdx)
/* We add unwind information for the target here. */
cfi_def_cfa(%rdi, 0)
cfi_register(%rsp,%r8)
@@ -53,5 +55,6 @@ ENTRY(__longjmp)
mov %esi, %eax
movq %r8,%rsp
movq %r9,%rbp
+ LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx)
jmpq *%rdx
END (__longjmp)
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/sysdeps/x86_64/setjmp.S
+++ glibc-2.14-3/sysdeps/x86_64/setjmp.S
2011-04-07 11:22:58 +00:00
@@ -1,5 +1,5 @@
/* setjmp for x86-64.
- Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001,2003,2005,2006,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,6 +20,7 @@
#include <sysdep.h>
#include <jmpbuf-offsets.h>
#include <asm-syntax.h>
+#include <stap-probe.h>
ENTRY (__sigsetjmp)
/* Save registers. */
@@ -41,6 +42,7 @@ ENTRY (__sigsetjmp)
#endif
movq %rdx, (JB_RSP*8)(%rdi)
movq (%rsp), %rax /* Save PC we are returning to now. */
+ LIBC_PROBE (setjmp, 3, 8@%rdi, -4@%esi, 8@%rax)
#ifdef PTR_MANGLE
PTR_MANGLE (%rax)
#endif
2011-06-21 12:59:31 +00:00
--- glibc-2.14-12-g5babac1/timezone/zic.c
+++ glibc-2.14-3/timezone/zic.c
2009-06-26 15:46:27 +00:00
@@ -1921,7 +1921,7 @@ const int zonecount;
if (stdrp != NULL && stdrp->r_hiyear == 2037)
return;
}
- if (stdrp == NULL && zp->z_nrules != 0)
+ if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0))
return;
abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);