|
 |
623fb2e |
--- glibc-20060630T0858/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1
|
|
|
97f2be9 |
@@ -1352,6 +1352,11 @@
|
|
|
97f2be9 |
* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
|
|
|
97f2be9 |
end of inline assembler code.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+2000-10-02 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+ * sunrpc/svc_udp.c (svcudp_recv): Set msg_controllen to all
|
|
|
97f2be9 |
+ remaining xp_pad space.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
2000-10-02 Ulrich Drepper <drepper@redhat.com>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* include/features.h [__USE_FILE_OFFSET && !__REDIRECT]: Define
|
|
|
97f2be9 |
@@ -9280,6 +9285,12 @@
|
|
|
97f2be9 |
syscall.
|
|
|
97f2be9 |
* sysdeps/unix/sysv/linux/mips/truncate64.c: Likewise.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+2000-05-30 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+ * resolv/res_query.c (res_nsearch): Remove unused variable
|
|
|
97f2be9 |
+ root_on_list. If dots >= statp->ndots and as is querydomain
|
|
|
97f2be9 |
+ fails, keep searching.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
2000-05-30 Ulrich Drepper <drepper@redhat.com>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* sysdeps/unix/sysv/linux/alpha/oldglob.c (__old_glob): Loose __P.
|
|
|
97f2be9 |
@@ -9480,6 +9491,11 @@
|
|
|
97f2be9 |
* sysdeps/i386/fpu/bits/mathinline.h: Define expm1 inline only if
|
|
|
97f2be9 |
__FAST_MATH__ is defined.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+2000-05-22 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+ * sysdeps/i386/fpu/bits/mathinline.h (__expm1_code): Avoid using ?:
|
|
|
97f2be9 |
+ with omitted middle operand.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
2000-05-22 Andreas Jaeger <aj@suse.de>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* math/Makefile: Add -D__FAST_MATH__ to CFLAGS-test-ifloat.c,
|
|
|
97f2be9 |
@@ -9720,6 +9736,11 @@
|
|
|
97f2be9 |
|
|
|
97f2be9 |
2000-05-17 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+ * inet/rcmd.c (rcmd_af): If *ahost cannot be resolved, include
|
|
|
97f2be9 |
+ unresolved hostname in the message.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+2000-05-17 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
|
|
|
97f2be9 |
__extension__ to hexadecimal floating constant notation.
|
|
|
97f2be9 |
* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
|
|
|
623fb2e |
--- glibc-20060630T0858/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1
|
|
|
97f2be9 |
@@ -7729,6 +7729,13 @@
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* Versions.def [ld]: Add GLIBC_2.2.1.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+2001-01-10 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+ * malloc/memusage.c (me): If not SUID/SGID, allow creating new
|
|
|
97f2be9 |
+ $MEMUSAGE_OUTPUT file.
|
|
|
97f2be9 |
+ * sysdeps/generic/segfault.c (segfault.c): If not SUID/SGID, allow
|
|
|
97f2be9 |
+ creating new $SEGFAULT_OUTPUT_NAME file.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
2001-01-10 H.J. Lu <hjl@gnu.org>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* elf/dl-libc.c (do_dlopen): Call DL_STATIC_INIT for static binaries.
|
|
|
97f2be9 |
@@ -8130,6 +8137,11 @@
|
|
|
97f2be9 |
* sysdeps/powerpc/soft-fp/Versions: Likewise.
|
|
|
97f2be9 |
* sysdeps/sparc/sparc64/soft-fp/Versions: Likewise.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+2001-01-02 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+ * locale/setlocale.c (setlocale): Don't allocate/free category name
|
|
|
97f2be9 |
+ unnecessarily.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
2001-01-02 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
|
|
|
623fb2e |
--- glibc-20060630T0858/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2
|
|
|
97f2be9 |
@@ -477,6 +477,14 @@
|
|
|
97f2be9 |
|
|
|
97f2be9 |
2004-11-26 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+ * posix/Makefile (generated: Add getconf.speclist.
|
|
|
97f2be9 |
+ ($(inst_libexecdir)/getconf): Use getconf.speclist instead of
|
|
|
97f2be9 |
+ getconf output.
|
|
|
97f2be9 |
+ ($(objpfx)getconf.speclist): New rule.
|
|
|
97f2be9 |
+ * posix/getconf.speclist.h: New file.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+2004-11-26 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
* sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add GETCONF_DIR.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
2004-11-26 Kaz Kojima <kkojima@rr.iij4u.or.jp>
|
|
|
97f2be9 |
@@ -1103,6 +1111,16 @@
|
|
|
97f2be9 |
* sysdeps/generic/tempname.c (__path_search): Add missing argument
|
|
|
97f2be9 |
TRY_TMPDIR.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+2004-11-02 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+ * include/features.h (__USE_FORTIFY_LEVEL): Also set for Red Hat
|
|
|
97f2be9 |
+ GCC 3.4.x-RH >= 3.4.2-8.
|
|
|
97f2be9 |
+ * libio/bits/features.h (printf, fprintf, vprintf, vfprintf): For
|
|
|
97f2be9 |
+ GCC 3.4.x-RH use __builtin___{,v}{,f}printf_chk instead of
|
|
|
97f2be9 |
+ __{,v}{,f}printf_chk.
|
|
|
97f2be9 |
+ * debug/tst-chk1.c (do_test): Deal with GCC 3.4.x-RH not
|
|
|
97f2be9 |
+ being able to recognize subobjects.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
2004-10-31 Mariusz Mazur <mmazur@kernel.pl>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* sysdeps/unix/sysv/linux/alpha/setregid.c: New file.
|
|
|
97f2be9 |
@@ -1398,6 +1416,11 @@
|
|
|
97f2be9 |
* posix/execvp.c (execvp): Also ignore ENODEV and ETIMEDOUT errno
|
|
|
97f2be9 |
values.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+2004-10-20 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+ * sysdeps/unix/sysv/linux/readonly-area.c (__readonly_area): If /proc
|
|
|
97f2be9 |
+ is not mounted, return 1.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
2004-10-20 Roland McGrath <roland@redhat.com>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* Makeconfig ($(common-objpfx)shlib-versions.v.i): Check also
|
|
|
97f2be9 |
@@ -1443,6 +1466,11 @@
|
|
|
97f2be9 |
* sysdeps/generic/readonly-area.c (__readonly_str): Renamed to ...
|
|
|
97f2be9 |
(__readonly_area): ... this.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+2004-10-19 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+ * include/features.h (__USE_FORTIFY_LEVEL): Enable even with
|
|
|
97f2be9 |
+ Red Hat gcc4 4.0.0 and above.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
2004-10-18 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* sysdeps/generic/strcpy_chk.c (__strcpy_chk): Speed up by checking
|
|
|
97f2be9 |
@@ -3182,6 +3210,23 @@
|
|
|
97f2be9 |
before return type.
|
|
|
97f2be9 |
* locale/localename.c (__current_locale_name): Likewise.
|
|
|
97f2be9 |
|
|
|
97f2be9 |
+2004-08-31 Jakub Jelinek <jakub@redhat.com>
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
+ * elf/ldconfig.c (parse_conf): Add prefix argument, prepend it
|
|
|
97f2be9 |
+ before arguments to add_dir and pass to parse_conf_include.
|
|
|
97f2be9 |
+ (parse_conf_include): Add prefix argument, pass it down to
|
|
|
97f2be9 |
+ parse_conf.
|
|
|
97f2be9 |
+ (main): Call arch_startup. Adjust parse_conf caller.
|
|
|
97f2be9 |
+ Call add_arch_dirs.
|
|
|
97f2be9 |
+ * sysdeps/generic/dl-cache.h (arch_startup, add_arch_dirs): Define.
|
|
|
97f2be9 |
+ * sysdeps/unix/sysv/linux/i386/dl-cache.h: New file.
|
|
|
97f2be9 |
+ * sysdeps/unix/sysv/linux/ia64/dl-cache.h (EMUL_HACK, arch_startup,
|
|
|
97f2be9 |
+ add_arch_dirs): Define.
|
|
|
97f2be9 |
+ * sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed: Prepend
|
|
|
97f2be9 |
+ /emul/ia32-linux before the 32-bit ld.so pathname.
|
|
|
97f2be9 |
+ * sysdeps/unix/sysv/linux/ia64/dl-procinfo.c: New file.
|
|
|
97f2be9 |
+ * sysdeps/unix/sysv/linux/ia64/dl-procinfo.h: New file.
|
|
|
97f2be9 |
+
|
|
|
97f2be9 |
2004-08-30 Roland McGrath <roland@frob.com>
|
|
|
97f2be9 |
|
|
|
97f2be9 |
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
|
|
|
623fb2e |
--- glibc-20060630T0858/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1
|
|
|
97f2be9 |
@@ -171,6 +171,11 @@
|
|
|
408bca6 |
[BZ #2611]
|
|
|
408bca6 |
* stdio-common/renameat.c (renameat): Fix typo.
|
|
|
408bca6 |
|
|
|
408bca6 |
+2006-04-27 Jakub Jelinek <jakub@redhat.com>
|
|
|
408bca6 |
+
|
|
|
408bca6 |
+ * nscd/connections.c (sighup_handler): Only run prune_cache on
|
|
|
408bca6 |
+ enabled databases.
|
|
|
408bca6 |
+
|
|
|
408bca6 |
2006-04-26 Roland McGrath <roland@redhat.com>
|
|
|
408bca6 |
|
|
|
408bca6 |
* Makeconfig (%.v.i rule): Don't use -DASSEMBLER.
|
|
|
97f2be9 |
@@ -1030,6 +1035,34 @@
|
|
|
7020da2 |
_SC_CPUTIME and _SC_THREAD_CPUTIME here.
|
|
|
7020da2 |
* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
|
|
|
7020da2 |
|
|
|
a18e83c |
+2006-03-04 Jakub Jelinek <jakub@redhat.com>
|
|
|
a18e83c |
+ Roland McGrath <roland@redhat.com>
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+ * sysdeps/unix/sysv/linux/i386/lowlevellock.h
|
|
|
a18e83c |
+ (LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_3, LLL_STUB_UNWIND_INFO_4): Define.
|
|
|
a18e83c |
+ (lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
|
|
|
a18e83c |
+ lll_robust_mutex_cond_lock, lll_mutex_timedlock,
|
|
|
a18e83c |
+ lll_robust_mutex_timedlock, lll_mutex_unlock,
|
|
|
a18e83c |
+ lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
|
|
|
a18e83c |
+ Add _L_*_ symbols around the subsection.
|
|
|
a18e83c |
+ * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Add unwind info.
|
|
|
a18e83c |
+ * sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Likewise.
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+2006-03-03 Jakub Jelinek <jakub@redhat.com>
|
|
|
a18e83c |
+ Roland McGrath <roland@redhat.com>
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
|
|
|
a18e83c |
+ (LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_5, LLL_STUB_UNWIND_INFO_6): Define.
|
|
|
a18e83c |
+ (lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
|
|
|
a18e83c |
+ lll_robust_mutex_cond_lock, lll_mutex_timedlock,
|
|
|
a18e83c |
+ lll_robust_mutex_timedlock, lll_mutex_unlock,
|
|
|
a18e83c |
+ lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
|
|
|
a18e83c |
+ Add _L_*_ symbols around the subsection.
|
|
|
a18e83c |
+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Add unwind info.
|
|
|
a18e83c |
+ * sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S: Likewise.
|
|
|
a18e83c |
+
|
|
|
a18e83c |
2006-03-05 Roland McGrath <roland@redhat.com>
|
|
|
a18e83c |
|
|
|
a18e83c |
* malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value.
|
|
|
97f2be9 |
@@ -2042,6 +2075,11 @@
|
|
|
89cd40e |
(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
|
|
|
89cd40e |
followed by __THROW.
|
|
|
89cd40e |
|
|
|
b17a54f |
+ * sysdeps/unix/sysv/linux/futimesat.c (futimesat): If
|
|
|
b17a54f |
+ file == NULL, use __futimes unconditionally.
|
|
|
a7c52d7 |
+
|
|
|
b17a54f |
+ * manual/filesys.texi (futimes): Fix prototype.
|
|
|
a7c52d7 |
+
|
|
|
b17a54f |
2006-02-02 Ulrich Drepper <drepper@redhat.com>
|
|
|
a7c52d7 |
|
|
|
b17a54f |
* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
|
|
|
97f2be9 |
@@ -2101,6 +2139,11 @@
|
|
|
a7c52d7 |
* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
|
|
|
a7c52d7 |
* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
|
|
|
a7c52d7 |
|
|
|
914423a |
+2006-01-30 Jakub Jelinek <jakub@redhat.com>
|
|
|
914423a |
+
|
|
|
914423a |
+ * include/bits/stdlib-ldbl.h: New file.
|
|
|
914423a |
+ * include/bits/wchar-ldbl.h: New file.
|
|
|
914423a |
+
|
|
|
a7c52d7 |
2006-01-19 Thomas Schwinge <tschwinge@gnu.org>
|
|
|
914423a |
|
|
|
a7c52d7 |
* libio/genops.c: Include <stdbool.h>.
|
|
|
97f2be9 |
@@ -4527,6 +4570,10 @@
|
|
|
d73fe41 |
|
|
|
d73fe41 |
* elf/order2mod2.c (init): Cast ignored value to void.
|
|
|
d73fe41 |
|
|
|
807fd31 |
+2005-12-27 Jakub Jelinek <jakub@redhat.com>
|
|
|
807fd31 |
+
|
|
|
807fd31 |
+ * elf/ldconfig.c (search_dir): Skip prelink temporaries.
|
|
|
807fd31 |
+
|
|
|
d73fe41 |
2005-12-27 Ulrich Drepper <drepper@redhat.com>
|
|
|
807fd31 |
|
|
|
d73fe41 |
* elf/tst-tls13.c (do_test): Avoid using the library path when
|
|
|
97f2be9 |
@@ -4810,6 +4857,26 @@
|
|
|
5bba32e |
* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
|
|
|
5bba32e |
use sysdeps/unix/time.c implementation.
|
|
|
5bba32e |
|
|
|
8a25c5e |
+2005-12-20 Jakub Jelinek <jakub@redhat.com>
|
|
|
8a25c5e |
+
|
|
|
8a25c5e |
+ * malloc/mtrace.c (__libc_malloc, __libc_free, __libc_realloc,
|
|
|
8a25c5e |
+ __libc_memalign): Add prototypes and libc_hidden_proto resp.
|
|
|
8a25c5e |
+ defines for !_LIBC.
|
|
|
8a25c5e |
+ (tr_freehook): Call __libc_free instead of free.
|
|
|
8a25c5e |
+ (tr_mallochook): Call __libc_malloc instead of malloc.
|
|
|
8a25c5e |
+ (tr_reallochook): Call __libc_realloc instead of realloc.
|
|
|
8a25c5e |
+ (tr_memalignhook): Call __libc_memalign instead of memalign.
|
|
|
8a25c5e |
+ * malloc/mcheck.c: Include stdlib.h.
|
|
|
8a25c5e |
+ (__libc_malloc, __libc_free, __libc_realloc,
|
|
|
8a25c5e |
+ __libc_memalign): Add prototypes and libc_hidden_proto resp.
|
|
|
8a25c5e |
+ defines for !_LIBC.
|
|
|
8a25c5e |
+ (freehook): Call __libc_free instead of free.
|
|
|
8a25c5e |
+ (mallochook): Call __libc_malloc instead of malloc.
|
|
|
8a25c5e |
+ (reallochook): Call __libc_realloc instead of realloc.
|
|
|
8a25c5e |
+ (memalignhook): Call __libc_memalign instead of memalign.
|
|
|
8a25c5e |
+ (mcheck): Call __libc_malloc and __libc_free instead of
|
|
|
8a25c5e |
+ malloc and free.
|
|
|
8a25c5e |
+
|
|
|
8a25c5e |
2005-12-19 Ulrich Drepper <drepper@redhat.com>
|
|
|
8a25c5e |
|
|
|
8a25c5e |
[BZ #1955]
|
|
|
97f2be9 |
@@ -7928,6 +7995,11 @@
|
|
|
c8ff10b |
R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
|
|
|
c8ff10b |
R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
|
|
|
c8ff10b |
|
|
|
d81612f |
+2005-10-03 Jakub Jelinek <jakub@redhat.com>
|
|
|
63b6b66 |
+
|
|
|
d81612f |
+ * nscd/selinux.c (audit_init): Print error string in the failure
|
|
|
d81612f |
+ message.
|
|
|
63b6b66 |
+
|
|
|
d81612f |
2005-10-03 Roland McGrath <roland@redhat.com>
|
|
|
63b6b66 |
|
|
|
d81612f |
* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
|
|
|
97f2be9 |
@@ -8922,6 +8994,12 @@
|
|
|
20eeaeb |
* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
|
|
|
20eeaeb |
(__argp_failure): Likewise.
|
|
|
20eeaeb |
|
|
|
6bdbb1e |
+2005-08-08 Jakub Jelinek <jakub@redhat.com>
|
|
|
6bdbb1e |
+
|
|
|
6bdbb1e |
+ * sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard):
|
|
|
6bdbb1e |
+ Shift marked &errno down on big-endian instead of up.
|
|
|
6bdbb1e |
+ * elf/tst-stackguard1.c (do_test): Fix a typo.
|
|
|
6bdbb1e |
+
|
|
|
6bdbb1e |
2005-08-08 Ulrich Drepper <drepper@redhat.com>
|
|
|
6bdbb1e |
|
|
|
6bdbb1e |
* nscd/cache.c (cache_add): Commit hash table and header to disk.
|
|
|
97f2be9 |
@@ -9046,6 +9124,17 @@
|
|
|
6bdbb1e |
__syslog_chk.
|
|
|
6bdbb1e |
* misc/Versions: Export __syslog_chk and __vsyslog_chk.
|
|
|
6bdbb1e |
|
|
|
eed6a0f |
+2005-07-29 Jakub Jelinek <jakub@redhat.com>
|
|
|
eed6a0f |
+
|
|
|
6bdbb1e |
+ * sysdeps/unix/sysv/linux/dl-osinfo.h: Include errno.h, hp-timing.h,
|
|
|
eed6a0f |
+ endian.h.
|
|
|
eed6a0f |
+ (_dl_setup_stack_chk_guard): Even without
|
|
|
eed6a0f |
+ --enable-stackguard-randomization attempt to do some guard
|
|
|
eed6a0f |
+ randomization using hp-timing (if available) and kernel stack and
|
|
|
eed6a0f |
+ mmap randomization.
|
|
|
eed6a0f |
+ * elf/tst-stackguard1.c (do_test): Don't fail if the poor man's
|
|
|
eed6a0f |
+ randomization doesn't work well enough.
|
|
|
eed6a0f |
+
|
|
|
eed6a0f |
2005-07-28 Thomas Schwinge <schwinge@nic-nac-project.de>
|
|
|
eed6a0f |
|
|
|
6bdbb1e |
[BZ #1137]
|
|
|
97f2be9 |
@@ -12106,6 +12195,18 @@
|
|
|
271728a |
|
|
|
271728a |
* scripts/soversions.awk: Fix default version set handling.
|
|
|
271728a |
|
|
|
b691459 |
+2005-02-09 Jakub Jelinek <jakub@redhat.com>
|
|
|
b691459 |
+
|
|
|
b691459 |
+ * sysdeps/unix/sysv/linux/bits/termios.h (CMSPAR): Define.
|
|
|
b691459 |
+ * sysdeps/unix/sysv/linux/alpha/bits/termios.h: Add __USE_MISC
|
|
|
b691459 |
+ and __USE_XOPEN guards to match linux/bits/termios.h.
|
|
|
b691459 |
+ (CMSPAR): Define.
|
|
|
b691459 |
+ * sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Add __USE_MISC
|
|
|
b691459 |
+ and __USE_XOPEN guards to match linux/bits/termios.h.
|
|
|
b691459 |
+ (CMSPAR): Define.
|
|
|
b691459 |
+ * sysdeps/unix/sysv/linux/sparc/bits/termios.h: Add __USE_MISC
|
|
|
b691459 |
+ and __USE_XOPEN guards to match linux/bits/termios.h.
|
|
|
b691459 |
+
|
|
|
b691459 |
2005-02-10 Roland McGrath <roland@redhat.com>
|
|
|
b691459 |
|
|
|
b691459 |
[BZ #157]
|
|
|
623fb2e |
--- glibc-20060630T0858/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6
|
|
|
e4a1800 |
@@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
|
|
|
c7aa529 |
extern void (*__fini_array_start []) (void) attribute_hidden;
|
|
|
c7aa529 |
extern void (*__fini_array_end []) (void) attribute_hidden;
|
|
|
b656b18 |
|
|
|
e4a1800 |
+#if defined HAVE_VISIBILITY_ATTRIBUTE \
|
|
|
e4a1800 |
+ && (defined SHARED || defined LIBC_NONSHARED)
|
|
|
e4a1800 |
+# define hidden_undef_2(x) #x
|
|
|
e4a1800 |
+# define hidden_undef_1(x) hidden_undef_2 (x)
|
|
|
e4a1800 |
+# define hidden_undef(x) \
|
|
|
c7aa529 |
+ __asm (hidden_undef_1 (ASM_GLOBAL_DIRECTIVE) " " #x); \
|
|
|
c7aa529 |
+ __asm (".hidden " #x);
|
|
|
e4a1800 |
+#else
|
|
|
e4a1800 |
+# define hidden_undef(x)
|
|
|
e4a1800 |
+#endif
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+hidden_undef (__preinit_array_start)
|
|
|
c7aa529 |
+hidden_undef (__preinit_array_end)
|
|
|
c7aa529 |
+hidden_undef (__init_array_start)
|
|
|
c7aa529 |
+hidden_undef (__init_array_end)
|
|
|
c7aa529 |
+hidden_undef (__fini_array_start)
|
|
|
c7aa529 |
+hidden_undef (__fini_array_end)
|
|
|
c7aa529 |
|
|
|
c7aa529 |
/* These function symbols are provided for the .init/.fini section entry
|
|
|
b656b18 |
points automagically by the linker. */
|
|
|
623fb2e |
--- glibc-20060630T0858/debug/tst-chk1.c 24 Apr 2006 17:00:18 -0000 1.15
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/debug/tst-chk1.c 24 Apr 2006 20:31:49 -0000 1.1.2.16
|
|
|
8d6dc3b |
@@ -17,6 +17,9 @@
|
|
|
8d6dc3b |
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
8d6dc3b |
02111-1307 USA. */
|
|
|
8d6dc3b |
|
|
|
8d6dc3b |
+/* Hack: make sure GCC doesn't know __chk_fail () will not return. */
|
|
|
8d6dc3b |
+#define __noreturn__
|
|
|
8d6dc3b |
+
|
|
|
d1bc0a0 |
#include <assert.h>
|
|
|
8d6dc3b |
#include <fcntl.h>
|
|
|
48f3550 |
#include <locale.h>
|
|
|
d1bc0a0 |
@@ -232,7 +235,7 @@ do_test (void)
|
|
|
45fdec0 |
if (memcmp (a.buf1, "aabcdabcjj", 10))
|
|
|
45fdec0 |
FAIL ();
|
|
|
45fdec0 |
|
|
|
45fdec0 |
-#if __USE_FORTIFY_LEVEL < 2
|
|
|
45fdec0 |
+#if __USE_FORTIFY_LEVEL < 2 || !__GNUC_PREREQ (4, 0)
|
|
|
45fdec0 |
/* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2
|
|
|
45fdec0 |
and sufficient GCC support, as the string operations overflow
|
|
|
45fdec0 |
from a.buf1 into a.buf2. */
|
|
|
d1bc0a0 |
@@ -337,7 +340,7 @@ do_test (void)
|
|
|
45fdec0 |
memset (a.buf1 + 9, 'j', l0 + 2);
|
|
|
45fdec0 |
CHK_FAIL_END
|
|
|
45fdec0 |
|
|
|
45fdec0 |
-#if __USE_FORTIFY_LEVEL >= 2
|
|
|
45fdec0 |
+#if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)
|
|
|
45fdec0 |
# define O 0
|
|
|
45fdec0 |
#else
|
|
|
45fdec0 |
# define O 1
|
|
|
623fb2e |
--- glibc-20060630T0858/elf/ldconfig.c 7 Apr 2006 06:57:49 -0000 1.54
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/elf/ldconfig.c 24 Apr 2006 08:55:38 -0000 1.47.2.9
|
|
|
7020da2 |
@@ -964,17 +964,19 @@ search_dirs (void)
|
|
|
c7aa529 |
|
|
|
c7aa529 |
|
|
|
c7aa529 |
static void parse_conf_include (const char *config_file, unsigned int lineno,
|
|
|
c7aa529 |
- bool do_chroot, const char *pattern);
|
|
|
c7aa529 |
+ const char *prefix, bool do_chroot,
|
|
|
c7aa529 |
+ const char *pattern);
|
|
|
c7aa529 |
|
|
|
c7aa529 |
/* Parse configuration file. */
|
|
|
c7aa529 |
static void
|
|
|
c7aa529 |
-parse_conf (const char *filename, bool do_chroot)
|
|
|
c7aa529 |
+parse_conf (const char *filename, const char *prefix, bool do_chroot)
|
|
|
c7aa529 |
{
|
|
|
c7aa529 |
FILE *file = NULL;
|
|
|
c7aa529 |
char *line = NULL;
|
|
|
c7aa529 |
const char *canon;
|
|
|
c7aa529 |
size_t len = 0;
|
|
|
c7aa529 |
unsigned int lineno;
|
|
|
c7aa529 |
+ size_t prefix_len = prefix ? strlen (prefix) : 0;
|
|
|
c7aa529 |
|
|
|
c7aa529 |
if (do_chroot && opt_chroot)
|
|
|
c7aa529 |
{
|
|
|
7020da2 |
@@ -1035,7 +1037,14 @@ parse_conf (const char *filename, bool d
|
|
|
c7aa529 |
cp += 8;
|
|
|
c7aa529 |
while ((dir = strsep (&cp, " \t")) != NULL)
|
|
|
c7aa529 |
if (dir[0] != '\0')
|
|
|
c7aa529 |
- parse_conf_include (filename, lineno, do_chroot, dir);
|
|
|
c7aa529 |
+ parse_conf_include (filename, lineno, prefix, do_chroot, dir);
|
|
|
c7aa529 |
+ }
|
|
|
c7aa529 |
+ else if (prefix != NULL)
|
|
|
c7aa529 |
+ {
|
|
|
c7aa529 |
+ size_t cp_len = strlen (cp);
|
|
|
c7aa529 |
+ char new_cp [prefix_len + cp_len + 1];
|
|
|
c7aa529 |
+ memcpy (mempcpy (new_cp, prefix, prefix_len), cp, cp_len + 1);
|
|
|
c7aa529 |
+ add_dir (new_cp);
|
|
|
c7aa529 |
}
|
|
 |
0a19918 |
else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5]))
|
|
|
0a19918 |
{
|
|
|
7020da2 |
@@ -1098,7 +1107,7 @@ parse_conf (const char *filename, bool d
|
|
|
c7aa529 |
config files to read. */
|
|
|
c7aa529 |
static void
|
|
|
c7aa529 |
parse_conf_include (const char *config_file, unsigned int lineno,
|
|
|
c7aa529 |
- bool do_chroot, const char *pattern)
|
|
|
c7aa529 |
+ const char *prefix, bool do_chroot, const char *pattern)
|
|
|
c7aa529 |
{
|
|
|
c7aa529 |
if (opt_chroot && pattern[0] != '/')
|
|
|
c7aa529 |
error (EXIT_FAILURE, 0,
|
|
|
7020da2 |
@@ -1128,7 +1137,7 @@ parse_conf_include (const char *config_f
|
|
|
c7aa529 |
{
|
|
|
c7aa529 |
case 0:
|
|
|
c7aa529 |
for (size_t i = 0; i < gl.gl_pathc; ++i)
|
|
|
c7aa529 |
- parse_conf (gl.gl_pathv[i], false);
|
|
|
c7aa529 |
+ parse_conf (gl.gl_pathv[i], prefix, false);
|
|
|
c7aa529 |
globfree64 (&gl);
|
|
|
c7aa529 |
break;
|
|
|
c7aa529 |
|
|
|
7020da2 |
@@ -1168,6 +1177,8 @@ main (int argc, char **argv)
|
|
|
c7aa529 |
{
|
|
|
c7aa529 |
int remaining;
|
|
|
c7aa529 |
|
|
|
c7aa529 |
+ arch_startup (argc, argv);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
/* Parse and process arguments. */
|
|
|
c7aa529 |
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
c7aa529 |
|
|
|
7020da2 |
@@ -1280,12 +1291,14 @@ main (int argc, char **argv)
|
|
|
c7aa529 |
|
|
|
c7aa529 |
if (!opt_only_cline)
|
|
|
c7aa529 |
{
|
|
|
c7aa529 |
- parse_conf (config_file, true);
|
|
|
c7aa529 |
+ parse_conf (config_file, NULL, true);
|
|
|
c7aa529 |
|
|
|
c7aa529 |
/* Always add the standard search paths. */
|
|
|
c7aa529 |
add_system_dir (SLIBDIR);
|
|
|
c7aa529 |
if (strcmp (SLIBDIR, LIBDIR))
|
|
|
c7aa529 |
add_system_dir (LIBDIR);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ add_arch_dirs (config_file);
|
|
|
c7aa529 |
}
|
|
|
c7aa529 |
|
|
|
c7aa529 |
search_dirs ();
|
|
|
623fb2e |
--- glibc-20060630T0858/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3
|
|
|
eed6a0f |
@@ -160,17 +160,21 @@ do_test (void)
|
|
|
eed6a0f |
the 16 runs, something is very wrong. */
|
|
|
eed6a0f |
int ndifferences = 0;
|
|
|
eed6a0f |
int ndefaults = 0;
|
|
|
eed6a0f |
+ int npartlyrandomized = 0;
|
|
|
eed6a0f |
for (i = 0; i < N; ++i)
|
|
|
eed6a0f |
{
|
|
|
eed6a0f |
if (child_stack_chk_guards[i] != child_stack_chk_guards[i+1])
|
|
|
eed6a0f |
ndifferences++;
|
|
|
eed6a0f |
else if (child_stack_chk_guards[i] == default_guard)
|
|
|
eed6a0f |
ndefaults++;
|
|
|
eed6a0f |
+ else if (*(char *) &child_stack_chk_guards[i] == 0)
|
|
|
6bdbb1e |
+ npartlyrandomized++;
|
|
|
eed6a0f |
}
|
|
|
eed6a0f |
|
|
|
eed6a0f |
- printf ("differences %d defaults %d\n", ndifferences, ndefaults);
|
|
|
eed6a0f |
+ printf ("differences %d defaults %d partly randomized %d\n",
|
|
|
eed6a0f |
+ ndifferences, ndefaults, npartlyrandomized);
|
|
|
eed6a0f |
|
|
|
eed6a0f |
- if (ndifferences < N / 2 && ndefaults < N / 2)
|
|
|
eed6a0f |
+ if ((ndifferences + ndefaults + npartlyrandomized) < 3 * N / 4)
|
|
|
eed6a0f |
{
|
|
|
eed6a0f |
puts ("stack guard canaries are not randomized enough");
|
|
|
eed6a0f |
puts ("nor equal to the default canary value");
|
|
|
623fb2e |
--- glibc-20060630T0858/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6
|
|
|
f995938 |
@@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
|
|
|
c7aa529 |
module name offset
|
|
|
c7aa529 |
(following last entry with step count 0)
|
|
|
c7aa529 |
*/
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+static struct hash_entry *hash_table;
|
|
|
c7aa529 |
+static size_t hash_size;
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+/* Function to insert the names. */
|
|
|
c7aa529 |
+static void name_insert (const void *nodep, VISIT value, int level)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ struct name *name;
|
|
|
c7aa529 |
+ unsigned int idx;
|
|
|
c7aa529 |
+ unsigned int hval2;
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ if (value != leaf && value != postorder)
|
|
|
c7aa529 |
+ return;
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ name = *(struct name **) nodep;
|
|
|
c7aa529 |
+ idx = name->hashval % hash_size;
|
|
|
c7aa529 |
+ hval2 = 1 + name->hashval % (hash_size - 2);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ while (hash_table[idx].string_offset != 0)
|
|
|
c7aa529 |
+ if ((idx += hval2) >= hash_size)
|
|
|
c7aa529 |
+ idx -= hash_size;
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ hash_table[idx].string_offset = strtaboffset (name->strent);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ assert (name->module_idx != -1);
|
|
|
c7aa529 |
+ hash_table[idx].module_idx = name->module_idx;
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
static int
|
|
|
c7aa529 |
write_output (void)
|
|
|
c7aa529 |
{
|
|
|
f995938 |
@@ -1018,8 +1046,6 @@ write_output (void)
|
|
|
c7aa529 |
char *string_table;
|
|
|
c7aa529 |
size_t string_table_size;
|
|
|
c7aa529 |
struct gconvcache_header header;
|
|
|
c7aa529 |
- struct hash_entry *hash_table;
|
|
|
c7aa529 |
- size_t hash_size;
|
|
|
c7aa529 |
struct module_entry *module_table;
|
|
|
c7aa529 |
char *extra_table;
|
|
|
c7aa529 |
char *cur_extra_table;
|
|
|
f995938 |
@@ -1032,31 +1058,6 @@ write_output (void)
|
|
|
cae8344 |
char tmpfname[(output_file == NULL ? sizeof finalname : output_file_len + 1)
|
|
|
c7aa529 |
+ strlen (".XXXXXX")];
|
|
|
c7aa529 |
|
|
|
c7aa529 |
- /* Function to insert the names. */
|
|
|
c7aa529 |
- auto void
|
|
|
c7aa529 |
- name_insert (const void *nodep, VISIT value, int level)
|
|
|
c7aa529 |
- {
|
|
|
c7aa529 |
- struct name *name;
|
|
|
c7aa529 |
- unsigned int idx;
|
|
|
c7aa529 |
- unsigned int hval2;
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
- if (value != leaf && value != postorder)
|
|
|
c7aa529 |
- return;
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
- name = *(struct name **) nodep;
|
|
|
c7aa529 |
- idx = name->hashval % hash_size;
|
|
|
c7aa529 |
- hval2 = 1 + name->hashval % (hash_size - 2);
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
- while (hash_table[idx].string_offset != 0)
|
|
|
c7aa529 |
- if ((idx += hval2) >= hash_size)
|
|
|
c7aa529 |
- idx -= hash_size;
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
- hash_table[idx].string_offset = strtaboffset (name->strent);
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
- assert (name->module_idx != -1);
|
|
|
c7aa529 |
- hash_table[idx].module_idx = name->module_idx;
|
|
|
c7aa529 |
- }
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
/* Open the output file. */
|
|
|
cae8344 |
if (output_file == NULL)
|
|
|
cae8344 |
{
|
|
|
623fb2e |
--- glibc-20060630T0858/include/features.h 25 Apr 2006 20:34:32 -0000 1.43
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/include/features.h 26 Apr 2006 20:18:17 -0000 1.35.2.12
|
|
|
bd4957a |
@@ -275,7 +275,13 @@
|
|
|
cfeb07d |
#endif
|
|
|
cfeb07d |
|
|
|
c8ff10b |
#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
|
|
|
c8ff10b |
- && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
|
|
|
c8ff10b |
+ && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 \
|
|
|
cfeb07d |
+ && (__GNUC_PREREQ (4, 1) \
|
|
|
67c2a6a |
+ || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \
|
|
|
67c2a6a |
+ || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \
|
|
|
67c2a6a |
+ && __GNUC_MINOR__ == 4 \
|
|
|
67c2a6a |
+ && (__GNUC_PATCHLEVEL__ > 2 \
|
|
|
67c2a6a |
+ || (__GNUC_PATCHLEVEL__ == 2 && __GNUC_RH_RELEASE__ >= 8))))
|
|
|
c8ff10b |
# if _FORTIFY_SOURCE > 1
|
|
|
c8ff10b |
# define __USE_FORTIFY_LEVEL 2
|
|
|
c8ff10b |
# else
|
|
|
623fb2e |
--- glibc-20060630T0858/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1
|
|
|
914423a |
@@ -0,0 +1 @@
|
|
|
914423a |
+#include <stdlib/bits/stdlib-ldbl.h>
|
|
|
623fb2e |
--- glibc-20060630T0858/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1
|
|
|
914423a |
@@ -0,0 +1 @@
|
|
|
914423a |
+#include <wcsmbs/bits/wchar-ldbl.h>
|
|
|
623fb2e |
--- glibc-20060630T0858/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1
|
|
|
c7aa529 |
@@ -58,8 +58,6 @@ korean ko_KR.eucKR
|
|
|
c7aa529 |
korean.euc ko_KR.eucKR
|
|
|
c7aa529 |
ko_KR ko_KR.eucKR
|
|
|
c7aa529 |
lithuanian lt_LT.ISO-8859-13
|
|
|
c7aa529 |
-no_NO nb_NO.ISO-8859-1
|
|
|
c7aa529 |
-no_NO.ISO-8859-1 nb_NO.ISO-8859-1
|
|
|
c7aa529 |
norwegian nb_NO.ISO-8859-1
|
|
|
c7aa529 |
nynorsk nn_NO.ISO-8859-1
|
|
|
c7aa529 |
polish pl_PL.ISO-8859-2
|
|
|
623fb2e |
--- glibc-20060630T0858/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8
|
|
|
c7aa529 |
@@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
|
|
|
c7aa529 |
extern struct _IO_FILE *stdin; /* Standard input stream. */
|
|
|
c7aa529 |
extern struct _IO_FILE *stdout; /* Standard output stream. */
|
|
|
c7aa529 |
extern struct _IO_FILE *stderr; /* Standard error output stream. */
|
|
|
c7aa529 |
+#ifdef __STDC__
|
|
|
c7aa529 |
/* C89/C99 say they're macros. Make them happy. */
|
|
|
c7aa529 |
#define stdin stdin
|
|
|
c7aa529 |
#define stdout stdout
|
|
|
c7aa529 |
#define stderr stderr
|
|
|
c7aa529 |
+#endif
|
|
|
c7aa529 |
|
|
|
c7aa529 |
__BEGIN_NAMESPACE_STD
|
|
|
c7aa529 |
/* Remove file FILENAME. */
|
|
|
623fb2e |
--- glibc-20060630T0858/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6
|
|
|
67c2a6a |
@@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
|
|
|
67c2a6a |
extern int __vprintf_chk (int __flag, __const char *__restrict __format,
|
|
|
67c2a6a |
_G_va_list __ap);
|
|
|
67c2a6a |
|
|
|
67c2a6a |
-# define printf(...) \
|
|
|
67c2a6a |
+# if __GNUC_PREREQ (4, 0)
|
|
|
67c2a6a |
+# define printf(...) \
|
|
|
67c2a6a |
__printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
|
67c2a6a |
-# define fprintf(stream, ...) \
|
|
|
67c2a6a |
+# define fprintf(stream, ...) \
|
|
|
67c2a6a |
__fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
|
67c2a6a |
-# define vprintf(format, ap) \
|
|
|
67c2a6a |
+# define vprintf(format, ap) \
|
|
|
67c2a6a |
__vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap)
|
|
|
67c2a6a |
-# define vfprintf(stream, format, ap) \
|
|
|
67c2a6a |
+# define vfprintf(stream, format, ap) \
|
|
|
67c2a6a |
__vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap)
|
|
|
67c2a6a |
+# else
|
|
|
67c2a6a |
+# define printf(...) \
|
|
|
67c2a6a |
+ __builtin___printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
|
67c2a6a |
+# define fprintf(stream, ...) \
|
|
|
67c2a6a |
+ __builtin___fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
|
|
|
67c2a6a |
+# define vprintf(format, ap) \
|
|
|
67c2a6a |
+ __builtin___vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap)
|
|
|
67c2a6a |
+# define vfprintf(stream, format, ap) \
|
|
|
67c2a6a |
+ __builtin___vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap)
|
|
|
67c2a6a |
+# endif
|
|
|
67c2a6a |
|
|
|
67c2a6a |
#endif
|
|
|
67c2a6a |
|
|
|
623fb2e |
--- glibc-20060630T0858/locale/iso-4217.def 26 Apr 2006 07:14:53 -0000 1.19
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/locale/iso-4217.def 26 Apr 2006 20:18:17 -0000 1.15.2.4
|
|
|
c7aa529 |
@@ -8,6 +8,7 @@
|
|
|
c7aa529 |
*
|
|
|
c7aa529 |
* !!! The list has to be sorted !!!
|
|
|
c7aa529 |
*/
|
|
|
c7aa529 |
+DEFINE_INT_CURR("ADP") /* Andorran Peseta -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("AED") /* United Arab Emirates Dirham */
|
|
|
072becc |
DEFINE_INT_CURR("AFN") /* Afghanistan Afgani */
|
|
|
c7aa529 |
DEFINE_INT_CURR("ALL") /* Albanian Lek */
|
|
|
c7aa529 |
@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD") /* Armenia Dram
|
|
|
c7aa529 |
DEFINE_INT_CURR("ANG") /* Netherlands Antilles */
|
|
|
c7aa529 |
DEFINE_INT_CURR("AOA") /* Angolan Kwanza */
|
|
|
c7aa529 |
DEFINE_INT_CURR("ARS") /* Argentine Peso */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("ATS") /* Austrian Schilling -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("AUD") /* Australian Dollar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("AWG") /* Aruba Guilder */
|
|
|
c7aa529 |
DEFINE_INT_CURR("AZM") /* Azerbaijan Manat */
|
|
|
072becc |
DEFINE_INT_CURR("BAM") /* Bosnian and Herzegovina Convertible Mark */
|
|
|
c7aa529 |
DEFINE_INT_CURR("BBD") /* Barbados Dollar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("BDT") /* Bangladesh Taka */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("BEF") /* Belgian Franc -> EUR */
|
|
|
072becc |
DEFINE_INT_CURR("BGN") /* Bulgarian Lev */
|
|
|
c7aa529 |
DEFINE_INT_CURR("BHD") /* Bahraini Dinar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("BIF") /* Burundi Franc */
|
|
|
d04ad27 |
@@ -45,6 +48,7 @@ DEFINE_INT_CURR("CUP") /* Cuban Peso *
|
|
|
c7aa529 |
DEFINE_INT_CURR("CVE") /* Cape Verde Escudo */
|
|
|
c7aa529 |
DEFINE_INT_CURR("CYP") /* Cypriot Pound */
|
|
|
c7aa529 |
DEFINE_INT_CURR("CZK") /* Czech Koruna */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("DEM") /* German Mark -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("DJF") /* Djibouti Franc */
|
|
|
c7aa529 |
DEFINE_INT_CURR("DKK") /* Danish Krone (Faroe Islands, Greenland) */
|
|
|
c7aa529 |
DEFINE_INT_CURR("DOP") /* Dominican Republic */
|
|
|
d04ad27 |
@@ -52,16 +56,20 @@ DEFINE_INT_CURR("DZD") /* Algerian Dina
|
|
|
c7aa529 |
DEFINE_INT_CURR("EEK") /* Estonian Kroon */
|
|
|
c7aa529 |
DEFINE_INT_CURR("EGP") /* Egyptian Pound */
|
|
|
c7aa529 |
DEFINE_INT_CURR("ERN") /* Eritrean Nakfa */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("ESP") /* Spanish Peseta -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("ETB") /* Ethiopian Birr */
|
|
|
c7aa529 |
DEFINE_INT_CURR("EUR") /* European Union Euro */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("FIM") /* Finnish Markka -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("FJD") /* Fiji Dollar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("FKP") /* Falkland Islands Pound (Malvinas) */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("FRF") /* French Franc -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("GBP") /* British Pound */
|
|
|
c7aa529 |
DEFINE_INT_CURR("GEL") /* Georgia Lari */
|
|
|
c7aa529 |
DEFINE_INT_CURR("GHC") /* Ghana Cedi */
|
|
|
c7aa529 |
DEFINE_INT_CURR("GIP") /* Gibraltar Pound */
|
|
|
c7aa529 |
DEFINE_INT_CURR("GMD") /* Gambian Dalasi */
|
|
|
c7aa529 |
DEFINE_INT_CURR("GNF") /* Guinea Franc */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("GRD") /* Greek Drachma -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("GTQ") /* Guatemala Quetzal */
|
|
|
c7aa529 |
DEFINE_INT_CURR("GYD") /* Guyana Dollar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("HKD") /* Hong Kong Dollar */
|
|
|
d04ad27 |
@@ -70,12 +78,14 @@ DEFINE_INT_CURR("HRK") /* Croatia Kuna
|
|
|
c7aa529 |
DEFINE_INT_CURR("HTG") /* Haiti Gourde */
|
|
|
c7aa529 |
DEFINE_INT_CURR("HUF") /* Hungarian Forint */
|
|
|
c7aa529 |
DEFINE_INT_CURR("IDR") /* Indonesia Rupiah */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("IEP") /* Irish Pound -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("ILS") /* Israeli Shekel */
|
|
|
c7aa529 |
DEFINE_INT_CURR("IMP") /* Isle of Man Pounds */
|
|
|
c7aa529 |
DEFINE_INT_CURR("INR") /* Indian Rupee (Bhutan) */
|
|
|
c7aa529 |
DEFINE_INT_CURR("IQD") /* Iraqi Dinar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("IRR") /* Iranian Rial */
|
|
|
c7aa529 |
DEFINE_INT_CURR("ISK") /* Iceland Krona */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("ITL") /* Italian Lira -> EUR */
|
|
|
072becc |
DEFINE_INT_CURR("JEP") /* Jersey Pound */
|
|
|
c7aa529 |
DEFINE_INT_CURR("JMD") /* Jamaican Dollar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("JOD") /* Jordanian Dinar */
|
|
|
072becc |
@@ -95,6 +105,7 @@ DEFINE_INT_CURR("LKR") /* Sri Lankan Ru
|
|
|
c7aa529 |
DEFINE_INT_CURR("LRD") /* Liberian Dollar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("LSL") /* Lesotho Maloti */
|
|
|
c7aa529 |
DEFINE_INT_CURR("LTL") /* Lithuanian Litas */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("LUF") /* Luxembourg Franc -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("LVL") /* Latvia Lat */
|
|
|
c7aa529 |
DEFINE_INT_CURR("LYD") /* Libyan Arab Jamahiriya Dinar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("MAD") /* Moroccan Dirham */
|
|
|
072becc |
@@ -115,6 +126,7 @@ DEFINE_INT_CURR("MZM") /* Mozambique Me
|
|
|
c7aa529 |
DEFINE_INT_CURR("NAD") /* Namibia Dollar */
|
|
|
c7aa529 |
DEFINE_INT_CURR("NGN") /* Nigeria Naira */
|
|
|
c7aa529 |
DEFINE_INT_CURR("NIO") /* Nicaragua Cordoba Oro */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("NLG") /* Netherlands Guilder -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("NOK") /* Norwegian Krone */
|
|
|
c7aa529 |
DEFINE_INT_CURR("NPR") /* Nepalese Rupee */
|
|
|
c7aa529 |
DEFINE_INT_CURR("NZD") /* New Zealand Dollar */
|
|
|
072becc |
@@ -125,6 +137,7 @@ DEFINE_INT_CURR("PGK") /* Papau New Gui
|
|
|
c7aa529 |
DEFINE_INT_CURR("PHP") /* Philippines Peso */
|
|
|
c7aa529 |
DEFINE_INT_CURR("PKR") /* Pakistan Rupee */
|
|
|
c7aa529 |
DEFINE_INT_CURR("PLN") /* Polish Zloty */
|
|
|
c7aa529 |
+DEFINE_INT_CURR("PTE") /* Portugese Escudo -> EUR */
|
|
|
c7aa529 |
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
|
|
|
c7aa529 |
DEFINE_INT_CURR("QAR") /* Qatar Rial */
|
|
|
c7aa529 |
DEFINE_INT_CURR("ROL") /* Romanian Leu */
|
|
|
623fb2e |
--- glibc-20060630T0858/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2
|
|
|
f995938 |
@@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
|
|
|
c7aa529 |
}
|
|
|
c7aa529 |
}
|
|
|
c7aa529 |
}
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+/* GCC ATM seems to do a poor job with pointers to nested functions passed
|
|
|
c7aa529 |
+ to inlined functions. Help it a little bit with this hack. */
|
|
|
c7aa529 |
+#define wchead_table_iterate(tp, fn) \
|
|
|
c7aa529 |
+do \
|
|
|
c7aa529 |
+ { \
|
|
|
c7aa529 |
+ struct wchead_table *t = (tp); \
|
|
|
c7aa529 |
+ uint32_t index1; \
|
|
|
c7aa529 |
+ for (index1 = 0; index1 < t->level1_size; index1++) \
|
|
|
c7aa529 |
+ { \
|
|
|
c7aa529 |
+ uint32_t lookup1 = t->level1[index1]; \
|
|
|
c7aa529 |
+ if (lookup1 != ((uint32_t) ~0)) \
|
|
|
c7aa529 |
+ { \
|
|
|
c7aa529 |
+ uint32_t lookup1_shifted = lookup1 << t->q; \
|
|
|
c7aa529 |
+ uint32_t index2; \
|
|
|
c7aa529 |
+ for (index2 = 0; index2 < (1 << t->q); index2++) \
|
|
|
c7aa529 |
+ { \
|
|
|
c7aa529 |
+ uint32_t lookup2 = t->level2[index2 + lookup1_shifted]; \
|
|
|
c7aa529 |
+ if (lookup2 != ((uint32_t) ~0)) \
|
|
|
c7aa529 |
+ { \
|
|
|
c7aa529 |
+ uint32_t lookup2_shifted = lookup2 << t->p; \
|
|
|
c7aa529 |
+ uint32_t index3; \
|
|
|
c7aa529 |
+ for (index3 = 0; index3 < (1 << t->p); index3++) \
|
|
|
c7aa529 |
+ { \
|
|
|
c7aa529 |
+ struct element_t *lookup3 \
|
|
|
c7aa529 |
+ = t->level3[index3 + lookup2_shifted]; \
|
|
|
c7aa529 |
+ if (lookup3 != NULL) \
|
|
|
c7aa529 |
+ fn ((((index1 << t->q) + index2) << t->p) + index3, \
|
|
|
c7aa529 |
+ lookup3); \
|
|
|
c7aa529 |
+ } \
|
|
|
c7aa529 |
+ } \
|
|
|
c7aa529 |
+ } \
|
|
|
c7aa529 |
+ } \
|
|
|
c7aa529 |
+ } \
|
|
|
c7aa529 |
+ } while (0)
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
#endif
|
|
|
c7aa529 |
|
|
|
c7aa529 |
#ifndef NO_FINALIZE
|
|
|
623fb2e |
--- glibc-20060630T0858/localedata/Makefile 26 Apr 2006 05:14:03 -0000 1.103
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/localedata/Makefile 26 Apr 2006 20:18:17 -0000 1.101.2.3
|
|
|
072becc |
@@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
|
|
|
c7aa529 |
echo -n '...'; \
|
|
|
c7aa529 |
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
|
|
|
c7aa529 |
$(LOCALEDEF) --alias-file=../intl/locale.alias \
|
|
|
c7aa529 |
+ --no-archive \
|
|
|
c7aa529 |
-i locales/$$input -c -f charmaps/$$charset \
|
|
|
c7aa529 |
$(addprefix --prefix=,$(install_root)) $$locale; \
|
|
|
c7aa529 |
echo ' done'; \
|
|
|
623fb2e |
--- glibc-20060630T0858/localedata/SUPPORTED 26 May 2006 17:02:50 -0000 1.94
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/localedata/SUPPORTED 31 May 2006 15:10:34 -0000 1.71.2.11
|
|
|
6cc49f4 |
@@ -76,6 +76,7 @@ cy_GB.UTF-8/UTF-8 \
|
|
|
c7aa529 |
cy_GB/ISO-8859-14 \
|
|
|
c7aa529 |
da_DK.UTF-8/UTF-8 \
|
|
|
c7aa529 |
da_DK/ISO-8859-1 \
|
|
|
c7aa529 |
+da_DK.ISO-8859-15/ISO-8859-15 \
|
|
|
c7aa529 |
de_AT.UTF-8/UTF-8 \
|
|
|
c7aa529 |
de_AT/ISO-8859-1 \
|
|
|
c7aa529 |
de_AT@euro/ISO-8859-15 \
|
|
|
6cc49f4 |
@@ -105,6 +106,7 @@ en_DK.UTF-8/UTF-8 \
|
|
|
c7aa529 |
en_DK/ISO-8859-1 \
|
|
|
c7aa529 |
en_GB.UTF-8/UTF-8 \
|
|
|
c7aa529 |
en_GB/ISO-8859-1 \
|
|
|
c7aa529 |
+en_GB.ISO-8859-15/ISO-8859-15 \
|
|
|
c7aa529 |
en_HK.UTF-8/UTF-8 \
|
|
|
c7aa529 |
en_HK/ISO-8859-1 \
|
|
|
c7aa529 |
en_IE.UTF-8/UTF-8 \
|
|
|
6cc49f4 |
@@ -119,6 +121,7 @@ en_SG.UTF-8/UTF-8 \
|
|
|
c7aa529 |
en_SG/ISO-8859-1 \
|
|
|
c7aa529 |
en_US.UTF-8/UTF-8 \
|
|
|
c7aa529 |
en_US/ISO-8859-1 \
|
|
|
c7aa529 |
+en_US.ISO-8859-15/ISO-8859-15 \
|
|
|
c7aa529 |
en_ZA.UTF-8/UTF-8 \
|
|
|
c7aa529 |
en_ZA/ISO-8859-1 \
|
|
|
c7aa529 |
en_ZW.UTF-8/UTF-8 \
|
|
|
6cc49f4 |
@@ -274,6 +277,8 @@ nl_NL/ISO-8859-1 \
|
|
|
c7aa529 |
nl_NL@euro/ISO-8859-15 \
|
|
|
c7aa529 |
nn_NO.UTF-8/UTF-8 \
|
|
|
c7aa529 |
nn_NO/ISO-8859-1 \
|
|
|
c7aa529 |
+no_NO.UTF-8/UTF-8 \
|
|
|
c7aa529 |
+no_NO/ISO-8859-1 \
|
|
|
90074e3 |
nr_ZA/UTF-8 \
|
|
|
df0287f |
nso_ZA/UTF-8 \
|
|
|
afd017c |
oc_FR.UTF-8/UTF-8 \
|
|
|
6cc49f4 |
@@ -325,6 +330,7 @@ sv_FI/ISO-8859-1 \
|
|
|
c7aa529 |
sv_FI@euro/ISO-8859-15 \
|
|
|
c7aa529 |
sv_SE.UTF-8/UTF-8 \
|
|
|
c7aa529 |
sv_SE/ISO-8859-1 \
|
|
|
c7aa529 |
+sv_SE.ISO-8859-15/ISO-8859-15 \
|
|
|
c7aa529 |
ta_IN/UTF-8 \
|
|
|
c7aa529 |
te_IN/UTF-8 \
|
|
|
afd017c |
tg_TJ.UTF-8/UTF-8 \
|
|
|
623fb2e |
--- glibc-20060630T0858/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2
|
|
|
c7aa529 |
@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E>
|
|
|
f3926e3 |
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>"
|
|
|
c7aa529 |
d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
|
|
|
c7aa529 |
t_fmt "<U0025><U0054>"
|
|
|
c7aa529 |
-am_pm "";""
|
|
|
c7aa529 |
-t_fmt_ampm ""
|
|
|
c7aa529 |
+am_pm "<U0041><U004D>";"<U0050><U004D>"
|
|
|
c7aa529 |
+t_fmt_ampm "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
|
|
|
c7aa529 |
+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
|
|
|
c7aa529 |
+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
|
|
|
c7aa529 |
+<U0025><U005A><U0020><U0025><U0059>"
|
|
|
c7aa529 |
END LC_TIME
|
|
|
c7aa529 |
|
|
|
c7aa529 |
LC_MESSAGES
|
|
|
623fb2e |
--- glibc-20060630T0858/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2
|
|
|
c7aa529 |
@@ -112,8 +112,8 @@ mon "<U004A><U0061><U006E>
|
|
|
c7aa529 |
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
|
|
|
c7aa529 |
d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
|
|
|
c7aa529 |
t_fmt "<U0025><U0054>"
|
|
|
c7aa529 |
-am_pm "";""
|
|
|
c7aa529 |
-t_fmt_ampm ""
|
|
|
c7aa529 |
+am_pm "<U0041><U004D>";"<U0050><U004D>"
|
|
|
c7aa529 |
+t_fmt_ampm "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
|
|
|
c7aa529 |
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
|
|
|
c7aa529 |
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
|
|
|
c7aa529 |
<U0025><U005A><U0020><U0025><U0059>"
|
|
|
623fb2e |
--- glibc-20060630T0858/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1
|
|
|
c7aa529 |
@@ -0,0 +1,69 @@
|
|
|
c7aa529 |
+escape_char /
|
|
|
c7aa529 |
+comment_char %
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+% Norwegian language locale for Norway
|
|
|
c7aa529 |
+% Source: Norsk Standardiseringsforbund
|
|
|
c7aa529 |
+% Address: University Library,
|
|
|
c7aa529 |
+% Drammensveien 41, N-9242 Oslo, Norge
|
|
|
c7aa529 |
+% Contact: Kolbjoern Aamboe
|
|
|
c7aa529 |
+% Tel: +47 - 22859109
|
|
|
c7aa529 |
+% Fax: +47 - 22434497
|
|
|
c7aa529 |
+% Email: kolbjorn.aambo@usit.uio.no
|
|
|
c7aa529 |
+% Language: no
|
|
|
c7aa529 |
+% Territory: NO
|
|
|
c7aa529 |
+% Revision: 4.3
|
|
|
c7aa529 |
+% Date: 1996-10-15
|
|
|
c7aa529 |
+% Application: general
|
|
|
c7aa529 |
+% Users: general
|
|
|
c7aa529 |
+% Repertoiremap: mnemonic.ds
|
|
|
c7aa529 |
+% Charset: ISO-8859-1
|
|
|
c7aa529 |
+% Distribution and use is free, also
|
|
|
c7aa529 |
+% for commercial purposes.
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_IDENTIFICATION
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_IDENTIFICATION
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_COLLATE
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_COLLATE
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_CTYPE
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_CTYPE
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_MONETARY
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_MONETARY
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_NUMERIC
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_NUMERIC
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_TIME
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_TIME
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_MESSAGES
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_MESSAGES
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_PAPER
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_PAPER
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_TELEPHONE
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_TELEPHONE
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_MEASUREMENT
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_MEASUREMENT
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_NAME
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_NAME
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+LC_ADDRESS
|
|
|
c7aa529 |
+copy "nb_NO"
|
|
|
c7aa529 |
+END LC_ADDRESS
|
|
|
623fb2e |
--- glibc-20060630T0858/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2
|
|
|
c7aa529 |
@@ -1,7 +1,7 @@
|
|
|
c7aa529 |
comment_char %
|
|
|
c7aa529 |
escape_char /
|
|
|
c7aa529 |
%
|
|
|
c7aa529 |
-% Chinese language locale for Taiwan R.O.C.
|
|
|
c7aa529 |
+% Chinese language locale for Taiwan
|
|
|
c7aa529 |
% charmap: BIG5-CP950
|
|
|
c7aa529 |
%
|
|
|
c7aa529 |
% Original Author:
|
|
|
c7aa529 |
@@ -17,7 +17,7 @@ escape_char /
|
|
|
c7aa529 |
% Reference: http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
|
|
|
c7aa529 |
|
|
|
c7aa529 |
LC_IDENTIFICATION
|
|
|
c7aa529 |
-title "Chinese locale for Taiwan R.O.C."
|
|
|
c7aa529 |
+title "Chinese locale for Taiwan"
|
|
|
c7aa529 |
source ""
|
|
|
c7aa529 |
address ""
|
|
|
c7aa529 |
contact ""
|
|
|
67c2a6a |
@@ -25,7 +25,7 @@ email "bug-glibc-locales@gnu.org"
|
|
|
c7aa529 |
tel ""
|
|
|
c7aa529 |
fax ""
|
|
|
c7aa529 |
language "Chinese"
|
|
|
c7aa529 |
-territory "Taiwan R.O.C."
|
|
|
c7aa529 |
+territory "Taiwan"
|
|
|
c7aa529 |
revision "0.2"
|
|
|
c7aa529 |
date "2000-08-02"
|
|
|
c7aa529 |
%
|
|
|
623fb2e |
--- glibc-20060630T0858/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1
|
|
|
8a25c5e |
@@ -24,9 +24,25 @@
|
|
|
8a25c5e |
# include <mcheck.h>
|
|
|
8a25c5e |
# include <stdint.h>
|
|
|
8a25c5e |
# include <stdio.h>
|
|
|
8a25c5e |
+# include <stdlib.h>
|
|
|
8a25c5e |
# include <libintl.h>
|
|
|
8a25c5e |
#endif
|
|
|
8a25c5e |
|
|
|
8a25c5e |
+#ifdef _LIBC
|
|
|
8a25c5e |
+extern __typeof (malloc) __libc_malloc;
|
|
|
8a25c5e |
+extern __typeof (free) __libc_free;
|
|
|
8a25c5e |
+extern __typeof (realloc) __libc_realloc;
|
|
|
8a25c5e |
+libc_hidden_proto (__libc_malloc)
|
|
|
8a25c5e |
+libc_hidden_proto (__libc_realloc)
|
|
|
8a25c5e |
+libc_hidden_proto (__libc_free)
|
|
|
8a25c5e |
+libc_hidden_proto (__libc_memalign)
|
|
|
8a25c5e |
+#else
|
|
|
8a25c5e |
+# define __libc_malloc(sz) malloc (sz)
|
|
|
8a25c5e |
+# define __libc_free(ptr) free (ptr)
|
|
|
8a25c5e |
+# define __libc_realloc(ptr, sz) realloc (ptr, sz)
|
|
|
8a25c5e |
+# define __libc_memalign(al, sz) memalign (al, sz)
|
|
|
8a25c5e |
+#endif
|
|
|
8a25c5e |
+
|
|
|
8a25c5e |
/* Old hook values. */
|
|
|
8a25c5e |
static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t);
|
|
|
8a25c5e |
static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t);
|
|
|
8a25c5e |
@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t cal
|
|
|
8a25c5e |
if (old_free_hook != NULL)
|
|
|
8a25c5e |
(*old_free_hook) (ptr, caller);
|
|
|
8a25c5e |
else
|
|
|
8a25c5e |
- free (ptr);
|
|
|
8a25c5e |
+ __libc_free (ptr);
|
|
|
8a25c5e |
__free_hook = freehook;
|
|
|
8a25c5e |
}
|
|
|
8a25c5e |
|
|
|
8a25c5e |
@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const
|
|
|
8a25c5e |
hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1,
|
|
|
8a25c5e |
caller);
|
|
|
8a25c5e |
else
|
|
|
8a25c5e |
- hdr = (struct hdr *) malloc (sizeof (struct hdr) + size + 1);
|
|
|
8a25c5e |
+ hdr = (struct hdr *) __libc_malloc (sizeof (struct hdr) + size + 1);
|
|
|
8a25c5e |
__malloc_hook = mallochook;
|
|
|
8a25c5e |
if (hdr == NULL)
|
|
|
8a25c5e |
return NULL;
|
|
|
8a25c5e |
@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment,
|
|
|
8a25c5e |
if (old_memalign_hook != NULL)
|
|
|
8a25c5e |
block = (*old_memalign_hook) (alignment, slop + size + 1, caller);
|
|
|
8a25c5e |
else
|
|
|
8a25c5e |
- block = memalign (alignment, slop + size + 1);
|
|
|
8a25c5e |
+ block = __libc_memalign (alignment, slop + size + 1);
|
|
|
8a25c5e |
__memalign_hook = memalignhook;
|
|
|
8a25c5e |
if (block == NULL)
|
|
|
8a25c5e |
return NULL;
|
|
|
8a25c5e |
@@ -294,8 +310,8 @@ reallochook (__ptr_t ptr, __malloc_size_
|
|
|
8a25c5e |
sizeof (struct hdr) + size + 1,
|
|
|
8a25c5e |
caller);
|
|
|
8a25c5e |
else
|
|
|
8a25c5e |
- hdr = (struct hdr *) realloc ((__ptr_t) hdr,
|
|
|
8a25c5e |
- sizeof (struct hdr) + size + 1);
|
|
|
8a25c5e |
+ hdr = (struct hdr *) __libc_realloc ((__ptr_t) hdr,
|
|
|
8a25c5e |
+ sizeof (struct hdr) + size + 1);
|
|
|
8a25c5e |
__free_hook = freehook;
|
|
|
8a25c5e |
__malloc_hook = mallochook;
|
|
|
8a25c5e |
__memalign_hook = memalignhook;
|
|
|
8a25c5e |
@@ -355,8 +371,8 @@ mcheck (func)
|
|
|
8a25c5e |
if (__malloc_initialized <= 0 && !mcheck_used)
|
|
|
8a25c5e |
{
|
|
|
8a25c5e |
/* We call malloc() once here to ensure it is initialized. */
|
|
|
8a25c5e |
- void *p = malloc (0);
|
|
|
8a25c5e |
- free (p);
|
|
|
8a25c5e |
+ void *p = __libc_malloc (0);
|
|
|
8a25c5e |
+ __libc_free (p);
|
|
|
8a25c5e |
|
|
|
8a25c5e |
old_free_hook = __free_hook;
|
|
|
8a25c5e |
__free_hook = freehook;
|
|
|
623fb2e |
--- glibc-20060630T0858/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1
|
|
|
8a25c5e |
@@ -40,6 +40,18 @@
|
|
|
8a25c5e |
# include <libio/iolibio.h>
|
|
|
8a25c5e |
# define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
|
|
|
8a25c5e |
# define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp)
|
|
|
8a25c5e |
+extern __typeof (malloc) __libc_malloc;
|
|
|
8a25c5e |
+extern __typeof (free) __libc_free;
|
|
|
8a25c5e |
+extern __typeof (realloc) __libc_realloc;
|
|
|
8a25c5e |
+libc_hidden_proto (__libc_malloc)
|
|
|
8a25c5e |
+libc_hidden_proto (__libc_realloc)
|
|
|
8a25c5e |
+libc_hidden_proto (__libc_free)
|
|
|
8a25c5e |
+libc_hidden_proto (__libc_memalign)
|
|
|
8a25c5e |
+#else
|
|
|
8a25c5e |
+# define __libc_malloc(sz) malloc (sz)
|
|
|
8a25c5e |
+# define __libc_free(ptr) free (ptr)
|
|
|
8a25c5e |
+# define __libc_realloc(ptr, sz) realloc (ptr, sz)
|
|
|
8a25c5e |
+# define __libc_memalign(al, sz) memalign (al, sz)
|
|
|
8a25c5e |
#endif
|
|
|
8a25c5e |
|
|
|
8a25c5e |
#ifndef attribute_hidden
|
|
|
8a25c5e |
@@ -154,7 +166,7 @@ tr_freehook (ptr, caller)
|
|
|
8a25c5e |
if (tr_old_free_hook != NULL)
|
|
|
8a25c5e |
(*tr_old_free_hook) (ptr, caller);
|
|
|
8a25c5e |
else
|
|
|
8a25c5e |
- free (ptr);
|
|
|
8a25c5e |
+ __libc_free (ptr);
|
|
|
8a25c5e |
__free_hook = tr_freehook;
|
|
|
8a25c5e |
__libc_lock_unlock (lock);
|
|
|
8a25c5e |
}
|
|
|
8a25c5e |
@@ -173,7 +185,7 @@ tr_mallochook (size, caller)
|
|
|
8a25c5e |
if (tr_old_malloc_hook != NULL)
|
|
|
8a25c5e |
hdr = (__ptr_t) (*tr_old_malloc_hook) (size, caller);
|
|
|
8a25c5e |
else
|
|
|
8a25c5e |
- hdr = (__ptr_t) malloc (size);
|
|
|
8a25c5e |
+ hdr = (__ptr_t) __libc_malloc (size);
|
|
|
8a25c5e |
__malloc_hook = tr_mallochook;
|
|
|
8a25c5e |
|
|
|
8a25c5e |
tr_where (caller);
|
|
|
8a25c5e |
@@ -209,7 +221,7 @@ tr_reallochook (ptr, size, caller)
|
|
|
8a25c5e |
if (tr_old_realloc_hook != NULL)
|
|
|
8a25c5e |
hdr = (__ptr_t) (*tr_old_realloc_hook) (ptr, size, caller);
|
|
|
8a25c5e |
else
|
|
|
8a25c5e |
- hdr = (__ptr_t) realloc (ptr, size);
|
|
|
8a25c5e |
+ hdr = (__ptr_t) __libc_realloc (ptr, size);
|
|
|
8a25c5e |
__free_hook = tr_freehook;
|
|
|
8a25c5e |
__malloc_hook = tr_mallochook;
|
|
|
8a25c5e |
__realloc_hook = tr_reallochook;
|
|
|
8a25c5e |
@@ -251,7 +263,7 @@ tr_memalignhook (alignment, size, caller
|
|
|
8a25c5e |
if (tr_old_memalign_hook != NULL)
|
|
|
8a25c5e |
hdr = (__ptr_t) (*tr_old_memalign_hook) (alignment, size, caller);
|
|
|
8a25c5e |
else
|
|
|
8a25c5e |
- hdr = (__ptr_t) memalign (alignment, size);
|
|
|
8a25c5e |
+ hdr = (__ptr_t) __libc_memalign (alignment, size);
|
|
|
8a25c5e |
__memalign_hook = tr_memalignhook;
|
|
|
8a25c5e |
__malloc_hook = tr_mallochook;
|
|
|
8a25c5e |
|
|
|
623fb2e |
--- glibc-20060630T0858/nis/nss 28 Apr 2006 21:02:23 -0000 1.3
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2
|
|
|
ddac4cc |
@@ -25,4 +25,4 @@
|
|
|
ddac4cc |
# memory with every getXXent() call. Otherwise each getXXent() call
|
|
|
ddac4cc |
# might result into a network communication with the server to get
|
|
|
ddac4cc |
# the next entry.
|
|
|
ddac4cc |
-#SETENT_BATCH_READ=TRUE
|
|
|
ddac4cc |
+SETENT_BATCH_READ=TRUE
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/ChangeLog 4 Jun 2006 23:59:07 -0000 1.898
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/ChangeLog 30 Jun 2006 09:16:34 -0000 1.706.2.90
|
|
|
623fb2e |
@@ -855,6 +855,15 @@
|
|
|
d1bc0a0 |
Use __sigfillset. Document that sigfillset does the right thing wrt
|
|
|
d1bc0a0 |
to SIGSETXID.
|
|
|
d1bc0a0 |
|
|
|
6bdbb1e |
+2005-08-08 Jakub Jelinek <jakub@redhat.com>
|
|
|
6bdbb1e |
+
|
|
|
6bdbb1e |
+ * tst-stackguard1.c (do_test): Likewise.
|
|
|
6bdbb1e |
+
|
|
|
eed6a0f |
+2005-07-29 Jakub Jelinek <jakub@redhat.com>
|
|
|
eed6a0f |
+
|
|
|
eed6a0f |
+ * tst-stackguard1.c (do_test): Don't fail if the poor man's
|
|
|
eed6a0f |
+ randomization doesn't work well enough.
|
|
|
eed6a0f |
+
|
|
|
eed6a0f |
2005-07-11 Jakub Jelinek <jakub@redhat.com>
|
|
|
eed6a0f |
|
|
|
eed6a0f |
[BZ #1102]
|
|
|
623fb2e |
@@ -1591,6 +1600,11 @@
|
|
|
c7aa529 |
Move definition inside libpthread, libc, librt check. Provide
|
|
|
c7aa529 |
definition for rtld.
|
|
|
c7aa529 |
|
|
|
c7aa529 |
+2004-09-02 Jakub Jelinek <jakub@redhat.com>
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ * pthread_cond_destroy.c (__pthread_cond_destroy): If there are
|
|
|
c7aa529 |
+ waiters, awake all waiters on the associated mutex.
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
2004-09-02 Ulrich Drepper <drepper@redhat.com>
|
|
|
c7aa529 |
|
|
|
c7aa529 |
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
|
|
|
623fb2e |
@@ -3665,6 +3679,11 @@
|
|
|
c7aa529 |
|
|
|
c7aa529 |
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
|
|
|
c7aa529 |
|
|
|
c7aa529 |
+2003-07-22 Jakub Jelinek <jakub@redhat.com>
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ * descr.h: Don't include lowlevellock.h, pthreaddef.h and dl-sysdep.h
|
|
|
c7aa529 |
+ if __need_struct_pthread_size, instead define lll_lock_t.
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
2003-07-25 Jakub Jelinek <jakub@redhat.com>
|
|
|
c7aa529 |
|
|
|
c7aa529 |
* tst-cancel17.c (do_test): Check if aio_cancel failed.
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/Makefile 28 Mar 2006 04:13:27 -0000 1.180
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/Makefile 28 Mar 2006 09:36:22 -0000 1.157.2.20
|
|
|
c069edd |
@@ -519,15 +519,19 @@ $(addprefix $(objpfx), \
|
|
|
716ff1c |
$(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
|
|
|
716ff1c |
$(objpfx)libpthread_nonshared.a
|
|
|
c7aa529 |
$(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so
|
|
|
c7aa529 |
-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
|
|
|
c7aa529 |
+# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
|
|
|
c7aa529 |
# since otherwise libpthread.so comes before libc.so when linking.
|
|
|
c7aa529 |
$(addprefix $(objpfx), $(tests-reverse)): \
|
|
|
c7aa529 |
- $(objpfx)../libc.so $(objpfx)libpthread.so \
|
|
|
c7aa529 |
+ $(objpfx)linklibc.so $(objpfx)libpthread.so \
|
|
|
c7aa529 |
$(objpfx)libpthread_nonshared.a
|
|
|
c7aa529 |
$(objpfx)../libc.so: $(common-objpfx)libc.so ;
|
|
|
716ff1c |
$(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
|
|
|
c7aa529 |
|
|
|
c7aa529 |
$(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+$(objpfx)linklibc.so: $(common-objpfx)libc.so
|
|
|
c7aa529 |
+ ln -s ../libc.so $@
|
|
|
c7aa529 |
+generated += libclink.so
|
|
|
c7aa529 |
else
|
|
|
c7aa529 |
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
|
|
|
c7aa529 |
endif
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3
|
|
|
eed6a0f |
@@ -190,17 +190,21 @@ do_test (void)
|
|
|
eed6a0f |
the 16 runs, something is very wrong. */
|
|
|
eed6a0f |
int ndifferences = 0;
|
|
|
eed6a0f |
int ndefaults = 0;
|
|
|
eed6a0f |
+ int npartlyrandomized = 0;
|
|
|
eed6a0f |
for (i = 0; i < N; ++i)
|
|
|
eed6a0f |
{
|
|
|
eed6a0f |
if (child_stack_chk_guards[i] != child_stack_chk_guards[i+1])
|
|
|
eed6a0f |
ndifferences++;
|
|
|
eed6a0f |
else if (child_stack_chk_guards[i] == default_guard)
|
|
|
eed6a0f |
ndefaults++;
|
|
|
eed6a0f |
+ else if (*(char *) &child_stack_chk_guards[i] == 0)
|
|
|
6bdbb1e |
+ npartlyrandomized++;
|
|
|
eed6a0f |
}
|
|
|
eed6a0f |
|
|
|
eed6a0f |
- printf ("differences %d defaults %d\n", ndifferences, ndefaults);
|
|
|
eed6a0f |
+ printf ("differences %d defaults %d partly randomized %d\n",
|
|
|
eed6a0f |
+ ndifferences, ndefaults, npartlyrandomized);
|
|
|
eed6a0f |
|
|
|
eed6a0f |
- if (ndifferences < N / 2 && ndefaults < N / 2)
|
|
|
eed6a0f |
+ if ((ndifferences + ndefaults + npartlyrandomized) < 3 * N / 4)
|
|
|
eed6a0f |
{
|
|
|
eed6a0f |
puts ("stack guard canaries are not randomized enough");
|
|
|
eed6a0f |
puts ("nor equal to the default canary value");
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1
|
|
|
c7aa529 |
@@ -0,0 +1,6 @@
|
|
|
c7aa529 |
+#include_next <kernel-features.h>
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+/* NPTL can always assume all clone thread flags work. */
|
|
|
c7aa529 |
+#ifndef __ASSUME_CLONE_THREAD_FLAGS
|
|
|
c7aa529 |
+# define __ASSUME_CLONE_THREAD_FLAGS 1
|
|
|
c7aa529 |
+#endif
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 9 Apr 2006 02:42:29 -0000 1.30
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 24 Apr 2006 08:55:42 -0000 1.25.2.5
|
|
|
a18e83c |
@@ -65,6 +65,88 @@
|
|
|
a18e83c |
#define BUSY_WAIT_NOP asm ("rep; nop")
|
|
|
a18e83c |
|
|
|
a18e83c |
|
|
|
a18e83c |
+#ifdef USE_CFA_VAL_EXPRESSION
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_START \
|
|
|
a18e83c |
+ ".section .eh_frame,\"a\",@progbits\n" \
|
|
|
a18e83c |
+"5:\t" ".long 7f-6f # Length of Common Information Entry\n" \
|
|
|
a18e83c |
+"6:\t" ".long 0x0 # CIE Identifier Tag\n\t" \
|
|
|
a18e83c |
+ ".byte 0x1 # CIE Version\n\t" \
|
|
|
a18e83c |
+ ".ascii \"zR\\0\" # CIE Augmentation\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x1 # CIE Code Alignment Factor\n\t" \
|
|
|
a18e83c |
+ ".sleb128 -4 # CIE Data Alignment Factor\n\t" \
|
|
|
a18e83c |
+ ".byte 0x8 # CIE RA Column\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x1 # Augmentation size\n\t" \
|
|
|
a18e83c |
+ ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" \
|
|
|
a18e83c |
+ ".byte 0xc # DW_CFA_def_cfa\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x4\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x0\n\t" \
|
|
|
a18e83c |
+ ".align 4\n" \
|
|
|
a18e83c |
+"7:\t" ".long 17f-8f # FDE Length\n" \
|
|
|
a18e83c |
+"8:\t" ".long 8b-5b # FDE CIE offset\n\t" \
|
|
|
a18e83c |
+ ".long 1b-. # FDE initial location\n\t" \
|
|
|
a18e83c |
+ ".long 4b-1b # FDE address range\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x0 # Augmentation size\n\t" \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x8\n\t" \
|
|
|
a18e83c |
+ ".uleb128 10f-9f\n" \
|
|
|
a18e83c |
+"9:\t" ".byte 0x78 # DW_OP_breg8\n\t" \
|
|
|
a18e83c |
+ ".sleb128 3b-1b\n"
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_END \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x8\n\t" \
|
|
|
a18e83c |
+ ".uleb128 12f-11f\n" \
|
|
|
a18e83c |
+"11:\t" ".byte 0x78 # DW_OP_breg8\n\t" \
|
|
|
a18e83c |
+ ".sleb128 3b-2b\n" \
|
|
|
a18e83c |
+"12:\t" ".byte 0x40 + (3b-2b-1) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x8\n\t" \
|
|
|
a18e83c |
+ ".uleb128 16f-13f\n" \
|
|
|
a18e83c |
+"13:\t" ".byte 0x78 # DW_OP_breg8\n\t" \
|
|
|
a18e83c |
+ ".sleb128 15f-14f\n\t" \
|
|
|
a18e83c |
+ ".byte 0x0d # DW_OP_const4s\n" \
|
|
|
a18e83c |
+"14:\t" ".4byte 3b-.\n\t" \
|
|
|
a18e83c |
+ ".byte 0x1c # DW_OP_minus\n\t" \
|
|
|
a18e83c |
+ ".byte 0x0d # DW_OP_const4s\n" \
|
|
|
a18e83c |
+"15:\t" ".4byte 18f-.\n\t" \
|
|
|
a18e83c |
+ ".byte 0x22 # DW_OP_plus\n" \
|
|
|
a18e83c |
+"16:\t" ".align 4\n" \
|
|
|
a18e83c |
+"17:\t" ".previous\n"
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+/* Unwind info for
|
|
|
a18e83c |
+ 1: lea ..., ...
|
|
|
a18e83c |
+ 2: call ...
|
|
|
a18e83c |
+ 3: jmp 18f
|
|
|
a18e83c |
+ 4:
|
|
|
a18e83c |
+ snippet. */
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_3 \
|
|
|
a18e83c |
+LLL_STUB_UNWIND_INFO_START \
|
|
|
a18e83c |
+"10:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+LLL_STUB_UNWIND_INFO_END
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+/* Unwind info for
|
|
|
a18e83c |
+ 1: lea ..., ...
|
|
|
a18e83c |
+ 0: movl ..., ...
|
|
|
a18e83c |
+ 2: call ...
|
|
|
a18e83c |
+ 3: jmp 18f
|
|
|
a18e83c |
+ 4:
|
|
|
a18e83c |
+ snippet. */
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_4 \
|
|
|
a18e83c |
+LLL_STUB_UNWIND_INFO_START \
|
|
|
a18e83c |
+"10:\t" ".byte 0x40 + (0b-1b) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x8\n\t" \
|
|
|
a18e83c |
+ ".uleb128 20f-19f\n" \
|
|
|
a18e83c |
+"19:\t" ".byte 0x78 # DW_OP_breg8\n\t" \
|
|
|
a18e83c |
+ ".sleb128 3b-0b\n" \
|
|
|
a18e83c |
+"20:\t" ".byte 0x40 + (2b-0b) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+LLL_STUB_UNWIND_INFO_END
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+#else
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_3
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_4
|
|
|
a18e83c |
+#endif
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+
|
|
|
a18e83c |
#define lll_futex_wait(futex, val) \
|
|
|
a18e83c |
({ \
|
|
|
a18e83c |
int __status; \
|
|
|
a18e83c |
@@ -165,13 +247,14 @@ extern int __lll_mutex_unlock_wake (int
|
|
|
a18e83c |
"jnz _L_mutex_lock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
".type _L_mutex_lock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_lock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %2, %%ecx\n\t" \
|
|
|
a18e83c |
- "call __lll_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_lock_%=,.-_L_mutex_lock_%=\n" \
|
|
|
a18e83c |
+ "_L_mutex_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleal %2, %%ecx\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n" \
|
|
|
a18e83c |
+ "4:\t.size _L_mutex_lock_%=, 4b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_3 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=a" (ignore1), "=c" (ignore2), "=m" (futex) \
|
|
|
a18e83c |
: "0" (0), "1" (1), "m" (futex) \
|
|
|
a18e83c |
: "memory"); })
|
|
|
a18e83c |
@@ -180,16 +263,17 @@ extern int __lll_mutex_unlock_wake (int
|
|
|
a18e83c |
#define lll_robust_mutex_lock(futex, id) \
|
|
|
a18e83c |
({ int result, ignore; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "cmpxchgl %1, %2\n\t" \
|
|
|
a18e83c |
- "jnz _L_mutex_lock_%=\n\t" \
|
|
|
a18e83c |
+ "jnz _L_robust_mutex_lock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
- ".type _L_mutex_lock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_lock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %2, %%ecx\n\t" \
|
|
|
a18e83c |
- "call __lll_robust_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_lock_%=,.-_L_mutex_lock_%=\n" \
|
|
|
a18e83c |
+ ".type _L_robust_mutex_lock_%=,@function\n" \
|
|
|
a18e83c |
+ "_L_robust_mutex_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleal %2, %%ecx\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_robust_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n" \
|
|
|
a18e83c |
+ "4:\t.size _L_robust_mutex_lock_%=, 4b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_3 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=a" (result), "=c" (ignore), "=m" (futex) \
|
|
|
a18e83c |
: "0" (0), "1" (id), "m" (futex) \
|
|
|
a18e83c |
: "memory"); \
|
|
|
a18e83c |
@@ -204,13 +288,14 @@ extern int __lll_mutex_unlock_wake (int
|
|
|
a18e83c |
"jnz _L_mutex_cond_lock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
".type _L_mutex_cond_lock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_cond_lock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %2, %%ecx\n\t" \
|
|
|
a18e83c |
- "call __lll_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_cond_lock_%=,.-_L_mutex_cond_lock_%=\n" \
|
|
|
a18e83c |
+ "_L_mutex_cond_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleal %2, %%ecx\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n" \
|
|
|
a18e83c |
+ "4:\t.size _L_mutex_cond_lock_%=, 4b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_3 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=a" (ignore1), "=c" (ignore2), "=m" (futex) \
|
|
|
a18e83c |
: "0" (0), "1" (2), "m" (futex) \
|
|
|
a18e83c |
: "memory"); })
|
|
|
a18e83c |
@@ -219,16 +304,17 @@ extern int __lll_mutex_unlock_wake (int
|
|
|
a18e83c |
#define lll_robust_mutex_cond_lock(futex, id) \
|
|
|
a18e83c |
({ int result, ignore; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "cmpxchgl %1, %2\n\t" \
|
|
|
a18e83c |
- "jnz _L_mutex_cond_lock_%=\n\t" \
|
|
|
a18e83c |
+ "jnz _L_robust_mutex_cond_lock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
- ".type _L_mutex_cond_lock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_cond_lock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %2, %%ecx\n\t" \
|
|
|
a18e83c |
- "call __lll_robust_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_cond_lock_%=,.-_L_mutex_cond_lock_%=\n"\
|
|
|
a18e83c |
+ ".type _L_robust_mutex_cond_lock_%=,@function\n" \
|
|
|
a18e83c |
+ "_L_robust_mutex_cond_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleal %2, %%ecx\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_robust_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n" \
|
|
|
a18e83c |
+ "4:\t.size _L_robust_mutex_cond_lock_%=, 4b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_3 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=a" (result), "=c" (ignore), "=m" (futex) \
|
|
|
a18e83c |
: "0" (0), "1" (id | FUTEX_WAITERS), "m" (futex) \
|
|
|
a18e83c |
: "memory"); \
|
|
|
a18e83c |
@@ -241,14 +327,15 @@ extern int __lll_mutex_unlock_wake (int
|
|
|
a18e83c |
"jnz _L_mutex_timedlock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
".type _L_mutex_timedlock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_timedlock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %3, %%ecx\n\t" \
|
|
|
a18e83c |
- "movl %7, %%edx\n\t" \
|
|
|
a18e83c |
- "call __lll_mutex_timedlock_wait\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_timedlock_%=,.-_L_mutex_timedlock_%=\n"\
|
|
|
a18e83c |
+ "_L_mutex_timedlock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleal %3, %%ecx\n" \
|
|
|
a18e83c |
+ "0:\tmovl %7, %%edx\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_mutex_timedlock_wait\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n" \
|
|
|
a18e83c |
+ "4:\t.size _L_mutex_timedlock_%=, 4b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_4 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=a" (result), "=c" (ignore1), "=&d" (ignore2), \
|
|
|
a18e83c |
"=m" (futex) \
|
|
|
a18e83c |
: "0" (0), "1" (1), "m" (futex), "m" (timeout) \
|
|
|
a18e83c |
@@ -259,17 +346,18 @@ extern int __lll_mutex_unlock_wake (int
|
|
|
a18e83c |
#define lll_robust_mutex_timedlock(futex, timeout, id) \
|
|
|
a18e83c |
({ int result, ignore1, ignore2; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "cmpxchgl %1, %3\n\t" \
|
|
|
a18e83c |
- "jnz _L_mutex_timedlock_%=\n\t" \
|
|
|
a18e83c |
+ "jnz _L_robust_mutex_timedlock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
- ".type _L_mutex_timedlock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_timedlock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %3, %%ecx\n\t" \
|
|
|
a18e83c |
- "movl %7, %%edx\n\t" \
|
|
|
a18e83c |
- "call __lll_robust_mutex_timedlock_wait\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_timedlock_%=,.-_L_mutex_timedlock_%=\n"\
|
|
|
a18e83c |
+ ".type _L_robust_mutex_timedlock_%=,@function\n" \
|
|
|
a18e83c |
+ "_L_robust_mutex_timedlock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleal %3, %%ecx\n" \
|
|
|
a18e83c |
+ "0:\tmovl %7, %%edx\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_robust_mutex_timedlock_wait\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n" \
|
|
|
a18e83c |
+ "4:\t.size _L_robust_mutex_timedlock_%=, 4b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_4 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=a" (result), "=c" (ignore1), "=&d" (ignore2), \
|
|
|
a18e83c |
"=m" (futex) \
|
|
|
a18e83c |
: "0" (0), "1" (id), "m" (futex), "m" (timeout) \
|
|
|
a18e83c |
@@ -283,13 +371,14 @@ extern int __lll_mutex_unlock_wake (int
|
|
|
a18e83c |
"jne _L_mutex_unlock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
".type _L_mutex_unlock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_unlock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %0, %%eax\n\t" \
|
|
|
a18e83c |
- "call __lll_mutex_unlock_wake\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_unlock_%=,.-_L_mutex_unlock_%=\n" \
|
|
|
a18e83c |
+ "_L_mutex_unlock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleal %0, %%eax\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_mutex_unlock_wake\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n" \
|
|
|
a18e83c |
+ "4:\t.size _L_mutex_unlock_%=, 4b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_3 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=m" (futex), "=&a" (ignore) \
|
|
|
a18e83c |
: "m" (futex) \
|
|
|
a18e83c |
: "memory"); })
|
|
|
a18e83c |
@@ -298,16 +387,17 @@ extern int __lll_mutex_unlock_wake (int
|
|
|
a18e83c |
#define lll_robust_mutex_unlock(futex) \
|
|
|
a18e83c |
(void) ({ int ignore; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "andl %2, %0\n\t" \
|
|
|
a18e83c |
- "jne _L_mutex_unlock_%=\n\t" \
|
|
|
a18e83c |
+ "jne _L_robust_mutex_unlock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
- ".type _L_mutex_unlock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_unlock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %0, %%eax\n\t" \
|
|
|
a18e83c |
- "call __lll_mutex_unlock_wake\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_unlock_%=,.-_L_mutex_unlock_%=\n" \
|
|
|
a18e83c |
+ ".type _L_robust_mutex_unlock_%=,@function\n" \
|
|
|
a18e83c |
+ "_L_robust_mutex_unlock_%=:\n\t" \
|
|
|
a18e83c |
+ "1:\tleal %0, %%eax\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_mutex_unlock_wake\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n" \
|
|
|
a18e83c |
+ "4:\t.size _L_robust_mutex_unlock_%=, 4b-1b\n\t"\
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_3 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=m" (futex), "=&a" (ignore) \
|
|
|
a18e83c |
: "i" (FUTEX_WAITERS), "m" (futex) \
|
|
|
a18e83c |
: "memory"); })
|
|
|
a18e83c |
@@ -401,16 +491,17 @@ extern int lll_unlock_wake_cb (int *__fu
|
|
|
90074e3 |
"je 0f\n\t" \
|
|
|
a18e83c |
"lock\n" \
|
|
|
a18e83c |
"0:\tcmpxchgl %1, %2\n\t" \
|
|
|
a18e83c |
- "jnz _L_mutex_lock_%=\n\t" \
|
|
|
a18e83c |
+ "jnz _L_lock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
- ".type _L_mutex_lock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_lock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %2, %%ecx\n\t" \
|
|
|
a18e83c |
- "call __lll_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_lock_%=,.-_L_mutex_lock_%=\n" \
|
|
|
a18e83c |
+ ".type _L_lock_%=,@function\n" \
|
|
|
a18e83c |
+ "_L_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleal %2, %%ecx\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n" \
|
|
|
a18e83c |
+ "4:\t.size _L_lock_%=, 4b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_3 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=a" (ignore1), "=c" (ignore2), "=m" (futex) \
|
|
|
a18e83c |
: "0" (0), "1" (1), "m" (futex), \
|
|
|
a18e83c |
"i" (offsetof (tcbhead_t, multiple_threads)) \
|
|
|
a18e83c |
@@ -422,17 +513,18 @@ extern int lll_unlock_wake_cb (int *__fu
|
|
|
a18e83c |
__asm __volatile ("cmpl $0, %%gs:%P3\n\t" \
|
|
|
90074e3 |
"je 0f\n\t" \
|
|
|
a18e83c |
"lock\n" \
|
|
|
a18e83c |
- "0:\tsubl $1,%0\n\t" \
|
|
|
a18e83c |
- "jne _L_mutex_unlock_%=\n\t" \
|
|
|
a18e83c |
+ "0:\tsubl $1,%0\n\t" \
|
|
|
a18e83c |
+ "jne _L_unlock_%=\n\t" \
|
|
|
a18e83c |
".subsection 1\n\t" \
|
|
|
a18e83c |
- ".type _L_mutex_unlock_%=,@function\n" \
|
|
|
a18e83c |
- "_L_mutex_unlock_%=:\n\t" \
|
|
|
a18e83c |
- "leal %0, %%eax\n\t" \
|
|
|
a18e83c |
- "call __lll_mutex_unlock_wake\n\t" \
|
|
|
a18e83c |
- "jmp 1f\n\t" \
|
|
|
a18e83c |
- ".size _L_mutex_unlock_%=,.-_L_mutex_unlock_%=\n" \
|
|
|
a18e83c |
+ ".type _L_unlock_%=,@function\n" \
|
|
|
a18e83c |
+ "_L_unlock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleal %0, %%eax\n" \
|
|
|
a18e83c |
+ "2:\tcall __lll_mutex_unlock_wake\n" \
|
|
|
a18e83c |
+ "3:\tjmp 18f\n\t" \
|
|
|
a18e83c |
+ "4:\t.size _L_unlock_%=, 4b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "1:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_3 \
|
|
|
a18e83c |
+ "18:" \
|
|
|
a18e83c |
: "=m" (futex), "=&a" (ignore) \
|
|
|
a18e83c |
: "m" (futex), \
|
|
|
a18e83c |
"i" (offsetof (tcbhead_t, multiple_threads)) \
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 9 Apr 2006 02:42:29 -0000 1.15
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 24 Apr 2006 08:55:43 -0000 1.13.2.3
|
|
|
a18e83c |
@@ -1,4 +1,4 @@
|
|
|
a18e83c |
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
|
|
a18e83c |
+/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
|
|
|
a18e83c |
This file is part of the GNU C Library.
|
|
|
a18e83c |
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
a18e83c |
|
|
|
a18e83c |
@@ -41,9 +41,16 @@
|
|
|
a18e83c |
.hidden __lll_mutex_lock_wait
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_mutex_lock_wait:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
pushl %edx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %esi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
+ cfi_offset(%edx, -8)
|
|
|
a18e83c |
+ cfi_offset(%ebx, -12)
|
|
|
a18e83c |
+ cfi_offset(%esi, -16)
|
|
|
a18e83c |
|
|
|
a18e83c |
movl $2, %edx
|
|
|
a18e83c |
movl %ecx, %ebx
|
|
|
a18e83c |
@@ -63,9 +70,16 @@ __lll_mutex_lock_wait:
|
|
|
90074e3 |
jnz 1b
|
|
|
a18e83c |
|
|
|
a18e83c |
popl %esi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%esi)
|
|
|
a18e83c |
popl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%ebx)
|
|
|
a18e83c |
popl %edx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%edx)
|
|
|
a18e83c |
ret
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_mutex_lock_wait,.-__lll_mutex_lock_wait
|
|
|
a18e83c |
|
|
|
a18e83c |
|
|
|
a18e83c |
@@ -75,17 +89,27 @@ __lll_mutex_lock_wait:
|
|
|
a18e83c |
.hidden __lll_mutex_timedlock_wait
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_mutex_timedlock_wait:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
/* Check for a valid timeout value. */
|
|
|
a18e83c |
cmpl $1000000000, 4(%edx)
|
|
|
a18e83c |
jae 3f
|
|
|
a18e83c |
|
|
|
a18e83c |
pushl %edi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %esi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %ebp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
+ cfi_offset(%edi, -8)
|
|
|
a18e83c |
+ cfi_offset(%esi, -12)
|
|
|
a18e83c |
+ cfi_offset(%ebx, -16)
|
|
|
a18e83c |
+ cfi_offset(%ebp, -20)
|
|
|
a18e83c |
|
|
|
a18e83c |
/* Stack frame for the timespec and timeval structs. */
|
|
|
a18e83c |
subl $8, %esp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
|
|
|
a18e83c |
movl %ecx, %ebp
|
|
|
a18e83c |
movl %edx, %edi
|
|
|
a18e83c |
@@ -140,12 +164,29 @@ __lll_mutex_timedlock_wait:
|
|
|
a18e83c |
jnz 7f
|
|
|
a18e83c |
|
|
|
a18e83c |
6: addl $8, %esp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
popl %ebp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%ebp)
|
|
|
a18e83c |
popl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%ebx)
|
|
|
a18e83c |
popl %esi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%esi)
|
|
|
a18e83c |
popl %edi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%edi)
|
|
|
a18e83c |
ret
|
|
|
a18e83c |
|
|
|
a18e83c |
+3: movl $EINVAL, %eax
|
|
|
a18e83c |
+ ret
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(24)
|
|
|
a18e83c |
+ cfi_offset(%edi, -8)
|
|
|
a18e83c |
+ cfi_offset(%esi, -12)
|
|
|
a18e83c |
+ cfi_offset(%ebx, -16)
|
|
|
a18e83c |
+ cfi_offset(%ebp, -20)
|
|
|
a18e83c |
/* Check whether the time expired. */
|
|
|
a18e83c |
7: cmpl $-ETIMEDOUT, %ecx
|
|
|
a18e83c |
je 5f
|
|
|
a18e83c |
@@ -157,11 +198,9 @@ __lll_mutex_timedlock_wait:
|
|
|
a18e83c |
jz 6b
|
|
|
a18e83c |
jmp 1b
|
|
|
a18e83c |
|
|
|
a18e83c |
-3: movl $EINVAL, %eax
|
|
|
a18e83c |
- ret
|
|
|
a18e83c |
-
|
|
|
a18e83c |
5: movl $ETIMEDOUT, %eax
|
|
|
a18e83c |
jmp 6b
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_mutex_timedlock_wait,.-__lll_mutex_timedlock_wait
|
|
|
a18e83c |
#endif
|
|
|
a18e83c |
|
|
|
a18e83c |
@@ -200,9 +239,16 @@ lll_unlock_wake_cb:
|
|
|
a18e83c |
.hidden __lll_mutex_unlock_wake
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_mutex_unlock_wake:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
pushl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %ecx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %edx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
+ cfi_offset(%ebx, -8)
|
|
|
a18e83c |
+ cfi_offset(%ecx, -12)
|
|
|
a18e83c |
+ cfi_offset(%edx, -16)
|
|
|
a18e83c |
|
|
|
a18e83c |
movl %eax, %ebx
|
|
|
a18e83c |
movl $0, (%eax)
|
|
|
a18e83c |
@@ -212,9 +258,16 @@ __lll_mutex_unlock_wake:
|
|
|
a18e83c |
ENTER_KERNEL
|
|
|
a18e83c |
|
|
|
a18e83c |
popl %edx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%edx)
|
|
|
a18e83c |
popl %ecx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%ecx)
|
|
|
a18e83c |
popl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%ebx)
|
|
|
a18e83c |
ret
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
|
|
|
a18e83c |
|
|
|
a18e83c |
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 2 Mar 2006 00:25:56 -0000 1.2
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 6 Mar 2006 07:34:44 -0000 1.1.2.3
|
|
|
a18e83c |
@@ -44,9 +44,16 @@
|
|
|
a18e83c |
.hidden __lll_robust_mutex_lock_wait
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_robust_mutex_lock_wait:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
pushl %edx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %esi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
+ cfi_offset(%edx, -8)
|
|
|
a18e83c |
+ cfi_offset(%ebx, -12)
|
|
|
a18e83c |
+ cfi_offset(%esi, -16)
|
|
|
a18e83c |
|
|
|
a18e83c |
movl %ecx, %ebx
|
|
|
a18e83c |
xorl %esi, %esi /* No timeout. */
|
|
|
a18e83c |
@@ -81,9 +88,16 @@ __lll_robust_mutex_lock_wait:
|
|
|
a18e83c |
/* NB: %eax == 0 */
|
|
|
a18e83c |
|
|
|
a18e83c |
3: popl %esi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%esi)
|
|
|
a18e83c |
popl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%ebx)
|
|
|
a18e83c |
popl %edx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%edx)
|
|
|
a18e83c |
ret
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_robust_mutex_lock_wait,.-__lll_robust_mutex_lock_wait
|
|
|
a18e83c |
|
|
|
a18e83c |
|
|
|
a18e83c |
@@ -92,17 +106,27 @@ __lll_robust_mutex_lock_wait:
|
|
|
a18e83c |
.hidden __lll_robust_mutex_timedlock_wait
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_robust_mutex_timedlock_wait:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
/* Check for a valid timeout value. */
|
|
|
a18e83c |
cmpl $1000000000, 4(%edx)
|
|
|
a18e83c |
jae 3f
|
|
|
a18e83c |
|
|
|
a18e83c |
pushl %edi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %esi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
pushl %ebp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(4)
|
|
|
a18e83c |
+ cfi_offset(%edi, -8)
|
|
|
a18e83c |
+ cfi_offset(%esi, -12)
|
|
|
a18e83c |
+ cfi_offset(%ebx, -16)
|
|
|
a18e83c |
+ cfi_offset(%ebp, -20)
|
|
|
a18e83c |
|
|
|
a18e83c |
/* Stack frame for the timespec and timeval structs. */
|
|
|
a18e83c |
subl $12, %esp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(12)
|
|
|
a18e83c |
|
|
|
a18e83c |
movl %ecx, %ebp
|
|
|
a18e83c |
movl %edx, %edi
|
|
|
a18e83c |
@@ -170,19 +194,34 @@ __lll_robust_mutex_timedlock_wait:
|
|
|
a18e83c |
jnz 7f
|
|
|
a18e83c |
|
|
|
a18e83c |
6: addl $12, %esp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-12)
|
|
|
a18e83c |
popl %ebp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%ebp)
|
|
|
a18e83c |
popl %ebx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%ebx)
|
|
|
a18e83c |
popl %esi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%esi)
|
|
|
a18e83c |
popl %edi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-4)
|
|
|
a18e83c |
+ cfi_restore(%edi)
|
|
|
a18e83c |
ret
|
|
|
a18e83c |
|
|
|
a18e83c |
+3: movl $EINVAL, %eax
|
|
|
a18e83c |
+ ret
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(28)
|
|
|
a18e83c |
+ cfi_offset(%edi, -8)
|
|
|
a18e83c |
+ cfi_offset(%esi, -12)
|
|
|
a18e83c |
+ cfi_offset(%ebx, -16)
|
|
|
a18e83c |
+ cfi_offset(%ebp, -20)
|
|
|
a18e83c |
/* Check whether the time expired. */
|
|
|
a18e83c |
7: cmpl $-ETIMEDOUT, %ecx
|
|
|
a18e83c |
jne 1b
|
|
|
a18e83c |
|
|
|
a18e83c |
8: movl $ETIMEDOUT, %eax
|
|
|
a18e83c |
jmp 6b
|
|
|
a18e83c |
-
|
|
|
a18e83c |
-3: movl $EINVAL, %eax
|
|
|
a18e83c |
- ret
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 31 Mar 2005 10:00:15 -0000 1.14
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 6 Mar 2006 07:33:30 -0000 1.11.2.4
|
|
|
a18e83c |
@@ -1,4 +1,4 @@
|
|
|
a18e83c |
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
|
a18e83c |
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
|
a18e83c |
This file is part of the GNU C Library.
|
|
|
a18e83c |
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
a18e83c |
|
|
|
a18e83c |
@@ -43,9 +43,13 @@
|
|
|
a18e83c |
.hidden __lll_mutex_lock_wait
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_mutex_lock_wait:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
pushq %r10
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %rdx
|
|
|
a18e83c |
-
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
+ cfi_offset(%r10, -16)
|
|
|
a18e83c |
+ cfi_offset(%rdx, -24)
|
|
|
a18e83c |
xorq %r10, %r10 /* No timeout. */
|
|
|
a18e83c |
movl $2, %edx
|
|
|
a18e83c |
#if FUTEX_WAIT == 0
|
|
|
a18e83c |
@@ -67,8 +71,13 @@ __lll_mutex_lock_wait:
|
|
|
a18e83c |
jnz 1b
|
|
|
a18e83c |
|
|
|
a18e83c |
popq %rdx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%rdx)
|
|
|
a18e83c |
popq %r10
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r10)
|
|
|
a18e83c |
retq
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_mutex_lock_wait,.-__lll_mutex_lock_wait
|
|
|
a18e83c |
|
|
|
a18e83c |
|
|
|
a18e83c |
@@ -78,18 +87,30 @@ __lll_mutex_lock_wait:
|
|
|
a18e83c |
.hidden __lll_mutex_timedlock_wait
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_mutex_timedlock_wait:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
/* Check for a valid timeout value. */
|
|
|
a18e83c |
cmpq $1000000000, 8(%rdx)
|
|
|
a18e83c |
jae 3f
|
|
|
a18e83c |
|
|
|
a18e83c |
pushq %r8
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %r9
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %r12
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %r13
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %r14
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
+ cfi_offset(%r8, -16)
|
|
|
a18e83c |
+ cfi_offset(%r9, -24)
|
|
|
a18e83c |
+ cfi_offset(%r12, -32)
|
|
|
a18e83c |
+ cfi_offset(%r13, -40)
|
|
|
a18e83c |
+ cfi_offset(%r14, -48)
|
|
|
a18e83c |
|
|
|
a18e83c |
/* Stack frame for the timespec and timeval structs. */
|
|
|
a18e83c |
subq $16, %rsp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(16)
|
|
|
a18e83c |
|
|
|
a18e83c |
movq %rdi, %r12
|
|
|
a18e83c |
movq %rdx, %r13
|
|
|
a18e83c |
@@ -147,13 +168,33 @@ __lll_mutex_timedlock_wait:
|
|
|
a18e83c |
jnz 7f
|
|
|
a18e83c |
|
|
|
a18e83c |
6: addq $16, %rsp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-16)
|
|
|
a18e83c |
popq %r14
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r14)
|
|
|
a18e83c |
popq %r13
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r13)
|
|
|
a18e83c |
popq %r12
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r12)
|
|
|
a18e83c |
popq %r9
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r9)
|
|
|
a18e83c |
popq %r8
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r8)
|
|
|
a18e83c |
+ retq
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+3: movl $EINVAL, %eax
|
|
|
a18e83c |
retq
|
|
|
a18e83c |
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(56)
|
|
|
a18e83c |
+ cfi_offset(%r8, -16)
|
|
|
a18e83c |
+ cfi_offset(%r9, -24)
|
|
|
a18e83c |
+ cfi_offset(%r12, -32)
|
|
|
a18e83c |
+ cfi_offset(%r13, -40)
|
|
|
a18e83c |
+ cfi_offset(%r14, -48)
|
|
|
a18e83c |
/* Check whether the time expired. */
|
|
|
a18e83c |
7: cmpq $-ETIMEDOUT, %rcx
|
|
|
a18e83c |
je 5f
|
|
|
a18e83c |
@@ -165,11 +206,9 @@ __lll_mutex_timedlock_wait:
|
|
|
a18e83c |
jz 6b
|
|
|
a18e83c |
jmp 1b
|
|
|
a18e83c |
|
|
|
a18e83c |
-3: movl $EINVAL, %eax
|
|
|
a18e83c |
- retq
|
|
|
a18e83c |
-
|
|
|
a18e83c |
5: movl $ETIMEDOUT, %eax
|
|
|
a18e83c |
jmp 6b
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_mutex_timedlock_wait,.-__lll_mutex_timedlock_wait
|
|
|
a18e83c |
#endif
|
|
|
a18e83c |
|
|
|
a18e83c |
@@ -199,8 +238,13 @@ lll_unlock_wake_cb:
|
|
|
a18e83c |
.hidden __lll_mutex_unlock_wake
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_mutex_unlock_wake:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
pushq %rsi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %rdx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
+ cfi_offset(%rsi, -16)
|
|
|
a18e83c |
+ cfi_offset(%rdx, -24)
|
|
|
a18e83c |
|
|
|
a18e83c |
movl $0, (%rdi)
|
|
|
a18e83c |
movl $FUTEX_WAKE, %esi
|
|
|
a18e83c |
@@ -209,8 +253,13 @@ __lll_mutex_unlock_wake:
|
|
|
a18e83c |
syscall
|
|
|
a18e83c |
|
|
|
a18e83c |
popq %rdx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%rdx)
|
|
|
a18e83c |
popq %rsi
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%rsi)
|
|
|
a18e83c |
retq
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
|
|
|
a18e83c |
|
|
|
a18e83c |
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 17 Feb 2006 08:06:14 -0000 1.26
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 6 Mar 2006 07:33:30 -0000 1.23.2.3
|
|
|
a18e83c |
@@ -46,6 +46,110 @@
|
|
|
a18e83c |
#define BUSY_WAIT_NOP asm ("rep; nop")
|
|
|
a18e83c |
|
|
|
a18e83c |
|
|
|
a18e83c |
+#ifdef USE_CFA_VAL_EXPRESSION
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_START \
|
|
|
a18e83c |
+ ".section .eh_frame,\"a\",@progbits\n" \
|
|
|
a18e83c |
+"7:\t" ".long 9f-8f # Length of Common Information Entry\n" \
|
|
|
a18e83c |
+"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" \
|
|
|
a18e83c |
+ ".byte 0x1 # CIE Version\n\t" \
|
|
|
a18e83c |
+ ".ascii \"zR\\0\" # CIE Augmentation\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x1 # CIE Code Alignment Factor\n\t" \
|
|
|
a18e83c |
+ ".sleb128 -8 # CIE Data Alignment Factor\n\t" \
|
|
|
a18e83c |
+ ".byte 0x10 # CIE RA Column\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x1 # Augmentation size\n\t" \
|
|
|
a18e83c |
+ ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" \
|
|
|
a18e83c |
+ ".byte 0x12 # DW_CFA_def_cfa_sf\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x7\n\t" \
|
|
|
a18e83c |
+ ".sleb128 16\n\t" \
|
|
|
a18e83c |
+ ".align 8\n" \
|
|
|
a18e83c |
+"9:\t" ".long 23f-10f # FDE Length\n" \
|
|
|
a18e83c |
+"10:\t" ".long 10b-7b # FDE CIE offset\n\t" \
|
|
|
a18e83c |
+ ".long 1b-. # FDE initial location\n\t" \
|
|
|
a18e83c |
+ ".long 6b-1b # FDE address range\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x0 # Augmentation size\n\t" \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x10\n\t" \
|
|
|
a18e83c |
+ ".uleb128 12f-11f\n" \
|
|
|
a18e83c |
+"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" \
|
|
|
a18e83c |
+ ".sleb128 4b-1b\n"
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_END \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x10\n\t" \
|
|
|
a18e83c |
+ ".uleb128 14f-13f\n" \
|
|
|
a18e83c |
+"13:\t" ".byte 0x80 # DW_OP_breg16\n\t" \
|
|
|
a18e83c |
+ ".sleb128 4b-2b\n" \
|
|
|
a18e83c |
+"14:\t" ".byte 0x40 + (3b-2b) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+ ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0\n\t" \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x10\n\t" \
|
|
|
a18e83c |
+ ".uleb128 16f-15f\n" \
|
|
|
a18e83c |
+"15:\t" ".byte 0x80 # DW_OP_breg16\n\t" \
|
|
|
a18e83c |
+ ".sleb128 4b-3b\n" \
|
|
|
a18e83c |
+"16:\t" ".byte 0x40 + (4b-3b-1) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+ ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" \
|
|
|
a18e83c |
+ ".uleb128 128\n\t" \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x10\n\t" \
|
|
|
a18e83c |
+ ".uleb128 20f-17f\n" \
|
|
|
a18e83c |
+"17:\t" ".byte 0x80 # DW_OP_breg16\n\t" \
|
|
|
a18e83c |
+ ".sleb128 19f-18f\n\t" \
|
|
|
a18e83c |
+ ".byte 0x0d # DW_OP_const4s\n" \
|
|
|
a18e83c |
+"18:\t" ".4byte 4b-.\n\t" \
|
|
|
a18e83c |
+ ".byte 0x1c # DW_OP_minus\n\t" \
|
|
|
a18e83c |
+ ".byte 0x0d # DW_OP_const4s\n" \
|
|
|
a18e83c |
+"19:\t" ".4byte 24f-.\n\t" \
|
|
|
a18e83c |
+ ".byte 0x22 # DW_OP_plus\n" \
|
|
|
a18e83c |
+"20:\t" ".byte 0x40 + (5b-4b+1) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+ ".byte 0x13 # DW_CFA_def_cfa_offset_sf\n\t" \
|
|
|
a18e83c |
+ ".sleb128 16\n\t" \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x10\n\t" \
|
|
|
a18e83c |
+ ".uleb128 22f-21f\n" \
|
|
|
a18e83c |
+"21:\t" ".byte 0x80 # DW_OP_breg16\n\t" \
|
|
|
a18e83c |
+ ".sleb128 4b-5b\n" \
|
|
|
a18e83c |
+"22:\t" ".align 8\n" \
|
|
|
a18e83c |
+"23:\t" ".previous\n"
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+/* Unwind info for
|
|
|
a18e83c |
+ 1: leaq ..., %rdi
|
|
|
a18e83c |
+ 2: subq $128, %rsp
|
|
|
a18e83c |
+ 3: callq ...
|
|
|
a18e83c |
+ 4: addq $128, %rsp
|
|
|
a18e83c |
+ 5: jmp 24f
|
|
|
a18e83c |
+ 6:
|
|
|
a18e83c |
+ snippet. */
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_5 \
|
|
|
a18e83c |
+LLL_STUB_UNWIND_INFO_START \
|
|
|
a18e83c |
+"12:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+LLL_STUB_UNWIND_INFO_END
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+/* Unwind info for
|
|
|
a18e83c |
+ 1: leaq ..., %rdi
|
|
|
a18e83c |
+ 0: movq ..., %rdx
|
|
|
a18e83c |
+ 2: subq $128, %rsp
|
|
|
a18e83c |
+ 3: callq ...
|
|
|
a18e83c |
+ 4: addq $128, %rsp
|
|
|
a18e83c |
+ 5: jmp 24f
|
|
|
a18e83c |
+ 6:
|
|
|
a18e83c |
+ snippet. */
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_6 \
|
|
|
a18e83c |
+LLL_STUB_UNWIND_INFO_START \
|
|
|
a18e83c |
+"12:\t" ".byte 0x40 + (0b-1b) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+ ".byte 0x16 # DW_CFA_val_expression\n\t" \
|
|
|
a18e83c |
+ ".uleb128 0x10\n\t" \
|
|
|
a18e83c |
+ ".uleb128 26f-25f\n" \
|
|
|
a18e83c |
+"25:\t" ".byte 0x80 # DW_OP_breg16\n\t" \
|
|
|
a18e83c |
+ ".sleb128 4b-0b\n" \
|
|
|
a18e83c |
+"26:\t" ".byte 0x40 + (2b-0b) # DW_CFA_advance_loc\n\t" \
|
|
|
a18e83c |
+LLL_STUB_UNWIND_INFO_END
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+#else
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_5
|
|
|
a18e83c |
+# define LLL_STUB_UNWIND_INFO_6
|
|
|
a18e83c |
+#endif
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+
|
|
|
a18e83c |
#define lll_futex_wait(futex, val) \
|
|
|
a18e83c |
({ \
|
|
|
a18e83c |
int __status; \
|
|
|
a18e83c |
@@ -135,14 +239,18 @@ extern int __lll_mutex_unlock_wait (int
|
|
|
a18e83c |
(void) ({ int ignore1, ignore2, ignore3; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "cmpxchgl %0, %2\n\t" \
|
|
|
a18e83c |
"jnz 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %2, %%rdi\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_mutex_lock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_mutex_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %2, %%rdi\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_mutex_lock_%=, 6b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_5 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=S" (ignore1), "=&D" (ignore2), "=m" (futex),\
|
|
|
a18e83c |
"=a" (ignore3) \
|
|
|
a18e83c |
: "0" (1), "m" (futex), "3" (0) \
|
|
|
a18e83c |
@@ -150,17 +258,21 @@ extern int __lll_mutex_unlock_wait (int
|
|
|
a18e83c |
|
|
|
a18e83c |
|
|
|
a18e83c |
#define lll_robust_mutex_lock(futex, id) \
|
|
|
a18e83c |
- ({ int result, ignore1, ignore2; \
|
|
|
a18e83c |
+ ({ int result, ignore1, ignore2; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "cmpxchgl %0, %2\n\t" \
|
|
|
a18e83c |
"jnz 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %2, %%rdi\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_robust_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_robust_mutex_lock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_robust_mutex_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %2, %%rdi\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_robust_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_robust_mutex_lock_%=, 6b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_5 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=S" (ignore1), "=&D" (ignore2), "=m" (futex), \
|
|
|
a18e83c |
"=a" (result) \
|
|
|
a18e83c |
: "0" (id), "m" (futex), "3" (0) \
|
|
|
a18e83c |
@@ -172,14 +284,18 @@ extern int __lll_mutex_unlock_wait (int
|
|
|
a18e83c |
(void) ({ int ignore1, ignore2, ignore3; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "cmpxchgl %0, %2\n\t" \
|
|
|
a18e83c |
"jnz 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %2, %%rdi\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_mutex_cond_lock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_mutex_cond_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %2, %%rdi\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_mutex_cond_lock_%=, 6b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_5 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=S" (ignore1), "=&D" (ignore2), "=m" (futex),\
|
|
|
a18e83c |
"=a" (ignore3) \
|
|
|
a18e83c |
: "0" (2), "m" (futex), "3" (0) \
|
|
|
a18e83c |
@@ -190,14 +306,18 @@ extern int __lll_mutex_unlock_wait (int
|
|
|
a18e83c |
({ int result, ignore1, ignore2; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "cmpxchgl %0, %2\n\t" \
|
|
|
a18e83c |
"jnz 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %2, %%rdi\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_robust_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_robust_mutex_cond_lock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_robust_mutex_cond_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %2, %%rdi\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_robust_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_robust_mutex_cond_lock_%=, 6b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_5 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=S" (ignore1), "=&D" (ignore2), "=m" (futex), \
|
|
|
a18e83c |
"=a" (result) \
|
|
|
a18e83c |
: "0" (id | FUTEX_WAITERS), "m" (futex), "3" (0) \
|
|
|
a18e83c |
@@ -209,15 +329,19 @@ extern int __lll_mutex_unlock_wait (int
|
|
|
a18e83c |
({ int result, ignore1, ignore2, ignore3; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "cmpxchgl %2, %4\n\t" \
|
|
|
a18e83c |
"jnz 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %4, %%rdi\n\t" \
|
|
|
a18e83c |
- "movq %8, %%rdx\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_mutex_timedlock_wait\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_mutex_timedlock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_mutex_timedlock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %4, %%rdi\n" \
|
|
|
a18e83c |
+ "0:\tmovq %8, %%rdx\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_mutex_timedlock_wait\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_mutex_timedlock_%=, 6b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_6 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=a" (result), "=&D" (ignore1), "=S" (ignore2), \
|
|
|
a18e83c |
"=&d" (ignore3), "=m" (futex) \
|
|
|
a18e83c |
: "0" (0), "2" (1), "m" (futex), "m" (timeout) \
|
|
|
a18e83c |
@@ -229,15 +353,19 @@ extern int __lll_mutex_unlock_wait (int
|
|
|
a18e83c |
({ int result, ignore1, ignore2, ignore3; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "cmpxchgl %2, %4\n\t" \
|
|
|
a18e83c |
"jnz 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %4, %%rdi\n\t" \
|
|
|
a18e83c |
- "movq %8, %%rdx\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_robust_mutex_timedlock_wait\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_robust_mutex_timedlock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_robust_mutex_timedlock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %4, %%rdi\n" \
|
|
|
a18e83c |
+ "0:\tmovq %8, %%rdx\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_robust_mutex_timedlock_wait\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_robust_mutex_timedlock_%=, 6b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_6 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=a" (result), "=&D" (ignore1), "=S" (ignore2), \
|
|
|
a18e83c |
"=&d" (ignore3), "=m" (futex) \
|
|
|
a18e83c |
: "0" (0), "2" (id), "m" (futex), "m" (timeout) \
|
|
|
a18e83c |
@@ -249,14 +377,18 @@ extern int __lll_mutex_unlock_wait (int
|
|
|
a18e83c |
(void) ({ int ignore; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "decl %0\n\t" \
|
|
|
a18e83c |
"jne 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %0, %%rdi\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_mutex_unlock_wake\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_mutex_unlock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_mutex_unlock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %0, %%rdi\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_mutex_unlock_wake\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_mutex_unlock_%=, 6b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_5 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=m" (futex), "=&D" (ignore) \
|
|
|
a18e83c |
: "m" (futex) \
|
|
|
a18e83c |
: "ax", "cx", "r11", "cc", "memory"); })
|
|
|
a18e83c |
@@ -266,14 +398,18 @@ extern int __lll_mutex_unlock_wait (int
|
|
|
a18e83c |
(void) ({ int ignore; \
|
|
|
a18e83c |
__asm __volatile (LOCK_INSTR "andl %2, %0\n\t" \
|
|
|
a18e83c |
"jne 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %0, %%rdi\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_mutex_unlock_wake\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_robust_mutex_unlock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_robust_mutex_unlock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %0, %%rdi\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_mutex_unlock_wake\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_robust_mutex_unlock_%=, 6b-1b\n\t"\
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_5 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=m" (futex), "=&D" (ignore) \
|
|
|
a18e83c |
: "i" (FUTEX_WAITERS), "m" (futex) \
|
|
|
a18e83c |
: "ax", "cx", "r11", "cc", "memory"); })
|
|
|
a18e83c |
@@ -348,17 +484,21 @@ extern int lll_unlock_wake_cb (int *__fu
|
|
|
a18e83c |
"je 0f\n\t" \
|
|
|
a18e83c |
"lock; cmpxchgl %0, %2\n\t" \
|
|
|
a18e83c |
"jnz 1f\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n" \
|
|
|
a18e83c |
+ "jmp 24f\n" \
|
|
|
a18e83c |
"0:\tcmpxchgl %0, %2\n\t" \
|
|
|
a18e83c |
"jnz 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %2, %%rdi\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_mutex_lock_wait\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_lock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_lock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %2, %%rdi\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_mutex_lock_wait\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_lock_%=, 6b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_5 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=S" (ignore1), "=&D" (ignore2), "=m" (futex),\
|
|
|
a18e83c |
"=a" (ignore3) \
|
|
|
a18e83c |
: "0" (1), "m" (futex), "3" (0) \
|
|
|
a18e83c |
@@ -371,17 +511,21 @@ extern int lll_unlock_wake_cb (int *__fu
|
|
|
a18e83c |
"je 0f\n\t" \
|
|
|
a18e83c |
"lock; decl %0\n\t" \
|
|
|
a18e83c |
"jne 1f\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n" \
|
|
|
a18e83c |
+ "jmp 24f\n" \
|
|
|
a18e83c |
"0:\tdecl %0\n\t" \
|
|
|
a18e83c |
"jne 1f\n\t" \
|
|
|
a18e83c |
- ".subsection 1\n" \
|
|
|
a18e83c |
- "1:\tleaq %0, %%rdi\n\t" \
|
|
|
a18e83c |
- "subq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "callq __lll_mutex_unlock_wake\n\t" \
|
|
|
a18e83c |
- "addq $128, %%rsp\n\t" \
|
|
|
a18e83c |
- "jmp 2f\n\t" \
|
|
|
a18e83c |
+ ".subsection 1\n\t" \
|
|
|
a18e83c |
+ ".type _L_unlock_%=, @function\n" \
|
|
|
a18e83c |
+ "_L_unlock_%=:\n" \
|
|
|
a18e83c |
+ "1:\tleaq %0, %%rdi\n" \
|
|
|
a18e83c |
+ "2:\tsubq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "3:\tcallq __lll_mutex_unlock_wake\n" \
|
|
|
a18e83c |
+ "4:\taddq $128, %%rsp\n" \
|
|
|
a18e83c |
+ "5:\tjmp 24f\n" \
|
|
|
a18e83c |
+ "6:\t.size _L_unlock_%=, 6b-1b\n\t" \
|
|
|
a18e83c |
".previous\n" \
|
|
|
a18e83c |
- "2:" \
|
|
|
a18e83c |
+ LLL_STUB_UNWIND_INFO_5 \
|
|
|
a18e83c |
+ "24:" \
|
|
|
a18e83c |
: "=m" (futex), "=&D" (ignore) \
|
|
|
a18e83c |
: "m" (futex) \
|
|
|
a18e83c |
: "ax", "cx", "r11", "cc", "memory"); })
|
|
|
623fb2e |
--- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 2 Mar 2006 00:26:55 -0000 1.2
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 6 Mar 2006 07:33:30 -0000 1.1.2.3
|
|
|
a18e83c |
@@ -46,8 +46,13 @@
|
|
|
a18e83c |
.hidden __lll_robust_mutex_lock_wait
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_robust_mutex_lock_wait:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
pushq %r10
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %rdx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
+ cfi_offset(%r10, -16)
|
|
|
a18e83c |
+ cfi_offset(%rdx, -24)
|
|
|
a18e83c |
|
|
|
a18e83c |
xorq %r10, %r10 /* No timeout. */
|
|
|
a18e83c |
#if FUTEX_WAIT == 0
|
|
|
a18e83c |
@@ -85,8 +90,13 @@ __lll_robust_mutex_lock_wait:
|
|
|
a18e83c |
/* NB: %rax == 0 */
|
|
|
a18e83c |
|
|
|
a18e83c |
3: popq %rdx
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%rdx)
|
|
|
a18e83c |
popq %r10
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r10)
|
|
|
a18e83c |
retq
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_robust_mutex_lock_wait,.-__lll_robust_mutex_lock_wait
|
|
|
a18e83c |
|
|
|
a18e83c |
|
|
|
a18e83c |
@@ -95,17 +105,27 @@ __lll_robust_mutex_lock_wait:
|
|
|
a18e83c |
.hidden __lll_robust_mutex_timedlock_wait
|
|
|
a18e83c |
.align 16
|
|
|
a18e83c |
__lll_robust_mutex_timedlock_wait:
|
|
|
a18e83c |
+ cfi_startproc
|
|
|
a18e83c |
/* Check for a valid timeout value. */
|
|
|
a18e83c |
cmpq $1000000000, 8(%rdx)
|
|
|
a18e83c |
jae 3f
|
|
|
a18e83c |
|
|
|
a18e83c |
pushq %r8
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %r9
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %r12
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
pushq %r13
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(8)
|
|
|
a18e83c |
+ cfi_offset(%r8, -16)
|
|
|
a18e83c |
+ cfi_offset(%r9, -24)
|
|
|
a18e83c |
+ cfi_offset(%r12, -32)
|
|
|
a18e83c |
+ cfi_offset(%r13, -40)
|
|
|
a18e83c |
|
|
|
a18e83c |
/* Stack frame for the timespec and timeval structs. */
|
|
|
a18e83c |
subq $24, %rsp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(24)
|
|
|
a18e83c |
|
|
|
a18e83c |
movq %rdi, %r12
|
|
|
a18e83c |
movq %rdx, %r13
|
|
|
a18e83c |
@@ -176,19 +196,34 @@ __lll_robust_mutex_timedlock_wait:
|
|
|
a18e83c |
jnz 7f
|
|
|
a18e83c |
|
|
|
a18e83c |
6: addq $24, %rsp
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-24)
|
|
|
a18e83c |
popq %r13
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r13)
|
|
|
a18e83c |
popq %r12
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r12)
|
|
|
a18e83c |
popq %r9
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r9)
|
|
|
a18e83c |
popq %r8
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(-8)
|
|
|
a18e83c |
+ cfi_restore(%r8)
|
|
|
a18e83c |
retq
|
|
|
a18e83c |
|
|
|
a18e83c |
+3: movl $EINVAL, %eax
|
|
|
a18e83c |
+ retq
|
|
|
a18e83c |
+
|
|
|
a18e83c |
+ cfi_adjust_cfa_offset(56)
|
|
|
a18e83c |
+ cfi_offset(%r8, -16)
|
|
|
a18e83c |
+ cfi_offset(%r9, -24)
|
|
|
a18e83c |
+ cfi_offset(%r12, -32)
|
|
|
a18e83c |
+ cfi_offset(%r13, -40)
|
|
|
a18e83c |
/* Check whether the time expired. */
|
|
|
a18e83c |
7: cmpq $-ETIMEDOUT, %rcx
|
|
|
a18e83c |
jne 1b
|
|
|
a18e83c |
|
|
|
a18e83c |
8: movl $ETIMEDOUT, %eax
|
|
|
a18e83c |
jmp 6b
|
|
|
a18e83c |
-
|
|
|
a18e83c |
-3: movl $EINVAL, %eax
|
|
|
a18e83c |
- retq
|
|
|
a18e83c |
+ cfi_endproc
|
|
|
a18e83c |
.size __lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
|
|
|
623fb2e |
--- glibc-20060630T0858/nscd/connections.c 30 May 2006 17:31:43 -0000 1.90
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nscd/connections.c 31 May 2006 15:10:34 -0000 1.55.2.25
|
|
|
6cc49f4 |
@@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
|
|
|
072becc |
install_real_capabilities (new_caps);
|
|
|
072becc |
#endif
|
|
|
c7aa529 |
}
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+/* Handle the HUP signal which will force a dump of the cache */
|
|
|
c7aa529 |
+void
|
|
|
c7aa529 |
+sighup_handler (int signum)
|
|
|
c7aa529 |
+{
|
|
|
408bca6 |
+ /* Prune the password database. */
|
|
|
408bca6 |
+ if (dbs[pwddb].enabled)
|
|
|
6cc49f4 |
+ prune_cache (&dbs[pwddb], LONG_MAX, -1);
|
|
|
c7aa529 |
+
|
|
|
408bca6 |
+ /* Prune the group database. */
|
|
|
408bca6 |
+ if (dbs[grpdb].enabled)
|
|
|
6cc49f4 |
+ prune_cache (&dbs[grpdb], LONG_MAX, -1);
|
|
|
c7aa529 |
+
|
|
|
408bca6 |
+ /* Prune the host database. */
|
|
|
408bca6 |
+ if (dbs[hstdb].enabled)
|
|
|
6cc49f4 |
+ prune_cache (&dbs[hstdb], LONG_MAX, -1);
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+
|
|
|
623fb2e |
--- glibc-20060630T0858/nscd/nscd.c 30 May 2006 17:29:36 -0000 1.53
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nscd/nscd.c 31 May 2006 15:10:34 -0000 1.38.2.13
|
|
|
d73fe41 |
@@ -119,6 +119,9 @@ static struct argp argp =
|
|
|
c7aa529 |
options, parse_opt, NULL, doc,
|
|
|
c7aa529 |
};
|
|
|
c7aa529 |
|
|
|
c7aa529 |
+/* The SIGHUP handler is extern to this file */
|
|
|
c7aa529 |
+extern void sighup_handler(int signum);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
/* True if only statistics are requested. */
|
|
|
c7aa529 |
static bool get_stats;
|
|
|
c7aa529 |
|
|
|
d73fe41 |
@@ -263,6 +266,7 @@ main (int argc, char **argv)
|
|
|
c7aa529 |
signal (SIGINT, termination_handler);
|
|
|
c7aa529 |
signal (SIGQUIT, termination_handler);
|
|
|
c7aa529 |
signal (SIGTERM, termination_handler);
|
|
|
c7aa529 |
+ signal (SIGHUP, sighup_handler);
|
|
|
c7aa529 |
signal (SIGPIPE, SIG_IGN);
|
|
|
c7aa529 |
|
|
|
c7aa529 |
/* Cleanup files created by a previous 'bind'. */
|
|
|
623fb2e |
--- glibc-20060630T0858/nscd/nscd.conf 27 Apr 2006 14:46:36 -0000 1.13
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nscd/nscd.conf 27 Apr 2006 21:29:54 -0000 1.8.2.5
|
|
|
072becc |
@@ -33,8 +33,8 @@
|
|
|
c7aa529 |
# logfile /var/log/nscd.log
|
|
|
c7aa529 |
# threads 6
|
|
|
3b26136 |
# max-threads 128
|
|
|
c7aa529 |
-# server-user nobody
|
|
|
c7aa529 |
-# stat-user somebody
|
|
|
c7aa529 |
+ server-user nscd
|
|
|
c7aa529 |
+# stat-user nocpulse
|
|
|
c7aa529 |
debug-level 0
|
|
|
c7aa529 |
# reload-count 5
|
|
|
3b26136 |
paranoia no
|
|
|
623fb2e |
--- glibc-20060630T0858/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4
|
|
|
63b6b66 |
@@ -9,6 +9,7 @@
|
|
|
63b6b66 |
# slow naming services like NIS, NIS+, LDAP, or hesiod.
|
|
|
63b6b66 |
# processname: /usr/sbin/nscd
|
|
|
63b6b66 |
# config: /etc/nscd.conf
|
|
|
63b6b66 |
+# config: /etc/sysconfig/nscd
|
|
|
63b6b66 |
#
|
|
|
63b6b66 |
### BEGIN INIT INFO
|
|
|
63b6b66 |
# Provides: nscd
|
|
|
63b6b66 |
@@ -28,20 +29,8 @@
|
|
|
63b6b66 |
# Source function library.
|
|
|
63b6b66 |
. /etc/init.d/functions
|
|
|
63b6b66 |
|
|
|
63b6b66 |
-# nscd does not run on any kernel lower than 2.2.0 because of threading
|
|
|
63b6b66 |
-# problems, so we require that in first place.
|
|
|
63b6b66 |
-case $(uname -r) in
|
|
|
63b6b66 |
- 2.[2-9].*)
|
|
|
63b6b66 |
- # this is okay
|
|
|
63b6b66 |
- ;;
|
|
|
63b6b66 |
- [3-9]*)
|
|
|
63b6b66 |
- # these are of course also okay
|
|
|
63b6b66 |
- ;;
|
|
|
63b6b66 |
- *)
|
|
|
63b6b66 |
- #this is not
|
|
|
63b6b66 |
- exit 1
|
|
|
63b6b66 |
- ;;
|
|
|
63b6b66 |
-esac
|
|
|
63b6b66 |
+# Source an auxiliary options file if we have one, and pick up NSCD_OPTIONS.
|
|
|
63b6b66 |
+[ -r /etc/sysconfig/nscd ] && . /etc/sysconfig/nscd
|
|
|
63b6b66 |
|
|
|
63b6b66 |
RETVAL=0
|
|
|
63b6b66 |
prog=nscd
|
|
|
63b6b66 |
@@ -57,7 +46,7 @@ start () {
|
|
|
63b6b66 |
# fi
|
|
|
63b6b66 |
# done
|
|
|
63b6b66 |
echo -n $"Starting $prog: "
|
|
|
63b6b66 |
- daemon /usr/sbin/nscd $secure
|
|
|
63b6b66 |
+ daemon /usr/sbin/nscd $secure $NSCD_OPTIONS
|
|
|
63b6b66 |
RETVAL=$?
|
|
|
63b6b66 |
echo
|
|
|
63b6b66 |
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
|
|
|
623fb2e |
--- glibc-20060630T0858/posix/Makefile 4 Jun 2006 04:59:05 -0000 1.191
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/posix/Makefile 30 Jun 2006 09:16:34 -0000 1.171.2.19
|
|
|
ddac4cc |
@@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
|
|
|
38c8be0 |
bug-regex21-mem bug-regex21.mtrace \
|
|
|
38c8be0 |
tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
|
|
|
38c8be0 |
tst-pcre-mem tst-pcre.mtrace tst-boost-mem tst-boost.mtrace \
|
|
|
38c8be0 |
- bug-ga2.mtrace bug-ga2-mem bug-glob2.mtrace bug-glob2-mem
|
|
|
38c8be0 |
+ bug-ga2.mtrace bug-ga2-mem bug-glob2.mtrace bug-glob2-mem \
|
|
|
38c8be0 |
+ getconf.speclist
|
|
|
38c8be0 |
|
|
|
38c8be0 |
include ../Rules
|
|
|
38c8be0 |
|
|
|
623fb2e |
@@ -282,12 +283,16 @@ bug-glob2-ENV = MALLOC_TRACE=$(objpfx)bu
|
|
|
38c8be0 |
$(objpfx)bug-glob2-mem: $(objpfx)bug-glob2.out
|
|
|
38c8be0 |
$(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@
|
|
|
38c8be0 |
|
|
|
38c8be0 |
-$(inst_libexecdir)/getconf: $(objpfx)getconf FORCE
|
|
|
38c8be0 |
+$(inst_libexecdir)/getconf: $(objpfx)getconf $(objpfx)getconf.speclist FORCE
|
|
|
38c8be0 |
$(addprefix $(..)./scripts/mkinstalldirs ,\
|
|
|
38c8be0 |
$(filter-out $(wildcard $@),$@))
|
|
|
38c8be0 |
- for spec in `LC_ALL=C GETCONF_DIR=/dev/null \
|
|
|
38c8be0 |
- $(run-program-prefix) $< \
|
|
|
38c8be0 |
- _POSIX_V6_WIDTH_RESTRICTED_ENVS`; do \
|
|
|
38c8be0 |
- $(INSTALL_PROGRAM) $< $@/$$spec.new; \
|
|
|
38c8be0 |
- mv -f $@/$$spec.new $@/$$spec; \
|
|
|
38c8be0 |
+ for spec in `cat $(objpfx)getconf.speclist`; do \
|
|
|
38c8be0 |
+ $(INSTALL_PROGRAM) $< $@/$$spec.new; \
|
|
|
38c8be0 |
+ mv -f $@/$$spec.new $@/$$spec; \
|
|
|
38c8be0 |
done
|
|
|
38c8be0 |
+
|
|
|
38c8be0 |
+$(objpfx)getconf.speclist: getconf.speclist.h
|
|
|
38c8be0 |
+ $(CC) -E $(CFLAGS) $(CPPFLAGS) $< \
|
|
|
9634333 |
+ | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
|
|
|
38c8be0 |
+ > $@.new
|
|
|
38c8be0 |
+ mv -f $@.new $@
|
|
|
623fb2e |
--- glibc-20060630T0858/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2
|
|
|
38c8be0 |
@@ -0,0 +1,15 @@
|
|
|
38c8be0 |
+#include <unistd.h>
|
|
|
38c8be0 |
+const char *START_OF_STRINGS =
|
|
|
38c8be0 |
+#if _POSIX_V6_ILP32_OFF32 == 1
|
|
|
08ffd2e |
+"POSIX_V6_ILP32_OFF32"
|
|
|
38c8be0 |
+#endif
|
|
|
38c8be0 |
+#if _POSIX_V6_ILP32_OFFBIG == 1
|
|
|
08ffd2e |
+"POSIX_V6_ILP32_OFFBIG"
|
|
|
38c8be0 |
+#endif
|
|
|
38c8be0 |
+#if _POSIX_V6_LP64_OFF64 == 1
|
|
|
08ffd2e |
+"POSIX_V6_LP64_OFF64"
|
|
|
38c8be0 |
+#endif
|
|
|
38c8be0 |
+#if _POSIX_V6_LPBIG_OFFBIG == 1
|
|
|
08ffd2e |
+"POSIX_V6_LPBIG_OFFBIG"
|
|
|
38c8be0 |
+#endif
|
|
|
38c8be0 |
+"";
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1
|
|
|
c7aa529 |
@@ -36,6 +36,14 @@
|
|
|
c7aa529 |
# define add_system_dir(dir) add_dir (dir)
|
|
|
c7aa529 |
#endif
|
|
|
c7aa529 |
|
|
|
c7aa529 |
+#ifndef arch_startup
|
|
|
c7aa529 |
+# define arch_startup(argc, argv) do { } while (0)
|
|
|
c7aa529 |
+#endif
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+#ifndef add_arch_dirs
|
|
|
c7aa529 |
+# define add_arch_dirs(config_file) do { } while (0)
|
|
|
c7aa529 |
+#endif
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
#define CACHEMAGIC "ld.so-1.7.0"
|
|
|
c7aa529 |
|
|
|
c7aa529 |
/* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/i386/Makefile 30 Jun 2006 09:16:34 -0000 1.16.2.4
|
|
|
623fb2e |
@@ -64,4 +64,12 @@ endif
|
|
|
623fb2e |
|
|
|
623fb2e |
ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
|
|
|
623fb2e |
defines += -DNO_TLS_DIRECT_SEG_REFS
|
|
|
623fb2e |
+else
|
|
|
623fb2e |
+# .a libraries are not performance critical and so we
|
|
|
623fb2e |
+# build them without direct TLS segment references
|
|
|
623fb2e |
+# always.
|
|
|
623fb2e |
+CPPFLAGS-.o += -DNO_TLS_DIRECT_SEG_REFS
|
|
|
623fb2e |
+CFLAGS-.o += -mno-tls-direct-seg-refs
|
|
|
623fb2e |
+CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
|
|
|
623fb2e |
+CFLAGS-.oS += -mno-tls-direct-seg-refs
|
|
|
623fb2e |
endif
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1
|
|
|
c7aa529 |
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
|
|
|
c7aa529 |
|
|
|
c7aa529 |
ifeq (yes,$(build-shared))
|
|
|
c7aa529 |
# Compatibility
|
|
|
c7aa529 |
-sysdep_routines += ia64libgcc
|
|
|
c7aa529 |
-shared-only-routines += ia64libgcc
|
|
|
c7aa529 |
+sysdep_routines += libgcc-compat
|
|
|
c7aa529 |
+shared-only-routines += libgcc-compat
|
|
|
c7aa529 |
endif
|
|
|
c7aa529 |
endif
|
|
|
c7aa529 |
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1
|
|
|
c7aa529 |
@@ -1,350 +0,0 @@
|
|
|
c7aa529 |
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency
|
|
|
c7aa529 |
- alternative. */
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-#include <sysdep.h>
|
|
|
c7aa529 |
-#undef ret
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-#include <shlib-compat.h>
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_2_6)
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-/* __divtf3
|
|
|
c7aa529 |
- Compute a 80-bit IEEE double-extended quotient.
|
|
|
c7aa529 |
- farg0 holds the dividend. farg1 holds the divisor. */
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-ENTRY(___divtf3)
|
|
|
c7aa529 |
- cmp.eq p7, p0 = r0, r0
|
|
|
c7aa529 |
- frcpa.s0 f10, p6 = farg0, farg1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) cmp.ne p7, p0 = r0, r0
|
|
|
c7aa529 |
- .pred.rel.mutex p6, p7
|
|
|
c7aa529 |
-(p6) fnma.s1 f11 = farg1, f10, f1
|
|
|
c7aa529 |
-(p6) fma.s1 f12 = farg0, f10, f0
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f13 = f11, f11, f0
|
|
|
c7aa529 |
-(p6) fma.s1 f14 = f11, f11, f11
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f11 = f13, f13, f11
|
|
|
c7aa529 |
-(p6) fma.s1 f13 = f14, f10, f10
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f13, f11, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f11 = farg1, f12, farg0
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f11 = f11, f10, f12
|
|
|
c7aa529 |
-(p6) fnma.s1 f12 = farg1, f10, f1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f12, f10, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f12 = farg1, f11, farg0
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s0 fret0 = f12, f10, f11
|
|
|
c7aa529 |
-(p7) mov fret0 = f10
|
|
|
c7aa529 |
- br.ret.sptk rp
|
|
|
c7aa529 |
-END(___divtf3)
|
|
|
c7aa529 |
- .symver ___divtf3, __divtf3@GLIBC_2.2
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-/* __divdf3
|
|
|
c7aa529 |
- Compute a 64-bit IEEE double quotient.
|
|
|
c7aa529 |
- farg0 holds the dividend. farg1 holds the divisor. */
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-ENTRY(___divdf3)
|
|
|
c7aa529 |
- cmp.eq p7, p0 = r0, r0
|
|
|
c7aa529 |
- frcpa.s0 f10, p6 = farg0, farg1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) cmp.ne p7, p0 = r0, r0
|
|
|
c7aa529 |
- .pred.rel.mutex p6, p7
|
|
|
c7aa529 |
-(p6) fmpy.s1 f11 = farg0, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f12 = farg1, f10, f1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f11 = f12, f11, f11
|
|
|
c7aa529 |
-(p6) fmpy.s1 f13 = f12, f12
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f12, f10, f10
|
|
|
c7aa529 |
-(p6) fma.s1 f11 = f13, f11, f11
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fmpy.s1 f12 = f13, f13
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f13, f10, f10
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.d.s1 f11 = f12, f11, f11
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f12, f10, f10
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fnma.d.s1 f8 = farg1, f11, farg0
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.d fret0 = f8, f10, f11
|
|
|
c7aa529 |
-(p7) mov fret0 = f10
|
|
|
c7aa529 |
- br.ret.sptk rp
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-END(___divdf3)
|
|
|
c7aa529 |
- .symver ___divdf3, __divdf3@GLIBC_2.2
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-/* __divsf3
|
|
|
c7aa529 |
- Compute a 32-bit IEEE float quotient.
|
|
|
c7aa529 |
- farg0 holds the dividend. farg1 holds the divisor. */
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-ENTRY(___divsf3)
|
|
|
c7aa529 |
- cmp.eq p7, p0 = r0, r0
|
|
|
c7aa529 |
- frcpa.s0 f10, p6 = farg0, farg1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) cmp.ne p7, p0 = r0, r0
|
|
|
c7aa529 |
- .pred.rel.mutex p6, p7
|
|
|
c7aa529 |
-(p6) fmpy.s1 f8 = farg0, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f9 = farg1, f10, f1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f8 = f9, f8, f8
|
|
|
c7aa529 |
-(p6) fmpy.s1 f9 = f9, f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f8 = f9, f8, f8
|
|
|
c7aa529 |
-(p6) fmpy.s1 f9 = f9, f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.d.s1 f10 = f9, f8, f8
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fnorm.s.s0 fret0 = f10
|
|
|
c7aa529 |
-(p7) mov fret0 = f10
|
|
|
c7aa529 |
- br.ret.sptk rp
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-END(___divsf3)
|
|
|
c7aa529 |
- .symver ___divsf3, __divsf3@GLIBC_2.2
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-/* __divdi3
|
|
|
c7aa529 |
- Compute a 64-bit integer quotient.
|
|
|
c7aa529 |
- in0 holds the dividend. in1 holds the divisor. */
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-ENTRY(___divdi3)
|
|
|
c7aa529 |
- .regstk 2,0,0,0
|
|
|
c7aa529 |
- /* Transfer inputs to FP registers. */
|
|
|
c7aa529 |
- setf.sig f8 = in0
|
|
|
c7aa529 |
- setf.sig f9 = in1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Convert the inputs to FP, so that they won't be treated as
|
|
|
c7aa529 |
- unsigned. */
|
|
|
c7aa529 |
- fcvt.xf f8 = f8
|
|
|
c7aa529 |
- fcvt.xf f9 = f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Compute the reciprocal approximation. */
|
|
|
c7aa529 |
- frcpa.s1 f10, p6 = f8, f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* 3 Newton-Raphson iterations. */
|
|
|
c7aa529 |
-(p6) fnma.s1 f11 = f9, f10, f1
|
|
|
c7aa529 |
-(p6) fmpy.s1 f12 = f8, f10
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fmpy.s1 f13 = f11, f11
|
|
|
c7aa529 |
-(p6) fma.s1 f12 = f11, f12, f12
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f11, f10, f10
|
|
|
c7aa529 |
-(p6) fma.s1 f11 = f13, f12, f12
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f13, f10, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f12 = f9, f11, f8
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f12, f10, f11
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Round quotient to an integer. */
|
|
|
c7aa529 |
- fcvt.fx.trunc.s1 f10 = f10
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Transfer result to GP registers. */
|
|
|
c7aa529 |
- getf.sig ret0 = f10
|
|
|
c7aa529 |
- br.ret.sptk rp
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-END(___divdi3)
|
|
|
c7aa529 |
- .symver ___divdi3, __divdi3@GLIBC_2.2
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-/* __moddi3
|
|
|
c7aa529 |
- Compute a 64-bit integer modulus.
|
|
|
c7aa529 |
- in0 holds the dividend (a). in1 holds the divisor (b). */
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-ENTRY(___moddi3)
|
|
|
c7aa529 |
- .regstk 2,0,0,0
|
|
|
c7aa529 |
- /* Transfer inputs to FP registers. */
|
|
|
c7aa529 |
- setf.sig f14 = in0
|
|
|
c7aa529 |
- setf.sig f9 = in1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Convert the inputs to FP, so that they won't be treated as
|
|
|
c7aa529 |
- unsigned. */
|
|
|
c7aa529 |
- fcvt.xf f8 = f14
|
|
|
c7aa529 |
- fcvt.xf f9 = f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Compute the reciprocal approximation. */
|
|
|
c7aa529 |
- frcpa.s1 f10, p6 = f8, f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* 3 Newton-Raphson iterations. */
|
|
|
c7aa529 |
-(p6) fmpy.s1 f12 = f8, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f11 = f9, f10, f1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f12 = f11, f12, f12
|
|
|
c7aa529 |
-(p6) fmpy.s1 f13 = f11, f11
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f11, f10, f10
|
|
|
c7aa529 |
-(p6) fma.s1 f11 = f13, f12, f12
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- sub in1 = r0, in1
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f13, f10, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f12 = f9, f11, f8
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- setf.sig f9 = in1
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f12, f10, f11
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- fcvt.fx.trunc.s1 f10 = f10
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* r = q * (-b) + a */
|
|
|
c7aa529 |
- xma.l f10 = f10, f9, f14
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Transfer result to GP registers. */
|
|
|
c7aa529 |
- getf.sig ret0 = f10
|
|
|
c7aa529 |
- br.ret.sptk rp
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-END(___moddi3)
|
|
|
c7aa529 |
- .symver ___moddi3, __moddi3@GLIBC_2.2
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-/* __udivdi3
|
|
|
c7aa529 |
- Compute a 64-bit unsigned integer quotient.
|
|
|
c7aa529 |
- in0 holds the dividend. in1 holds the divisor. */
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-ENTRY(___udivdi3)
|
|
|
c7aa529 |
- .regstk 2,0,0,0
|
|
|
c7aa529 |
- /* Transfer inputs to FP registers. */
|
|
|
c7aa529 |
- setf.sig f8 = in0
|
|
|
c7aa529 |
- setf.sig f9 = in1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Convert the inputs to FP, to avoid FP software-assist faults. */
|
|
|
c7aa529 |
- fcvt.xuf.s1 f8 = f8
|
|
|
c7aa529 |
- fcvt.xuf.s1 f9 = f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Compute the reciprocal approximation. */
|
|
|
c7aa529 |
- frcpa.s1 f10, p6 = f8, f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* 3 Newton-Raphson iterations. */
|
|
|
c7aa529 |
-(p6) fnma.s1 f11 = f9, f10, f1
|
|
|
c7aa529 |
-(p6) fmpy.s1 f12 = f8, f10
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fmpy.s1 f13 = f11, f11
|
|
|
c7aa529 |
-(p6) fma.s1 f12 = f11, f12, f12
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f11, f10, f10
|
|
|
c7aa529 |
-(p6) fma.s1 f11 = f13, f12, f12
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f13, f10, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f12 = f9, f11, f8
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f12, f10, f11
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Round quotient to an unsigned integer. */
|
|
|
c7aa529 |
- fcvt.fxu.trunc.s1 f10 = f10
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Transfer result to GP registers. */
|
|
|
c7aa529 |
- getf.sig ret0 = f10
|
|
|
c7aa529 |
- br.ret.sptk rp
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-END(___udivdi3)
|
|
|
c7aa529 |
- .symver ___udivdi3, __udivdi3@GLIBC_2.2
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-/* __umoddi3
|
|
|
c7aa529 |
- Compute a 64-bit unsigned integer modulus.
|
|
|
c7aa529 |
- in0 holds the dividend (a). in1 holds the divisor (b). */
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-ENTRY(___umoddi3)
|
|
|
c7aa529 |
- .regstk 2,0,0,0
|
|
|
c7aa529 |
- /* Transfer inputs to FP registers. */
|
|
|
c7aa529 |
- setf.sig f14 = in0
|
|
|
c7aa529 |
- setf.sig f9 = in1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Convert the inputs to FP, to avoid FP software assist faults. */
|
|
|
c7aa529 |
- fcvt.xuf.s1 f8 = f14
|
|
|
c7aa529 |
- fcvt.xuf.s1 f9 = f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Compute the reciprocal approximation. */
|
|
|
c7aa529 |
- frcpa.s1 f10, p6 = f8, f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* 3 Newton-Raphson iterations. */
|
|
|
c7aa529 |
-(p6) fmpy.s1 f12 = f8, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f11 = f9, f10, f1
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f12 = f11, f12, f12
|
|
|
c7aa529 |
-(p6) fmpy.s1 f13 = f11, f11
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f11, f10, f10
|
|
|
c7aa529 |
-(p6) fma.s1 f11 = f13, f12, f12
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- sub in1 = r0, in1
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f13, f10, f10
|
|
|
c7aa529 |
-(p6) fnma.s1 f12 = f9, f11, f8
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- setf.sig f9 = in1
|
|
|
c7aa529 |
-(p6) fma.s1 f10 = f12, f10, f11
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Round quotient to an unsigned integer. */
|
|
|
c7aa529 |
- fcvt.fxu.trunc.s1 f10 = f10
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* r = q * (-b) + a */
|
|
|
c7aa529 |
- xma.l f10 = f10, f9, f14
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- /* Transfer result to GP registers. */
|
|
|
c7aa529 |
- getf.sig ret0 = f10
|
|
|
c7aa529 |
- br.ret.sptk rp
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-END(___umoddi3)
|
|
|
c7aa529 |
- .symver ___umoddi3, __umoddi3@GLIBC_2.2
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-/* __multi3
|
|
|
c7aa529 |
- Compute a 128-bit multiply of 128-bit multiplicands.
|
|
|
c7aa529 |
- in0/in1 holds one multiplicand (a), in2/in3 holds the other one (b). */
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-ENTRY(___multi3)
|
|
|
c7aa529 |
- .regstk 4,0,0,0
|
|
|
c7aa529 |
- setf.sig f6 = in1
|
|
|
c7aa529 |
- movl r19 = 0xffffffff
|
|
|
c7aa529 |
- setf.sig f7 = in2
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- and r14 = r19, in0
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- setf.sig f10 = r14
|
|
|
c7aa529 |
- and r14 = r19, in2
|
|
|
c7aa529 |
- xmpy.l f9 = f6, f7
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- setf.sig f6 = r14
|
|
|
c7aa529 |
- shr.u r14 = in0, 32
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- setf.sig f7 = r14
|
|
|
c7aa529 |
- shr.u r14 = in2, 32
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- setf.sig f8 = r14
|
|
|
c7aa529 |
- xmpy.l f11 = f10, f6
|
|
|
c7aa529 |
- xmpy.l f6 = f7, f6
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- getf.sig r16 = f11
|
|
|
c7aa529 |
- xmpy.l f7 = f7, f8
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- shr.u r14 = r16, 32
|
|
|
c7aa529 |
- and r16 = r19, r16
|
|
|
c7aa529 |
- getf.sig r17 = f6
|
|
|
c7aa529 |
- setf.sig f6 = in0
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- setf.sig f11 = r14
|
|
|
c7aa529 |
- getf.sig r21 = f7
|
|
|
c7aa529 |
- setf.sig f7 = in3
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- xma.l f11 = f10, f8, f11
|
|
|
c7aa529 |
- xma.l f6 = f6, f7, f9
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- getf.sig r18 = f11
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- add r18 = r18, r17
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- and r15 = r19, r18
|
|
|
c7aa529 |
- cmp.ltu p7, p6 = r18, r17
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- getf.sig r22 = f6
|
|
|
c7aa529 |
-(p7) adds r14 = 1, r19
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-(p7) add r21 = r21, r14
|
|
|
c7aa529 |
- shr.u r14 = r18, 32
|
|
|
c7aa529 |
- shl r15 = r15, 32
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- add r20 = r21, r14
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
- add ret0 = r15, r16
|
|
|
c7aa529 |
- add ret1 = r22, r20
|
|
|
c7aa529 |
- br.ret.sptk rp
|
|
|
c7aa529 |
- ;;
|
|
|
c7aa529 |
-END(___multi3)
|
|
|
c7aa529 |
- .symver ___multi3, __multi3@GLIBC_2.2
|
|
|
c7aa529 |
-
|
|
|
c7aa529 |
-#endif
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1
|
|
|
c7aa529 |
@@ -0,0 +1,84 @@
|
|
|
c7aa529 |
+/* pre-.hidden libgcc compatibility
|
|
|
c7aa529 |
+ Copyright (C) 2002 Free Software Foundation, Inc.
|
|
|
c7aa529 |
+ This file is part of the GNU C Library.
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
c7aa529 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
c7aa529 |
+ License as published by the Free Software Foundation; either
|
|
|
c7aa529 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
c7aa529 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
c7aa529 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
c7aa529 |
+ Lesser General Public License for more details.
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
c7aa529 |
+ License along with the GNU C Library; if not, write to the Free
|
|
|
c7aa529 |
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
c7aa529 |
+ 02111-1307 USA. */
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+#include <stdint.h>
|
|
|
c7aa529 |
+#include <shlib-compat.h>
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_2_6)
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+typedef int int128_t __attribute__((__mode__(TI)));
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+extern long double __divtf3 (long double, long double) attribute_hidden;
|
|
|
c7aa529 |
+long double INTUSE (__divtf3) (long double x, long double y)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ return __divtf3 (x, y);
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+symbol_version (INTUSE (__divtf3), __divtf3, GLIBC_2.2);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+extern double __divdf3 (double, double) attribute_hidden;
|
|
|
c7aa529 |
+double INTUSE (__divdf3) (double x, double y)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ return __divdf3 (x, y);
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+symbol_version (INTUSE (__divdf3), __divdf3, GLIBC_2.2);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+extern float __divsf3 (float, float) attribute_hidden;
|
|
|
c7aa529 |
+float INTUSE (__divsf3) (float x, float y)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ return __divsf3 (x, y);
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+symbol_version (INTUSE (__divsf3), __divsf3, GLIBC_2.2);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+extern int64_t __divdi3 (int64_t, int64_t) attribute_hidden;
|
|
|
c7aa529 |
+int64_t INTUSE (__divdi3) (int64_t x, int64_t y)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ return __divdi3 (x, y);
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+symbol_version (INTUSE (__divdi3), __divdi3, GLIBC_2.2);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+extern int64_t __moddi3 (int64_t, int64_t) attribute_hidden;
|
|
|
c7aa529 |
+int64_t INTUSE (__moddi3) (int64_t x, int64_t y)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ return __moddi3 (x, y);
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+symbol_version (INTUSE (__moddi3), __moddi3, GLIBC_2.2);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+extern uint64_t __udivdi3 (uint64_t, uint64_t) attribute_hidden;
|
|
|
c7aa529 |
+uint64_t INTUSE (__udivdi3) (uint64_t x, uint64_t y)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ return __udivdi3 (x, y);
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+symbol_version (INTUSE (__udivdi3), __udivdi3, GLIBC_2.2);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+extern uint64_t __umoddi3 (uint64_t, uint64_t) attribute_hidden;
|
|
|
c7aa529 |
+uint64_t INTUSE (__umoddi3) (uint64_t x, uint64_t y)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ return __umoddi3 (x, y);
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+symbol_version (INTUSE (__umoddi3), __umoddi3, GLIBC_2.2);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+extern int128_t __multi3 (int128_t, int128_t) attribute_hidden;
|
|
|
c7aa529 |
+int128_t INTUSE (__multi3) (int128_t x, int128_t y)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ return __multi3 (x, y);
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+#endif
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1
|
|
|
c7aa529 |
@@ -41,7 +41,12 @@ nice (int incr)
|
|
|
c7aa529 |
__set_errno (save);
|
|
|
c7aa529 |
}
|
|
|
c7aa529 |
|
|
|
c7aa529 |
- result = setpriority (PRIO_PROCESS, 0, prio + incr);
|
|
|
c7aa529 |
+ prio += incr;
|
|
|
c7aa529 |
+ if (prio < PRIO_MIN)
|
|
|
c7aa529 |
+ prio = PRIO_MIN;
|
|
|
c7aa529 |
+ else if (prio >= PRIO_MAX)
|
|
|
c7aa529 |
+ prio = PRIO_MAX - 1;
|
|
|
c7aa529 |
+ result = setpriority (PRIO_PROCESS, 0, prio);
|
|
|
c7aa529 |
if (result != -1)
|
|
|
c7aa529 |
return getpriority (PRIO_PROCESS, 0);
|
|
|
c7aa529 |
else
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8
|
|
|
eed6a0f |
@@ -18,12 +18,15 @@
|
|
|
eed6a0f |
02111-1307 USA. */
|
|
|
eed6a0f |
|
|
|
eed6a0f |
#include <string.h>
|
|
|
eed6a0f |
+#include <errno.h>
|
|
|
eed6a0f |
#include <fcntl.h>
|
|
|
eed6a0f |
#include <sys/sysctl.h>
|
|
|
eed6a0f |
#include <sys/utsname.h>
|
|
|
cc5c5b1 |
#include <kernel-features.h>
|
|
|
eed6a0f |
#include <dl-sysdep.h>
|
|
|
eed6a0f |
#include <stdint.h>
|
|
|
eed6a0f |
+#include <hp-timing.h>
|
|
|
eed6a0f |
+#include <endian.h>
|
|
|
eed6a0f |
|
|
|
eed6a0f |
#ifndef MIN
|
|
|
eed6a0f |
# define MIN(a,b) (((a)<(b))?(a):(b))
|
|
|
eed6a0f |
@@ -177,5 +180,31 @@ _dl_setup_stack_chk_guard (void)
|
|
|
eed6a0f |
unsigned char *p = (unsigned char *) &ret;
|
|
|
eed6a0f |
p[sizeof (ret) - 1] = 255;
|
|
|
eed6a0f |
p[sizeof (ret) - 2] = '\n';
|
|
|
eed6a0f |
+#ifdef HP_TIMING_NOW
|
|
|
eed6a0f |
+ hp_timing_t hpt;
|
|
|
eed6a0f |
+ HP_TIMING_NOW (hpt);
|
|
|
eed6a0f |
+ hpt = (hpt & 0xffff) << 8;
|
|
|
eed6a0f |
+ ret ^= hpt;
|
|
|
eed6a0f |
+#endif
|
|
|
eed6a0f |
+ uintptr_t stk;
|
|
|
eed6a0f |
+ /* Avoid GCC being too smart. */
|
|
|
eed6a0f |
+ asm ("" : "=r" (stk) : "r" (p));
|
|
|
eed6a0f |
+ stk &= 0x7ffff0;
|
|
|
eed6a0f |
+#if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
|
eed6a0f |
+ stk <<= (__WORDSIZE - 23);
|
|
|
eed6a0f |
+#elif __WORDSIZE == 64
|
|
|
eed6a0f |
+ stk <<= 31;
|
|
|
eed6a0f |
+#endif
|
|
|
eed6a0f |
+ ret ^= stk;
|
|
|
eed6a0f |
+ /* Avoid GCC being too smart. */
|
|
|
eed6a0f |
+ p = (unsigned char *) &errno;
|
|
|
eed6a0f |
+ asm ("" : "=r" (stk) : "r" (p));
|
|
|
eed6a0f |
+ stk &= 0x7fff00;
|
|
|
eed6a0f |
+#if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
|
eed6a0f |
+ stk <<= (__WORDSIZE - 29);
|
|
|
eed6a0f |
+#else
|
|
|
6bdbb1e |
+ stk >>= 8;
|
|
|
eed6a0f |
+#endif
|
|
|
eed6a0f |
+ ret ^= stk;
|
|
|
eed6a0f |
return ret;
|
|
|
eed6a0f |
}
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7
|
|
|
b17a54f |
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
|
|
|
b17a54f |
{
|
|
|
b17a54f |
int result;
|
|
|
b17a54f |
|
|
|
b17a54f |
+ if (file == NULL)
|
|
|
b17a54f |
+ return __futimes (fd, tvp);
|
|
|
b17a54f |
+
|
|
|
b17a54f |
#ifdef __NR_futimesat
|
|
|
b17a54f |
# ifndef __ASSUME_ATFCTS
|
|
|
b17a54f |
if (__have_atfcts >= 0)
|
|
|
b17a54f |
# endif
|
|
|
b17a54f |
{
|
|
|
b17a54f |
- if (file == NULL)
|
|
|
b17a54f |
- return __futimes (fd, tvp);
|
|
|
b17a54f |
-
|
|
|
b17a54f |
result = INLINE_SYSCALL (futimesat, 3, fd, file, tvp);
|
|
|
b17a54f |
# ifndef __ASSUME_ATFCTS
|
|
|
b17a54f |
if (result == -1 && errno == ENOSYS)
|
|
|
b17a54f |
@@ -58,22 +58,7 @@ futimesat (fd, file, tvp)
|
|
|
b17a54f |
#ifndef __ASSUME_ATFCTS
|
|
|
b17a54f |
char *buf = NULL;
|
|
|
b17a54f |
|
|
|
b17a54f |
- if (file == NULL)
|
|
|
b17a54f |
- {
|
|
|
b17a54f |
- static const char procfd[] = "/proc/self/fd/%d";
|
|
|
b17a54f |
- /* Buffer for the path name we are going to use. It consists of
|
|
|
b17a54f |
- - the string /proc/self/fd/
|
|
|
b17a54f |
- - the file descriptor number.
|
|
|
b17a54f |
- The final NUL is included in the sizeof. A bit of overhead
|
|
|
b17a54f |
- due to the format elements compensates for possible negative
|
|
|
b17a54f |
- numbers. */
|
|
|
b17a54f |
- size_t buflen = sizeof (procfd) + sizeof (int) * 3;
|
|
|
b17a54f |
- buf = alloca (buflen);
|
|
|
b17a54f |
-
|
|
|
b17a54f |
- __snprintf (buf, buflen, procfd, fd);
|
|
|
b17a54f |
- file = buf;
|
|
|
b17a54f |
- }
|
|
|
b17a54f |
- else if (fd != AT_FDCWD && file[0] != '/')
|
|
|
b17a54f |
+ if (fd != AT_FDCWD && file[0] != '/')
|
|
|
b17a54f |
{
|
|
|
b17a54f |
size_t filelen = strlen (file);
|
|
|
b17a54f |
static const char procfd[] = "/proc/self/fd/%d/%s";
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1
|
|
|
c7aa529 |
@@ -61,7 +61,7 @@
|
|
|
c7aa529 |
#define _PATH_TTY "/dev/tty"
|
|
|
c7aa529 |
#define _PATH_UNIX "/boot/vmlinux"
|
|
|
c7aa529 |
#define _PATH_UTMP "/var/run/utmp"
|
|
|
c7aa529 |
-#define _PATH_VI "/usr/bin/vi"
|
|
|
c7aa529 |
+#define _PATH_VI "/bin/vi"
|
|
|
c7aa529 |
#define _PATH_WTMP "/var/log/wtmp"
|
|
|
c7aa529 |
|
|
|
c7aa529 |
/* Provide trailing slash, since mostly used for building pathnames. */
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1
|
|
|
c7aa529 |
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
|
|
|
c7aa529 |
{
|
|
|
c7aa529 |
struct __kernel_termios k_termios;
|
|
|
c7aa529 |
unsigned long int cmd;
|
|
|
c7aa529 |
+ int retval;
|
|
|
c7aa529 |
|
|
|
c7aa529 |
switch (optional_actions)
|
|
|
c7aa529 |
{
|
|
|
c7aa529 |
@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios
|
|
|
c7aa529 |
memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
|
|
|
c7aa529 |
__KERNEL_NCCS * sizeof (cc_t));
|
|
|
c7aa529 |
|
|
|
c7aa529 |
- return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
|
|
|
c7aa529 |
+ retval = INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ if (retval == 0 && cmd == TCSETS)
|
|
|
c7aa529 |
+ {
|
|
|
c7aa529 |
+ /* The Linux kernel has a bug which silently ignore the invalid
|
|
|
c7aa529 |
+ c_cflag on pty. We have to check it here. */
|
|
|
c7aa529 |
+ int save = errno;
|
|
|
c7aa529 |
+ retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
|
|
|
c7aa529 |
+ if (retval)
|
|
|
c7aa529 |
+ {
|
|
|
c7aa529 |
+ /* We cannot verify if the setting is ok. We don't return
|
|
|
c7aa529 |
+ an error (?). */
|
|
|
c7aa529 |
+ __set_errno (save);
|
|
|
c7aa529 |
+ retval = 0;
|
|
|
c7aa529 |
+ }
|
|
|
c7aa529 |
+ else if ((termios_p->c_cflag & (PARENB | CREAD))
|
|
|
c7aa529 |
+ != (k_termios.c_cflag & (PARENB | CREAD))
|
|
|
c7aa529 |
+ || ((termios_p->c_cflag & CSIZE)
|
|
|
c7aa529 |
+ && ((termios_p->c_cflag & CSIZE)
|
|
|
c7aa529 |
+ != (k_termios.c_cflag & CSIZE))))
|
|
|
c7aa529 |
+ {
|
|
|
c7aa529 |
+ /* It looks like the Linux kernel silently changed the
|
|
|
c7aa529 |
+ PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
|
|
|
c7aa529 |
+ error. */
|
|
|
c7aa529 |
+ __set_errno (EINVAL);
|
|
|
c7aa529 |
+ retval = -1;
|
|
|
c7aa529 |
+ }
|
|
|
c7aa529 |
+ }
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ return retval;
|
|
|
c7aa529 |
}
|
|
|
c7aa529 |
libc_hidden_def (tcsetattr)
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1
|
|
|
c7aa529 |
@@ -0,0 +1,59 @@
|
|
|
c7aa529 |
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
|
|
|
c7aa529 |
+ Copyright (C) 2004 Free Software Foundation, Inc.
|
|
|
c7aa529 |
+ This file is part of the GNU C Library.
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
c7aa529 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
c7aa529 |
+ License as published by the Free Software Foundation; either
|
|
|
c7aa529 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
c7aa529 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
c7aa529 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
c7aa529 |
+ Lesser General Public License for more details.
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
c7aa529 |
+ License along with the GNU C Library; if not, write to the Free
|
|
|
c7aa529 |
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
c7aa529 |
+ 02111-1307 USA. */
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+static inline int
|
|
|
c7aa529 |
+is_ia64 (void)
|
|
|
c7aa529 |
+{
|
|
|
c7aa529 |
+ unsigned int fl1, fl2;
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ /* See if we can use cpuid. */
|
|
|
c7aa529 |
+ __asm__ ("pushfl; pushfl; popl %0; movl %0,%1; xorl %2,%0;"
|
|
|
c7aa529 |
+ "pushl %0; popfl; pushfl; popl %0; popfl"
|
|
|
c7aa529 |
+ : "=&r" (fl1), "=&r" (fl2)
|
|
|
c7aa529 |
+ : "i" (0x00200000));
|
|
|
c7aa529 |
+ if (((fl1 ^ fl2) & 0x00200000) == 0)
|
|
|
c7aa529 |
+ return 0;
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ /* Host supports cpuid. See if cpuid gives capabilities, try
|
|
|
c7aa529 |
+ CPUID(0). Preserve %ebx and %ecx; cpuid insn clobbers these, we
|
|
|
c7aa529 |
+ don't need their CPUID values here, and %ebx may be the PIC
|
|
|
c7aa529 |
+ register. */
|
|
|
c7aa529 |
+ __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
|
|
|
c7aa529 |
+ : "=a" (fl1) : "0" (0) : "edx", "cc");
|
|
|
c7aa529 |
+ if (fl1 == 0)
|
|
|
c7aa529 |
+ return 0;
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+ /* Invoke CPUID(1), return %edx; caller can examine bits to
|
|
|
c7aa529 |
+ determine what's supported. */
|
|
|
c7aa529 |
+ __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
|
|
|
c7aa529 |
+ : "=d" (fl2), "=a" (fl1) : "1" (1) : "cc");
|
|
|
c7aa529 |
+ return (fl2 & (1 << 30)) != 0;
|
|
|
c7aa529 |
+}
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+#define arch_startup(argc, argv) \
|
|
|
c7aa529 |
+ do { \
|
|
|
c7aa529 |
+ /* On IA-64, try to execute 64-bit ldconfig if possible. \
|
|
|
c7aa529 |
+ This is because the badly designed /emul/ia32-linux hack \
|
|
|
c7aa529 |
+ will cause 32-bit ldconfig to do all sorts of weird things. */ \
|
|
|
c7aa529 |
+ if (is_ia64 ()) \
|
|
|
c7aa529 |
+ execv ("/emul/ia32-linux/../../sbin/ldconfig", \
|
|
|
c7aa529 |
+ (char *const *) argv); \
|
|
|
c7aa529 |
+ } while (0)
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+#include_next <dl-cache.h>
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1
|
|
|
c7aa529 |
@@ -22,4 +22,31 @@
|
|
|
c7aa529 |
#define _dl_cache_check_flags(flags) \
|
|
|
c7aa529 |
((flags) == _DL_CACHE_DEFAULT_ID)
|
|
|
c7aa529 |
|
|
|
c7aa529 |
+#define EMUL_HACK "/emul/ia32-linux"
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+#define arch_startup(argc, argv) unlink (EMUL_HACK LD_SO_CACHE)
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
+#define add_arch_dirs(config_file) \
|
|
|
c7aa529 |
+ do { \
|
|
|
c7aa529 |
+ int save_verbose = opt_verbose; \
|
|
|
c7aa529 |
+ opt_verbose = 0; \
|
|
|
c7aa529 |
+ \
|
|
|
c7aa529 |
+ parse_conf (config_file, EMUL_HACK, true); \
|
|
|
c7aa529 |
+ \
|
|
|
c7aa529 |
+ /* Always add the standard search paths. */ \
|
|
|
c7aa529 |
+ add_system_dir (EMUL_HACK SLIBDIR); \
|
|
|
c7aa529 |
+ if (strcmp (SLIBDIR, LIBDIR)) \
|
|
|
c7aa529 |
+ add_system_dir (EMUL_HACK LIBDIR); \
|
|
|
c7aa529 |
+ \
|
|
|
c7aa529 |
+ char emul_config_file[strlen (config_file) \
|
|
|
c7aa529 |
+ + sizeof EMUL_HACK]; \
|
|
|
c7aa529 |
+ strcpy (mempcpy (emul_config_file, EMUL_HACK, \
|
|
|
c7aa529 |
+ strlen (EMUL_HACK)), config_file); \
|
|
|
c7aa529 |
+ \
|
|
|
c7aa529 |
+ if (! access (emul_config_file, R_OK)) \
|
|
|
c7aa529 |
+ parse_conf (emul_config_file, EMUL_HACK, true); \
|
|
|
c7aa529 |
+ \
|
|
|
c7aa529 |
+ opt_verbose = save_verbose; \
|
|
|
c7aa529 |
+ } while (0)
|
|
|
c7aa529 |
+
|
|
|
c7aa529 |
#include_next <dl-cache.h>
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1
|
|
|
c7aa529 |
@@ -0,0 +1,5 @@
|
|
|
c7aa529 |
+#ifdef IS_IN_ldconfig
|
|
|
c7aa529 |
+#include <sysdeps/i386/dl-procinfo.c>
|
|
|
c7aa529 |
+#else
|
|
|
c7aa529 |
+#include <sysdeps/generic/dl-procinfo.c>
|
|
|
c7aa529 |
+#endif
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1
|
|
|
c7aa529 |
@@ -0,0 +1,5 @@
|
|
|
c7aa529 |
+#ifdef IS_IN_ldconfig
|
|
|
c7aa529 |
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
|
|
|
c7aa529 |
+#else
|
|
|
c7aa529 |
+#include <sysdeps/generic/dl-procinfo.h>
|
|
|
c7aa529 |
+#endif
|
|
|
623fb2e |
--- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2
|
|
|
623fb2e |
+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1
|
|
|
c7aa529 |
@@ -1 +1 @@
|
|
|
c7aa529 |
-s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_
|
|
|
c7aa529 |
+s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
|