[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r18833 - in /trunk: ./ libc/ libc/include/ libc/nptl/ libc/nptl/sysdeps/unix/sysv/linux/i386/ libc/nptl/sysdeps/unix/sysv/li...



Author: joseph
Date: Wed May 30 19:53:28 2012
New Revision: 18833

Log:
Merge changes between r18761 and r18832 from /fsf/trunk.

Added:
    trunk/libc/sysdeps/unix/sysv/linux/i386/Implies
      - copied unchanged from r18832, fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/Implies
    trunk/libc/sysdeps/unix/sysv/linux/x86/
      - copied from r18832, fsf/trunk/libc/sysdeps/unix/sysv/linux/x86/
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/64/Makefile
      - copied unchanged from r18832, fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/64/Makefile
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/Makefile
      - copied unchanged from r18832, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/Makefile
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile
      - copied unchanged from r18832, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile
      - copied unchanged from r18832, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile
    trunk/ports/sysdeps/unix/sysv/linux/tile/tilegx/Makefile
      - copied unchanged from r18832, fsf/trunk/ports/sysdeps/unix/sysv/linux/tile/tilegx/Makefile
Removed:
    trunk/libc/include/stubs-biarch.h
    trunk/ports/sysdeps/unix/sysv/linux/alpha/getitimer.S
    trunk/ports/sysdeps/unix/sysv/linux/alpha/getrusage.S
    trunk/ports/sysdeps/unix/sysv/linux/alpha/gettimeofday.S
    trunk/ports/sysdeps/unix/sysv/linux/alpha/select.S
    trunk/ports/sysdeps/unix/sysv/linux/alpha/setitimer.S
    trunk/ports/sysdeps/unix/sysv/linux/alpha/settimeofday.S
    trunk/ports/sysdeps/unix/sysv/linux/alpha/utimes.S
    trunk/ports/sysdeps/unix/sysv/linux/alpha/wait4.S
Modified:
    trunk/   (props changed)
    trunk/libc/ChangeLog
    trunk/libc/Makeconfig
    trunk/libc/Makefile
    trunk/libc/NEWS
    trunk/libc/configure
    trunk/libc/configure.in
    trunk/libc/nptl/ChangeLog
    trunk/libc/nptl/nptl-init.c
    trunk/libc/nptl/pthreadP.h
    trunk/libc/nptl/pthread_getspecific.c
    trunk/libc/nptl/pthread_key_create.c
    trunk/libc/nptl/pthread_mutex_destroy.c
    trunk/libc/nptl/pthread_mutex_init.c
    trunk/libc/nptl/pthread_mutex_lock.c
    trunk/libc/nptl/pthread_mutex_unlock.c
    trunk/libc/nptl/pthread_once.c
    trunk/libc/nptl/pthread_rwlock_rdlock.c
    trunk/libc/nptl/pthread_rwlock_unlock.c
    trunk/libc/nptl/pthread_rwlock_wrlock.c
    trunk/libc/nptl/pthread_setspecific.c
    trunk/libc/nptl/sem_open.c
    trunk/libc/nptl/sem_unlink.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
    trunk/libc/po/hr.po
    trunk/libc/scripts/abilist.awk
    trunk/libc/scripts/lib-names.awk
    trunk/libc/scripts/soversions.awk
    trunk/libc/shlib-versions
    trunk/libc/sysdeps/powerpc/powerpc32/dl-irel.h
    trunk/libc/sysdeps/sh/_mcount.S
    trunk/libc/sysdeps/sh/sh4/fpu/fclrexcpt.c
    trunk/libc/sysdeps/sh/sh4/fpu/fedisblxcpt.c
    trunk/libc/sysdeps/sh/sh4/fpu/feenablxcpt.c
    trunk/libc/sysdeps/sh/sh4/fpu/fegetenv.c
    trunk/libc/sysdeps/sh/sh4/fpu/fegetexcept.c
    trunk/libc/sysdeps/sh/sh4/fpu/fegetround.c
    trunk/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c
    trunk/libc/sysdeps/sh/sh4/fpu/fesetenv.c
    trunk/libc/sysdeps/sh/sh4/fpu/fesetround.c
    trunk/libc/sysdeps/sh/sh4/fpu/feupdateenv.c
    trunk/libc/sysdeps/sh/sh4/fpu/fraiseexcpt.c
    trunk/libc/sysdeps/sh/sh4/fpu/fsetexcptflg.c
    trunk/libc/sysdeps/sh/sh4/fpu/ftestexcept.c
    trunk/libc/sysdeps/sparc/sparc32/soft-fp/q_util.c
    trunk/libc/sysdeps/sparc/sparc32/soft-fp/sfp-machine.h
    trunk/libc/sysdeps/sparc/sparc64/soft-fp/Versions
    trunk/libc/sysdeps/sparc/sparc64/soft-fp/qp_util.c
    trunk/libc/sysdeps/sparc/sparc64/soft-fp/sfp-machine.h
    trunk/libc/sysdeps/unix/make-syscalls.sh
    trunk/libc/sysdeps/unix/sh/sysdep.S
    trunk/libc/sysdeps/unix/sysv/linux/Makefile
    trunk/libc/sysdeps/unix/sysv/linux/ftruncate64.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/Makefile
    trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/Makefile
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c
    trunk/libc/sysdeps/unix/sysv/linux/s390/Makefile
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/nptl/ld.abilist
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libm.abilist
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libpthread.abilist
    trunk/libc/sysdeps/unix/sysv/linux/sh/sh3/setcontext.S
    trunk/libc/sysdeps/unix/sysv/linux/sh/sh3/swapcontext.S
    trunk/libc/sysdeps/unix/sysv/linux/sh/sh4/setcontext.S
    trunk/libc/sysdeps/unix/sysv/linux/sh/sh4/swapcontext.S
    trunk/libc/sysdeps/unix/sysv/linux/sparc/Makefile
    trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libc.abilist
    trunk/libc/sysdeps/unix/sysv/linux/truncate64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/Implies
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/Makefile
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/Makefile
    trunk/libc/sysdeps/x86_64/64/shlib-versions
    trunk/libc/sysdeps/x86_64/x32/shlib-versions
    trunk/ports/ChangeLog.alpha
    trunk/ports/ChangeLog.arm
    trunk/ports/ChangeLog.mips
    trunk/ports/ChangeLog.tile
    trunk/ports/sysdeps/arm/bits/predefs.h   (props changed)
    trunk/ports/sysdeps/arm/start.S
    trunk/ports/sysdeps/tile/libm-test-ulps
    trunk/ports/sysdeps/unix/sysv/linux/alpha/adjtime.c
    trunk/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
    trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/ld.abilist
    trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/libc.abilist
    trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/pthread_once.c
    trunk/ports/sysdeps/unix/sysv/linux/alpha/syscalls.list
    trunk/ports/sysdeps/unix/sysv/linux/arm/Makefile
    trunk/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
    trunk/ports/sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c
    trunk/ports/sysdeps/unix/sysv/linux/mips/Makefile
    trunk/ports/sysdeps/unix/sysv/linux/mips/nptl/pthread_once.c
    trunk/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
    trunk/ports/sysdeps/unix/sysv/linux/tile/nptl/pthread_once.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 30 19:53:28 2012
@@ -1,1 +1,1 @@
-/fsf/trunk:15224-18761
+/fsf/trunk:15224-18832

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Wed May 30 19:53:28 2012
@@ -1,4 +1,175 @@
+2012-05-30  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14183]
+	* sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h (__NLINK_T_TYPE):
+	Defined with __UWORD_TYPE if __x86_64__ isn't defined.
+
+2012-05-30  Richard Henderson  <rth@xxxxxxxxxxx>
+
+	* sysdeps/unix/make-syscalls.sh: Protect symbol_version output
+	with #ifndef NOT_IN_libc.
+
+	* scripts/abilist.awk: Accept 8 fields.  Handle Alpha functions
+	marked to avoid plt entry.
+
+2012-05-30  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14112]
+	* Makeconfig (default-abi): New macro.
+	(abi-includes): Likewise.
+	($(common-objpfx)soversions.mk): Remove WORDSIZE check.  Use
+	$(abi-$(default-abi)-lib-soname) for soname if defined.
+	($(common-objpfx)gnu/lib-names.stmp): Generate from
+	abi-variants.
+	* Makefile (installed-stubs): Likewise.
+	* include/stubs-biarch.h: Removed.
+	* scripts/lib-names.awk: Only handle one library at a time.
+	* scripts/soversions.awk: Remove WORDSIZE support.
+	* shlib-versions: Remove WORDSIZE and i.86/s390x/powerpc64 ld
+	entries.
+	* sysdeps/unix/sysv/linux/Makefile (syscall-list-variants):
+	Removed.
+	(syscall-list-default-condition): Likewise.
+	(syscall-list-default-condition): Likewise.
+	(syscall-list-includes): Likewise.
+	($(objpfx)bits/syscall%h $(objpfx)bits/syscall%d): Replace
+	syscall-list-* with abi-*.  Handle undefined abi-variants.
+	* sysdeps/unix/sysv/linux/i386/Makefile (default-abi): New macro.
+	* sysdeps/unix/sysv/linux/i386/Implies: New file.
+	* sysdeps/unix/sysv/linux/x86/Makefile: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/64/Makefile: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/Implies: Add unix/sysv/linux/x86.
+	* sysdeps/unix/sysv/linux/x86_64/Makefile (syscall-list-variants):
+	Removed.
+	(syscall-list-32-options): Likewise.
+	(syscall-list-32-condition): Likewise.
+	(syscall-list-64-options): Likewise.
+	(syscall-list-64-condition): Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/x32/Makefile (default-abi): New
+	macro.
+	* sysdeps/unix/sysv/linux/powerpc/Makefile (syscall-list-*):
+	Renamed to ...
+	(abi-*): This.
+	(abi-64-ld-soname): New macro.
+	* sysdeps/unix/sysv/linux/s390/Makefile: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/Makefile (syscall-list-*):
+	Renamed to ...
+	(abi-*): This.
+	* sysdeps/x86_64/64/shlib-versions: Remove ld entry.
+	* sysdeps/x86_64/x32/shlib-versions: Likewise.
+
+2012-05-30  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_TRUNCATE64_SYSCALL): Remove all definitions.
+	* sysdeps/unix/sysv/linux/ftruncate64.c: Do not
+	include <kernel-features.h>.
+	[!__NR_ftruncate64]: Remove conditional code.
+	[!__ASSUME_TRUNCATE64_SYSCALL]: Likewise.
+	[__NR_ftruncate64]: Make code unconditional.
+	[__ASSUME_TRUNCATE64_SYSCALL]: Likewise.
+	* sysdeps/unix/sysv/linux/truncate64.c: Do not
+	include <kernel-features.h>.
+	[!__NR_ftruncate64]: Remove conditional code.
+	[!__ASSUME_TRUNCATE64_SYSCALL]: Likewise.
+	[__NR_ftruncate64]: Make code unconditional.
+	[__ASSUME_TRUNCATE64_SYSCALL]: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c: Do not
+	include <kernel-features.h>.
+	[!__NR_ftruncate64]: Remove conditional code.
+	[!__ASSUME_TRUNCATE64_SYSCALL]: Likewise.
+	[__NR_ftruncate64]: Make code unconditional.
+	[__ASSUME_TRUNCATE64_SYSCALL]: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c: Do not
+	include <kernel-features.h>.
+	[!__NR_ftruncate64]: Remove conditional code.
+	[!__ASSUME_TRUNCATE64_SYSCALL]: Likewise.
+	[__NR_ftruncate64]: Make code unconditional.
+	[__ASSUME_TRUNCATE64_SYSCALL]: Likewise.
+
+	* configure.in (libc_cv_fpie): Weaken to a compile test using
+	LIBC_TRY_CC_OPTION.
+	* configure: Regenerated.
+
+2012-05-29  Andreas Krebbel  <Andreas.Krebbel@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist: Refreshed.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist: Refreshed.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist: Refreshed.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist:
+	Refreshed.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist: Refreshed.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist: Refreshed.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/ld.abilist: Refreshed.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist: Refreshed.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libm.abilist: Refreshed.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libpthread.abilist:
+	Refreshed.
+
+2012-05-27  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/sparc/sparc32/soft-fp/q_util.c (___Q_numbers): Delete.
+	(___Q_zero): New.
+	(__Q_simulate_exceptions): Return void.  Change to simulate
+	exceptions by writing into the %fsr.
+	* sysdeps/sparc/sparc64/soft-fp/qp_util.c
+	(__Qp_handle_exceptions): Likewise.
+	(numbers): Delete.
+	* sysdeps/sparc/sparc64/soft-fp/Versions: Remove entry for
+	__Qp_handle_exceptions.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libc.abilist: Remove
+	__Qp_handle_exceptions.
+	* sysdeps/sparc/sparc32/soft-fp/sfp-machine.h (_FP_DECL_EX): Mark
+	as unused and give dummy FP_RND_NEAREST initializer.
+	(FP_INHIBIT_RESULTS): Define.
+	(___Q_simulate_exceptions): Update declaration.
+	(FP_HANDLE_EXCEPTIONS): Use ___Q_zero and tidy inline asm
+	formatting.
+	* sysdeps/sparc/sparc64/soft-fp/sfp-machine.h (_FP_DECL_EX): Mark
+	as unused and give dummy FP_RND_NEAREST initializer.
+	(__Qp_handle_exceptions): Update declaration.
+	(FP_HANDLE_EXCEPTIONS, QP_NO_EXCEPTIONS): Tidy inline asm
+	formatting.
+
+2012-05-27  Thomas Schwinge  <thomas@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/sh/sh4/fpu/fclrexcpt.c (feclearexcept): Use fpu_control_t for
+	the temporary FPU control word.
+	* sysdeps/sh/sh4/fpu/fedisblxcpt.c (fedisableexcept): Likewise.
+	* sysdeps/sh/sh4/fpu/feenablxcpt.c (feenableexcept): Likewise.
+	* sysdeps/sh/sh4/fpu/fegetenv.c (fegetenv): Likewise.
+	* sysdeps/sh/sh4/fpu/fegetexcept.c (fegetexcept): Likewise.
+	* sysdeps/sh/sh4/fpu/fegetround.c (fegetround): Likewise.
+	* sysdeps/sh/sh4/fpu/feholdexcpt.c (feholdexcept): Likewise.
+	* sysdeps/sh/sh4/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/sh/sh4/fpu/fesetround.c (fesetround): Likewise.
+	* sysdeps/sh/sh4/fpu/feupdateenv.c (feupdateenv): Likewise.
+	* sysdeps/sh/sh4/fpu/fsetexcptflg.c (fesetexceptflag): Likewise.
+	* sysdeps/sh/sh4/fpu/ftestexcept.c (fetestexcept): Likewise.
+
+2012-05-27  Kaz Kojima  <kkojima@xxxxxxxxxxxxxx>
+
+	* sysdeps/sh/sh4/fpu/fraiseexcpt.c (feraiseexcept): Restore fpscr flag
+	fields.
+
+2012-05-27  Chung-Lin Tang  <cltang@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/sh/_mcount.S (_mount): Add CFI directives.
+	* sysdeps/unix/sh/sysdep.S (__syscall_error): Likewise.
+	* sysdeps/unix/sysv/linux/sh/sh3/setcontext.S (__setcontext): Likewise.
+	* sysdeps/unix/sysv/linux/sh/sh3/swapcontext.S (__swapcontext):
+	Likewise.
+	* sysdeps/unix/sysv/linux/sh/sh4/setcontext.S (__setcontext): Likewise.
+	* sysdeps/unix/sysv/linux/sh/sh4/swapcontext.S (__swapcontext):
+	Likewise.
+
+2012-05-27  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* po/h.po: Update from translation team.
+
 2012-05-26  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/powerpc/powerpc32/dl-irel.h: Include <ldsodefs.h>.
 
 	* sysdeps/ieee754/dbl-64/s_logb.c (__logb): Optimize
 	handling of denormals.

Modified: trunk/libc/Makeconfig
==============================================================================
--- trunk/libc/Makeconfig (original)
+++ trunk/libc/Makeconfig Wed May 30 19:53:28 2012
@@ -799,6 +799,24 @@
 	sed '/^[ 	]*#/d;/^[ 	]*$$/d' $< > $@T
 	mv -f $@T $@
 
+# To generate a header to support more than one ABI for different
+# architecture variants, the CPU/Makefile defines abi-variants to be a
+# list of names for those variants (e.g. 32 64), and, for each variant,
+# defines abi-$(variant)-condition to be the condition for those options
+# to use in a C #if condition.  abi-includes may be defined to a list of
+# headers to include in the generated header, if the default does not
+# suffice.
+
+ifdef abi-variants
+ifndef default-abi
+default-abi = $(firstword $(abi-variants))
+endif
+endif
+
+ifndef abi-includes
+abi-includes := bits/wordsize.h
+endif
+
 # Process the shlib-versions file, which tells us what shared library
 # version numbers to use when we install shared objects on this system.
 # We need to wait until $(subdirs) is complete.
@@ -824,24 +842,17 @@
 	       -f $^ > $@T
 	mv -f $@T $@
 $(common-objpfx)soversions.mk: $(common-objpfx)soversions.i $(..)Makeconfig
-	(seen_DEFAULT=0; seen_WORDSIZE32=0; seen_WORDSIZE64=0; \
-	 while read which lib number setname; do \
+	(while read which lib number setname; do \
 	   eval seen_$$which=1; \
 	   test x"$$which" != xABI || echo abi-name = "$$lib"; \
 	   test x"$$which" = xDEFAULT || continue; \
 	   case $$number in \
 	     [0-9]*) echo "$$lib.so-version=.$$number"; \
 		     echo "all-sonames+=$$lib=$$lib.so\$$($$lib.so-version)";;\
-	     *)	     echo "$$lib.so-version=$$number"; \
+	     *)	     echo "$$lib.so-version=\$$(if \$$(abi-$(default-abi)-$$lib-soname),\$$(abi-$(default-abi)-$$lib-soname),$$number)"; \
 		     echo "all-sonames+=$$lib=\$$($$lib.so-version)";;\
 	   esac; \
 	 done; \
-	 case "$$seen_DEFAULT$$seen_WORDSIZE32$$seen_WORDSIZE64" in \
-	   100) echo biarch = no;; \
-	   101) echo biarch = 32;; \
-	   ?1?) echo biarch = 64;; \
-	   *) echo >&2 BUG; exit 2;; \
-	 esac; \
 	 echo soversions.mk-done = t;) < $< > $@T; exit 0
 	mv -f $@T $@
 endif
@@ -858,8 +869,31 @@
 $(common-objpfx)gnu/lib-names.stmp: $(..)scripts/lib-names.awk \
 				    $(common-objpfx)soversions.i
 	$(make-target-directory)
-	@rm -f ${@:stmp=T} $@
-	LC_ALL=C $(AWK) -f $^ > ${@:stmp=T}
+	{ \
+	 echo '/* This file is automatically generated.';\
+	 echo '   It defines macros to allow user program to find the shared'; \
+	 echo '   library files which come as part of GNU libc.  */'; \
+	 echo '#ifndef __GNU_LIB_NAMES_H'; \
+	 echo '#define __GNU_LIB_NAMES_H	1'; \
+	 echo ''; \
+	 $(if $(abi-includes), \
+	  $(foreach h,$(abi-includes), echo '#include <$(h)>';) \
+	  echo '';) \
+	 $(if $(abi-variants), \
+	 $(foreach v,$(abi-variants),\
+	 $(if $(abi-$(v)-condition),\
+	 echo '#if $(abi-$(v)-condition)'; \
+	 ($(foreach s,$(all-sonames), \
+	   $(if $(abi-$(v)-$(firstword $(subst =, ,$(s)))-soname),\
+	     echo $(firstword $(subst =, ,$(s)))=$(abi-$(v)-$(firstword $(subst =, ,$(s)))-soname);, \
+	     echo $(s);))) \
+	 | LC_ALL=C $(AWK) -v multi=1 -f $(firstword $^) | LC_ALL=C sort;) \
+	 $(if $(abi-$(v)-condition),echo '#endif';)), \
+	 ($(foreach s,$(all-sonames), echo $(s);)) \
+	 | LC_ALL=C $(AWK) -f $(firstword $^) | LC_ALL=C sort;) \
+	 echo ''; \
+	 echo '#endif	/* gnu/lib-names.h */'; \
+	} >  ${@:stmp=T}
 	$(move-if-change) ${@:stmp=T} ${@:stmp=h}
 	touch $@
 endif

Modified: trunk/libc/Makefile
==============================================================================
--- trunk/libc/Makefile (original)
+++ trunk/libc/Makefile Wed May 30 19:53:28 2012
@@ -189,14 +189,29 @@
 
 installed-stubs = 
 else 
-ifeq ($(biarch),no)
+ifndef abi-variants
 installed-stubs = $(inst_includedir)/gnu/stubs.h
 else
-installed-stubs = $(inst_includedir)/gnu/stubs-$(biarch).h
-
-$(inst_includedir)/gnu/stubs.h: include/stubs-biarch.h $(+force)
+installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h
+
+$(inst_includedir)/gnu/stubs.h: $(common-objpfx)soversions.mk $(+force)
 	$(make-target-directory)
-	$(INSTALL_DATA) $< $@
+	{ \
+	 echo '/* This file is automatically generated.';\
+	 echo "   This file selects the right generated file of \`__stub_FUNCTION' macros";\
+	 echo '   based on the architecture being compiled for.  */'; \
+	 echo ''; \
+	 $(foreach h,$(abi-includes), echo '#include <$(h)>';) \
+	 echo ''; \
+	 $(foreach v,$(abi-variants),\
+	 $(if $(abi-$(v)-condition),\
+	 echo '#if $(abi-$(v)-condition)'; \
+	 echo '# include <gnu/stubs-$(v).h>'); \
+	 $(if $(abi-$(v)-condition),echo '#endif';) \
+	 rm -f $(@:.d=.h).new$(v); \
+	 ) \
+	} > $(@:.d=.h).new
+	mv -f $(@:.d=.h).new $(@:.d=.h)
 
 install-others-nosubdir: $(installed-stubs)
 endif

Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Wed May 30 19:53:28 2012
@@ -27,8 +27,14 @@
   13916, 13917, 13918, 13919, 13920, 13921, 13922, 13923, 13924, 13926,
   13927, 13928, 13938, 13941, 13942, 13954, 13955, 13956, 13963, 13967,
   13968, 13970, 13973, 13979, 13983, 13986, 14012, 14027, 14033, 14034,
-  14036, 14040, 14043, 14044, 14049, 14053, 14055, 14059, 14064, 14080,
-  14083, 14103, 14104, 14109, 14122, 14123, 14153
+  14036, 14040, 14043, 14044, 14049, 14053, 14055, 14059, 14064, 14075,
+  14080, 14083, 14103, 14104, 14109, 14112, 14122, 14123, 14153, 14183
+
+* Support for the x32 ABI on x86-64 added.  The x32 target is selected by
+  configuring glibc with:
+	BUILD_CC='gcc' CC='gcc -mx32' CXX='g++ -mx32'
+  Visit <http://sites.google.com/site/x32abi/> for more x32 ABI info.
+  Implemented by H.J. Lu.
 
 * ISO C11 support:
 
@@ -82,6 +88,27 @@
   So far the setjmp/longjmp probes and some of the libpthread probes are
   provided only for i*86 and x86_64.
   Implemented by Roland McGrath and Rayson Ho.
+
+* Optimized expf for x86-32 and x86-64.  Implemented by Liubov Dmitrieva.
+
+* More optimized functions for PowerPC.  Implemented by Adhemerval Zanella.
+
+* More optimized functions for SPARC.  Implemented by David S. Miller.
+
+* Improved support for cross-compilation, especially bootstrap builds
+  without a previously built glibc.
+
+* Ports for the TILE-Gx and TILEPro families of processors.  Contributed by
+  Chris Metcalf from Tilera.
+
+* Support for the old ARM ABI has been removed from ports.  Only the EABI is
+  now supported for ARM processors.
+
+* The hard-float variant of the ARM EABI now uses /lib/ld-linux-armhf.so.3
+  as the name of the dynamic linker, to distinguish it from the
+  /lib/ld-linux.so.3 dynamic linker used for the base EABI.
+
+* Support for CRIS has been removed from ports.
 
 Version 2.15
 

Modified: trunk/libc/configure
==============================================================================
--- trunk/libc/configure (original)
+++ trunk/libc/configure Wed May 30 19:53:28 2012
@@ -6580,7 +6580,26 @@
 $as_echo "$libc_cv_z_execstack" >&6; }
 
 
-libc_cv_fpie=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fpie" >&5
+$as_echo_n "checking for -fpie... " >&6; }
+if ${libc_cv_fpie+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if { ac_try='${CC-cc} -fpie -xc /dev/null -S -o /dev/null'
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  libc_cv_fpie=yes
+else
+  libc_cv_fpie=no
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_fpie" >&5
+$as_echo "$libc_cv_fpie" >&6; }
+
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style option" >&5

Modified: trunk/libc/configure.in
==============================================================================
--- trunk/libc/configure.in (original)
+++ trunk/libc/configure.in Wed May 30 19:53:28 2012
@@ -1650,11 +1650,10 @@
 rm -f conftest*])
 AC_SUBST(libc_cv_z_execstack)
 
-dnl A build-and-link test for this fails during a bootstrap build,
-dnl since we haven't yet built startup files needed for the link.
-dnl However, we require versions of GCC and binutils that are new
-dnl enough that -fpie should always work.
-libc_cv_fpie=yes
+AC_CACHE_CHECK(for -fpie, libc_cv_fpie, [dnl
+LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpie=yes], [libc_cv_fpie=no])
+])
+
 AC_SUBST(libc_cv_fpie)
 
 AC_CACHE_CHECK(for --hash-style option,

Removed: trunk/libc/include/stubs-biarch.h
==============================================================================
--- trunk/libc/include/stubs-biarch.h (original)
+++ trunk/libc/include/stubs-biarch.h (removed)
@@ -1,12 +1,0 @@
-/* This file selects the right generated file of `__stub_FUNCTION' macros
-   based on the architecture being compiled for.  */
-
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-# include <gnu/stubs-32.h>
-#elif __WORDSIZE == 64
-# include <gnu/stubs-64.h>
-#else
-# error "unexpected value for __WORDSIZE macro"
-#endif

Modified: trunk/libc/nptl/ChangeLog
==============================================================================
--- trunk/libc/nptl/ChangeLog (original)
+++ trunk/libc/nptl/ChangeLog Wed May 30 19:53:28 2012
@@ -1,3 +1,82 @@
+2012-05-30  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	[BZ #14132]
+	* nptl-init.c (pthread_functions): Remove use of INTUSE and
+	_internal aliases.
+	(__pthread_initialize_minimal_internal): Likewise.
+	* sem_open.c: Likewise.
+	* sem_unlink.c: Likewise.
+	* pthreadP.h: Replace _internal aliases by hidden_proto
+	declarations.
+	* pthread_getspecific.c: Replace _internal alias by hidden_def.
+	* pthread_key_create.c: Likewise.
+	* pthread_mutex_destroy.c: Likewise.
+	* pthread_mutex_init.c: Likewise.
+	* pthread_mutex_lock.c: Likewise.
+	* pthread_mutex_unlock.c: Likewise.
+	* pthread_once.c: Likewise.
+	* pthread_rwlock_rdlock.c: Likewise.
+	* pthread_rwlock_unlock.c: Likewise.
+	* pthread_rwlock_wrlock.c: Likewise.
+	* pthread_setspecific.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S:
+	Likewise.
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S:
+	Likewise.
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S:
+	Likewise.
+	* sysdeps/unix/sysv/linux/i386/pthread_once.S: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/pthread_once.c: Likewise.
+	* sysdeps/unix/sysv/linux/s390/pthread_once.c: Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_once.S: Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S: Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S: Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/pthread_once.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/pthread_once.S: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S:
+	Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S:
+	Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S:
+	Likewise.
+
+2012-05-27  Chung-Lin Tang  <cltang@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (PSEUDO, LOAD_ARGS_1)
+	(LOAD_ARGS_2 ,LOAD_ARGS_3 ,LOAD_ARGS_4): Add CFI restores.
+
+	* sysdeps/unix/sysv/linux/sh/lowlevellock.S (__lll_lock_wait_private)
+	(__lll_lock_wait, __lll_timedlock_wait, __lll_timedwait_tid): Add CFI
+	directives.
+	* sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
+	(__lll_robust_lock_wait, __lll_robust_timedlock_wait): Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S
+	(pthread_barrier_wait): Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
+	(__pthread_cond_broadcast): Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
+	(__pthread_cond_signal): Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
+	(__pthread_cond_timedwait): Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S (__pthread_cond_wait):
+	Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
+	(__pthread_rwlock_rdlock): Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
+	(pthread_rwlock_timedrdlock): Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
+	(pthread_rwlock_timedwrlock): Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
+	(__pthread_rwlock_unlock): Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
+	(__pthread_rwlock_wrlock): Likewise.
+	* sysdeps/unix/sysv/linux/sh/sem_post.S (__new_sem_post): Likewise.
+	* sysdeps/unix/sysv/linux/sh/sem_timedwait.S (sem_timedwait): Likewise.
+	* sysdeps/unix/sysv/linux/sh/sem_trywait.S (__new_sem_trywait):
+	Likewise.
+	* sysdeps/unix/sysv/linux/sh/sem_wait.S (__new_sem_wait): Likewise.
+
 2012-05-26  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
 
 	[BZ #12416]

Modified: trunk/libc/nptl/nptl-init.c
==============================================================================
--- trunk/libc/nptl/nptl-init.c (original)
+++ trunk/libc/nptl/nptl-init.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -115,21 +115,21 @@
     .ptr___pthread_exit = __pthread_exit,
     .ptr_pthread_getschedparam = __pthread_getschedparam,
     .ptr_pthread_setschedparam = __pthread_setschedparam,
-    .ptr_pthread_mutex_destroy = INTUSE(__pthread_mutex_destroy),
-    .ptr_pthread_mutex_init = INTUSE(__pthread_mutex_init),
-    .ptr_pthread_mutex_lock = INTUSE(__pthread_mutex_lock),
-    .ptr_pthread_mutex_unlock = INTUSE(__pthread_mutex_unlock),
+    .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
+    .ptr_pthread_mutex_init = __pthread_mutex_init,
+    .ptr_pthread_mutex_lock = __pthread_mutex_lock,
+    .ptr_pthread_mutex_unlock = __pthread_mutex_unlock,
     .ptr_pthread_self = __pthread_self,
     .ptr_pthread_setcancelstate = __pthread_setcancelstate,
     .ptr_pthread_setcanceltype = __pthread_setcanceltype,
     .ptr___pthread_cleanup_upto = __pthread_cleanup_upto,
-    .ptr___pthread_once = __pthread_once_internal,
-    .ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock_internal,
-    .ptr___pthread_rwlock_wrlock = __pthread_rwlock_wrlock_internal,
-    .ptr___pthread_rwlock_unlock = __pthread_rwlock_unlock_internal,
-    .ptr___pthread_key_create = __pthread_key_create_internal,
-    .ptr___pthread_getspecific = __pthread_getspecific_internal,
-    .ptr___pthread_setspecific = __pthread_setspecific_internal,
+    .ptr___pthread_once = __pthread_once,
+    .ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock,
+    .ptr___pthread_rwlock_wrlock = __pthread_rwlock_wrlock,
+    .ptr___pthread_rwlock_unlock = __pthread_rwlock_unlock,
+    .ptr___pthread_key_create = __pthread_key_create,
+    .ptr___pthread_getspecific = __pthread_getspecific,
+    .ptr___pthread_setspecific = __pthread_setspecific,
     .ptr__pthread_cleanup_push_defer = __pthread_cleanup_push_defer,
     .ptr__pthread_cleanup_pop_restore = __pthread_cleanup_pop_restore,
     .ptr_nthreads = &__nptl_nthreads,
@@ -442,12 +442,12 @@
 
   /* Make __rtld_lock_{,un}lock_recursive use pthread_mutex_{,un}lock,
      keep the lock count from the ld.so implementation.  */
-  GL(dl_rtld_lock_recursive) = (void *) INTUSE (__pthread_mutex_lock);
-  GL(dl_rtld_unlock_recursive) = (void *) INTUSE (__pthread_mutex_unlock);
+  GL(dl_rtld_lock_recursive) = (void *) __pthread_mutex_lock;
+  GL(dl_rtld_unlock_recursive) = (void *) __pthread_mutex_unlock;
   unsigned int rtld_lock_count = GL(dl_load_lock).mutex.__data.__count;
   GL(dl_load_lock).mutex.__data.__count = 0;
   while (rtld_lock_count-- > 0)
-    INTUSE (__pthread_mutex_lock) (&GL(dl_load_lock).mutex);
+    __pthread_mutex_lock (&GL(dl_load_lock).mutex);
 
   GL(dl_make_stack_executable_hook) = &__make_stacks_executable;
 #endif

Modified: trunk/libc/nptl/pthreadP.h
==============================================================================
--- trunk/libc/nptl/pthreadP.h (original)
+++ trunk/libc/nptl/pthreadP.h Wed May 30 19:53:28 2012
@@ -408,23 +408,14 @@
 extern int __pthread_setcancelstate (int state, int *oldstate);
 extern int __pthread_mutex_init (pthread_mutex_t *__mutex,
 				 const pthread_mutexattr_t *__mutexattr);
-extern int __pthread_mutex_init_internal (pthread_mutex_t *__mutex,
-					  const pthread_mutexattr_t *__mutexattr)
-     attribute_hidden;
 extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
-extern int __pthread_mutex_destroy_internal (pthread_mutex_t *__mutex)
-     attribute_hidden;
 extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex);
 extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
-extern int __pthread_mutex_lock_internal (pthread_mutex_t *__mutex)
-     attribute_hidden;
 extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex)
      attribute_hidden internal_function;
 extern void __pthread_mutex_cond_lock_adjust (pthread_mutex_t *__mutex)
      attribute_hidden internal_function;
 extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
-extern int __pthread_mutex_unlock_internal (pthread_mutex_t *__mutex)
-     attribute_hidden;
 extern int __pthread_mutex_unlock_usercnt (pthread_mutex_t *__mutex,
 					   int __decr)
      attribute_hidden internal_function;
@@ -467,13 +458,10 @@
 				  __attr);
 extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
 extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
-extern int __pthread_rwlock_rdlock_internal (pthread_rwlock_t *__rwlock);
 extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock);
 extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock);
-extern int __pthread_rwlock_wrlock_internal (pthread_rwlock_t *__rwlock);
 extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
 extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
-extern int __pthread_rwlock_unlock_internal (pthread_rwlock_t *__rwlock);
 extern int __pthread_cond_broadcast (pthread_cond_t *cond);
 extern int __pthread_cond_destroy (pthread_cond_t *cond);
 extern int __pthread_cond_init (pthread_cond_t *cond,
@@ -486,17 +474,10 @@
 extern int __pthread_condattr_destroy (pthread_condattr_t *attr);
 extern int __pthread_condattr_init (pthread_condattr_t *attr);
 extern int __pthread_key_create (pthread_key_t *key, void (*destr) (void *));
-extern int __pthread_key_create_internal (pthread_key_t *key,
-					  void (*destr) (void *));
 extern void *__pthread_getspecific (pthread_key_t key);
-extern void *__pthread_getspecific_internal (pthread_key_t key);
 extern int __pthread_setspecific (pthread_key_t key, const void *value);
-extern int __pthread_setspecific_internal (pthread_key_t key,
-					   const void *value);
 extern int __pthread_once (pthread_once_t *once_control,
 			   void (*init_routine) (void));
-extern int __pthread_once_internal (pthread_once_t *once_control,
-				    void (*init_routine) (void));
 extern int __pthread_atfork (void (*prepare) (void), void (*parent) (void),
 			     void (*child) (void));
 extern pthread_t __pthread_self (void);
@@ -508,6 +489,20 @@
 extern void __pthread_disable_asynccancel (int oldtype)
      internal_function attribute_hidden;
 
+#if defined NOT_IN_libc && defined IS_IN_libpthread
+hidden_proto (__pthread_mutex_init)
+hidden_proto (__pthread_mutex_destroy)
+hidden_proto (__pthread_mutex_lock)
+hidden_proto (__pthread_mutex_unlock)
+hidden_proto (__pthread_rwlock_rdlock)
+hidden_proto (__pthread_rwlock_wrlock)
+hidden_proto (__pthread_rwlock_unlock)
+hidden_proto (__pthread_key_create)
+hidden_proto (__pthread_getspecific)
+hidden_proto (__pthread_setspecific)
+hidden_proto (__pthread_once)
+#endif
+
 extern int __pthread_cond_broadcast_2_0 (pthread_cond_2_0_t *cond);
 extern int __pthread_cond_destroy_2_0 (pthread_cond_2_0_t *cond);
 extern int __pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,

Modified: trunk/libc/nptl/pthread_getspecific.c
==============================================================================
--- trunk/libc/nptl/pthread_getspecific.c (original)
+++ trunk/libc/nptl/pthread_getspecific.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -65,4 +65,4 @@
   return result;
 }
 strong_alias (__pthread_getspecific, pthread_getspecific)
-strong_alias (__pthread_getspecific, __pthread_getspecific_internal)
+hidden_def (__pthread_getspecific)

Modified: trunk/libc/nptl/pthread_key_create.c
==============================================================================
--- trunk/libc/nptl/pthread_key_create.c (original)
+++ trunk/libc/nptl/pthread_key_create.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -50,4 +50,4 @@
   return EAGAIN;
 }
 strong_alias (__pthread_key_create, pthread_key_create)
-strong_alias (__pthread_key_create, __pthread_key_create_internal)
+hidden_def (__pthread_key_create)

Modified: trunk/libc/nptl/pthread_mutex_destroy.c
==============================================================================
--- trunk/libc/nptl/pthread_mutex_destroy.c (original)
+++ trunk/libc/nptl/pthread_mutex_destroy.c Wed May 30 19:53:28 2012
@@ -38,4 +38,4 @@
   return 0;
 }
 strong_alias (__pthread_mutex_destroy, pthread_mutex_destroy)
-INTDEF(__pthread_mutex_destroy)
+hidden_def (__pthread_mutex_destroy)

Modified: trunk/libc/nptl/pthread_mutex_init.c
==============================================================================
--- trunk/libc/nptl/pthread_mutex_init.c (original)
+++ trunk/libc/nptl/pthread_mutex_init.c Wed May 30 19:53:28 2012
@@ -140,4 +140,4 @@
   return 0;
 }
 strong_alias (__pthread_mutex_init, pthread_mutex_init)
-INTDEF(__pthread_mutex_init)
+hidden_def (__pthread_mutex_init)

Modified: trunk/libc/nptl/pthread_mutex_lock.c
==============================================================================
--- trunk/libc/nptl/pthread_mutex_lock.c (original)
+++ trunk/libc/nptl/pthread_mutex_lock.c Wed May 30 19:53:28 2012
@@ -478,7 +478,7 @@
 }
 #ifndef __pthread_mutex_lock
 strong_alias (__pthread_mutex_lock, pthread_mutex_lock)
-strong_alias (__pthread_mutex_lock, __pthread_mutex_lock_internal)
+hidden_def (__pthread_mutex_lock)
 #endif
 
 

Modified: trunk/libc/nptl/pthread_mutex_unlock.c
==============================================================================
--- trunk/libc/nptl/pthread_mutex_unlock.c (original)
+++ trunk/libc/nptl/pthread_mutex_unlock.c Wed May 30 19:53:28 2012
@@ -297,4 +297,4 @@
   return __pthread_mutex_unlock_usercnt (mutex, 1);
 }
 strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock)
-strong_alias (__pthread_mutex_unlock, __pthread_mutex_unlock_internal)
+hidden_def (__pthread_mutex_unlock)

Modified: trunk/libc/nptl/pthread_once.c
==============================================================================
--- trunk/libc/nptl/pthread_once.c (original)
+++ trunk/libc/nptl/pthread_once.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -51,3 +51,4 @@
   return 0;
 }
 strong_alias (__pthread_once, pthread_once)
+hidden_def (__pthread_once)

Modified: trunk/libc/nptl/pthread_rwlock_rdlock.c
==============================================================================
--- trunk/libc/nptl/pthread_rwlock_rdlock.c (original)
+++ trunk/libc/nptl/pthread_rwlock_rdlock.c Wed May 30 19:53:28 2012
@@ -97,4 +97,4 @@
 }
 
 weak_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock)
-strong_alias (__pthread_rwlock_rdlock, __pthread_rwlock_rdlock_internal)
+hidden_def (__pthread_rwlock_rdlock)

Modified: trunk/libc/nptl/pthread_rwlock_unlock.c
==============================================================================
--- trunk/libc/nptl/pthread_rwlock_unlock.c (original)
+++ trunk/libc/nptl/pthread_rwlock_unlock.c Wed May 30 19:53:28 2012
@@ -58,4 +58,4 @@
 }
 
 weak_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock)
-strong_alias (__pthread_rwlock_unlock, __pthread_rwlock_unlock_internal)
+hidden_def (__pthread_rwlock_unlock)

Modified: trunk/libc/nptl/pthread_rwlock_wrlock.c
==============================================================================
--- trunk/libc/nptl/pthread_rwlock_wrlock.c (original)
+++ trunk/libc/nptl/pthread_rwlock_wrlock.c Wed May 30 19:53:28 2012
@@ -89,4 +89,4 @@
 }
 
 weak_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock)
-strong_alias (__pthread_rwlock_wrlock, __pthread_rwlock_wrlock_internal)
+hidden_def (__pthread_rwlock_wrlock)

Modified: trunk/libc/nptl/pthread_setspecific.c
==============================================================================
--- trunk/libc/nptl/pthread_setspecific.c (original)
+++ trunk/libc/nptl/pthread_setspecific.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -92,4 +92,4 @@
   return 0;
 }
 strong_alias (__pthread_setspecific, pthread_setspecific)
-strong_alias (__pthread_setspecific, __pthread_setspecific_internal)
+hidden_def (__pthread_setspecific)

Modified: trunk/libc/nptl/sem_open.c
==============================================================================
--- trunk/libc/nptl/sem_open.c (original)
+++ trunk/libc/nptl/sem_open.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2006, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -231,7 +231,7 @@
   int fd;
 
   /* Determine where the shmfs is mounted.  */
-  INTUSE(__pthread_once) (&__namedsem_once, __where_is_shmfs);
+  __pthread_once (&__namedsem_once, __where_is_shmfs);
 
   /* If we don't know the mount points there is nothing we can do.  Ever.  */
   if (mountpoint.dir == NULL)

Modified: trunk/libc/nptl/sem_unlink.c
==============================================================================
--- trunk/libc/nptl/sem_unlink.c (original)
+++ trunk/libc/nptl/sem_unlink.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -32,7 +32,7 @@
   size_t namelen;
 
   /* Determine where the shmfs is mounted.  */
-  INTUSE(__pthread_once) (&__namedsem_once, __where_is_shmfs);
+  __pthread_once (&__namedsem_once, __where_is_shmfs);
 
   /* If we don't know the mount points there is nothing we can do.  Ever.  */
   if (mountpoint.dir == NULL)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S Wed May 30 19:53:28 2012
@@ -188,8 +188,5 @@
 	cfi_endproc
 	.size	__pthread_rwlock_rdlock,.-__pthread_rwlock_rdlock
 
-	.globl	pthread_rwlock_rdlock
-pthread_rwlock_rdlock = __pthread_rwlock_rdlock
-
-	.globl	__pthread_rwlock_rdlock_internal
-__pthread_rwlock_rdlock_internal = __pthread_rwlock_rdlock
+strong_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock)
+hidden_def (__pthread_rwlock_rdlock)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -147,8 +147,5 @@
 	cfi_endproc
 	.size	__pthread_rwlock_unlock,.-__pthread_rwlock_unlock
 
-	.globl	pthread_rwlock_unlock
-pthread_rwlock_unlock = __pthread_rwlock_unlock
-
-	.globl	__pthread_rwlock_unlock_internal
-__pthread_rwlock_unlock_internal = __pthread_rwlock_unlock
+strong_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock)
+hidden_def (__pthread_rwlock_unlock)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S Wed May 30 19:53:28 2012
@@ -179,8 +179,5 @@
 	cfi_endproc
 	.size	__pthread_rwlock_wrlock,.-__pthread_rwlock_wrlock
 
-	.globl	pthread_rwlock_wrlock
-pthread_rwlock_wrlock = __pthread_rwlock_wrlock
-
-	.globl	__pthread_rwlock_wrlock_internal
-__pthread_rwlock_wrlock_internal = __pthread_rwlock_wrlock
+strong_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock)
+hidden_def (__pthread_rwlock_wrlock)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2007, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -174,8 +174,5 @@
 	cfi_endproc
 	.size	__pthread_once,.-__pthread_once
 
-	.globl	__pthread_once_internal
-__pthread_once_internal = __pthread_once
-
-	.globl	pthread_once
-pthread_once = __pthread_once
+hidden_def (__pthread_once)
+strong_alias (__pthread_once, pthread_once)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Mackerras <paulus@xxxxxxxxxx>, 2003.
 
@@ -96,4 +96,4 @@
   return 0;
 }
 weak_alias (__pthread_once, pthread_once)
-strong_alias (__pthread_once, __pthread_once_internal)
+hidden_def (__pthread_once)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Martin Schwidefsky <schwidefsky@xxxxxxxxxx>, 2003.
 
@@ -107,4 +107,4 @@
   return 0;
 }
 weak_alias (__pthread_once, pthread_once)
-strong_alias (__pthread_once, __pthread_once_internal)
+hidden_def (__pthread_once)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S Wed May 30 19:53:28 2012
@@ -165,6 +165,8 @@
 	bf	1b
 
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	rts
 	 mov	r2, r0
 	cfi_endproc
@@ -208,7 +210,11 @@
 	bf	1b
 
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	ret
 	 mov	r2, r0
 	cfi_endproc
@@ -286,6 +292,7 @@
 5:
 	rts
 	 mov.l	@r15+, r12
+	/* Omit CFI for restore in delay slot.  */
 
 # ifndef __ASSUME_FUTEX_CLOCK_REALTIME
 	.align	2
@@ -305,6 +312,8 @@
 	mov.l	.L1g, r0
 	cmp/hs	r0, r1
 	bt	3f
+
+	cfi_remember_state
 
 	mov.l	r11, @-r15
 	cfi_adjust_cfa_offset(4)
@@ -386,17 +395,32 @@
 2:	mov	#ETIMEDOUT, r3
 
 6:
-	mov	r3, r0
 	add	#8, r15
+	cfi_adjust_cfa_offset (-8)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	mov.l	@r15+, r11
-	rts
-	 mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r11)
+	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
+	rts
+	 mov	r3, r0
+
+	cfi_restore_state
 
 3:
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	#EINVAL, r0
 # endif
@@ -521,10 +545,16 @@
 4:
 	mov	#0, r0
 3:
+	cfi_remember_state
 	add	#8, r15
+	cfi_adjust_cfa_offset (-8)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	rts
 	 mov.l	@r15+, r9
+	/* Omit CFI for restore in delay slot.  */
+	cfi_restore_state
 1:
 	/* Check whether the time expired.  */
 	mov	#-ETIMEDOUT, r1

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S Wed May 30 19:53:28 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -115,6 +114,8 @@
 
 3:
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	ret
 	 mov	r4, r0
 	cfi_endproc
@@ -231,12 +232,22 @@
 	mov	#0, r0
 
 6:
+	cfi_remember_state
 	add	#8, r15
+	cfi_adjust_cfa_offset (-8)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	rts
 	 mov.l	@r15+, r11
+	/* Omit CFI for restore in delay slot.  */
+	cfi_restore_state
 
 7:
 	/* Check whether the time expired.  */
@@ -248,6 +259,12 @@
 	bra	6b
 	 mov	#ETIMEDOUT, r0
 3:
+	/* Restore initial state for invalid timeout case.  */
+	cfi_restore (r8)
+	cfi_restore (r9)
+	cfi_restore (r10)
+	cfi_restore (r11)
+	cfi_def_cfa_offset (0)
 	rts
 	 mov	#EINVAL, r0
 	cfi_endproc

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -25,10 +25,17 @@
 	.globl	pthread_barrier_wait
 	.type	pthread_barrier_wait,@function
 	.align	5
+	cfi_startproc
 pthread_barrier_wait:
 	mov.l	r9, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r9, 0)
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	mov	r4, r8
 
 	/* Get the mutex.  */
@@ -98,11 +105,19 @@
 	bf	9f
 
 10:
-	mov	#0, r0		/* != PTHREAD_BARRIER_SERIAL_THREAD */
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
+	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	rts
-	 mov.l	@r15+, r9
+	 mov	#0, r0		/* != PTHREAD_BARRIER_SERIAL_THREAD */
+	cfi_restore_state
 
 3:
 	/* The necessary number of threads arrived.  */
@@ -140,11 +155,19 @@
 	tst	r2, r2
 	bf	4f
 5:
-	mov	#-1, r0		/* == PTHREAD_BARRIER_SERIAL_THREAD */
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
+	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	rts
-	 mov.l	@r15+, r9
+	 mov	#-1, r0		/* == PTHREAD_BARRIER_SERIAL_THREAD */
+	cfi_restore_state
 
 1:
 	mov.l	@(PRIVATE,r8), r6
@@ -200,6 +223,7 @@
 .Lwake2b:
 	bra	10b
 	 mov	r9, r6
+	cfi_endproc
 
 	.align	2
 .Lall:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,11 +30,20 @@
 	.globl	__pthread_cond_broadcast
 	.type	__pthread_cond_broadcast, @function
 	.align	5
+	cfi_startproc
 __pthread_cond_broadcast:
 	mov.l   r10, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r10, 0)
 	mov.l   r9, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r9, 0)
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	mov	r4, r8
 
 	/* Get internal lock.  */
@@ -136,12 +145,22 @@
 	 add	#cond_futex, r4
 
 10:
-	mov	#0, r0
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
+	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	rts
-	 mov.l	@r15+, r10
+	 mov	#0, r0
+	cfi_restore_state
 
 4:
 	/* Unlock.  */
@@ -153,12 +172,22 @@
 	tst	r2, r2
 	bf	5f
 6:
-	mov	#0, r0
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
+	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	rts
-	 mov.l	@r15+, r10
+	 mov	#0, r0
+	cfi_restore_state
 
 1:
 	/* Initial locking failed.  */
@@ -244,6 +273,7 @@
 	SYSCALL_INST_PAD
 	bra	10b
 	 nop
+	cfi_endproc
 
 #ifndef __ASSUME_PRIVATE_FUTEX
 .Lpfoff:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,9 +29,14 @@
 	.globl	__pthread_cond_signal
 	.type	__pthread_cond_signal, @function
 	.align	5
+	cfi_startproc
 __pthread_cond_signal:
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	mov	r4, r8
 
 	/* Get internal lock.  */
@@ -109,10 +114,16 @@
 	bt	7f
 
 6:
-	mov	#0, r0
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
+	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	rts
-	 mov.l	@r15+, r8
+	 mov	#0, r0
+	cfi_restore_state
 
 #ifndef __ASSUME_PRIVATE_FUTEX
 .Lpfoff:
@@ -178,6 +189,7 @@
 .Lwait4b:
 	bra	2b
 	 nop
+	cfi_endproc
 
 	.align	2
 .Lwait4:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -416,15 +416,31 @@
 	mov.l	@(24,r15), r0
 
 18:	
+	cfi_remember_state
 	add	#64, r15
+	cfi_adjust_cfa_offset (-64)
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r13
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r13)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	mov.l	@r15+, r11
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r11)
 	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	rts
 	 mov.l	@r15+, r8
+	/* Omit CFI for restore in delay slot.  */
+	cfi_restore_state
 
 #ifndef __ASSUME_PRIVATE_FUTEX
 .Lpfoff:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -285,14 +285,28 @@
 	/* We return the result of the mutex_lock operation.  */
 
 14:
+	cfi_remember_state
 	add	#48, r15
+	cfi_adjust_cfa_offset (-48)
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	mov.l	@r15+, r11
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r11)
 	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	rts
 	 mov.l	@r15+, r8
+	/* Omit CFI for restore in delay slot.  */
+	cfi_restore_state
 
 #ifndef __ASSUME_PRIVATE_FUTEX
 .Lpfoff0:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -253,8 +253,5 @@
 	.long	HIDDEN_JUMPTARGET(__pthread_unwind_next)-.Lunext0
 	.size	__pthread_once,.-__pthread_once
 
-	.globl	__pthread_once_internal
-__pthread_once_internal = __pthread_once
-
-	.globl	pthread_once
-pthread_once = __pthread_once
+hidden_def (__pthread_once)
+strong_alias (__pthread_once, pthread_once)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,11 +29,20 @@
 	.globl	__pthread_rwlock_rdlock
 	.type	__pthread_rwlock_rdlock,@function
 	.align	5
+	cfi_startproc
 __pthread_rwlock_rdlock:
 	mov.l	r12, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r12, 0)
 	mov.l	r9, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r9, 0)
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	mov	r4, r8
 
 	/* Get the lock.  */
@@ -134,12 +143,22 @@
 	tst	r2, r2
 	bf	6f
 7:
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	r3, r0
+	cfi_restore_state
 
 #ifndef __ASSUME_PRIVATE_FUTEX
 .Lpfoff:
@@ -234,6 +253,7 @@
 .Lwait1b:
 	bra	13b
 	 nop
+	cfi_endproc
 
 	.align	2
 .Lwait0:
@@ -246,8 +266,5 @@
 	.long	__lll_unlock_wake-.Lwake1b
 	.size	__pthread_rwlock_rdlock,.-__pthread_rwlock_rdlock
 
-	.globl	pthread_rwlock_rdlock
-pthread_rwlock_rdlock = __pthread_rwlock_rdlock
-
-	.globl	__pthread_rwlock_rdlock_internal
-__pthread_rwlock_rdlock_internal = __pthread_rwlock_rdlock
+strong_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock)
+hidden_def (__pthread_rwlock_rdlock)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,13 +29,25 @@
 	.globl	pthread_rwlock_timedrdlock
 	.type	pthread_rwlock_timedrdlock,@function
 	.align	5
+	cfi_startproc
 pthread_rwlock_timedrdlock:
 	mov.l	r12, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r12, 0)
 	mov.l	r10, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r10, 0)
 	mov.l	r9, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r9, 0)
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	add	#-8, r15
+	cfi_adjust_cfa_offset (8)
 	mov	r4, r8
 	mov	r5, r9
 
@@ -183,14 +195,27 @@
 	tst	r2, r2
 	bf	6f
 7:
+	cfi_remember_state
 	add	#8,r15
+	cfi_adjust_cfa_offset (-8)
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	r3, r0
+	cfi_restore_state
 
 #ifndef __ASSUME_PRIVATE_FUTEX
 .Lpfoff:
@@ -300,6 +325,7 @@
 19:
 	bra	9b
 	 mov	#EINVAL, r3
+	cfi_endproc
 
 	.align	2
 .Lwait2:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,13 +29,25 @@
 	.globl	pthread_rwlock_timedwrlock
 	.type	pthread_rwlock_timedwrlock,@function
 	.align	5
+	cfi_startproc
 pthread_rwlock_timedwrlock:
 	mov.l	r12, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r12, 0)
 	mov.l	r10, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r10, 0)
 	mov.l	r9, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r9, 0)
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	add	#-8, r15
+	cfi_adjust_cfa_offset (8)
 	mov	r4, r8
 	mov	r5, r9
 
@@ -181,14 +193,27 @@
 	tst	r2, r2
 	bf	6f
 7:
+	cfi_remember_state
 	add	#8,r15
+	cfi_adjust_cfa_offset (-8)
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	r3, r0
+	cfi_restore_state
 
 #ifndef __ASSUME_PRIVATE_FUTEX
 .Lpfoff:
@@ -284,6 +309,7 @@
 16:
 	bra	17b
 	 mov	#-ETIMEDOUT, r3
+	cfi_endproc
 
 	.align	2
 .Lwait6:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,10 +27,17 @@
 	.globl	__pthread_rwlock_unlock
 	.type	__pthread_rwlock_unlock,@function
 	.align	5
+	cfi_startproc
 __pthread_rwlock_unlock:
 	mov.l	r12, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r12, 0)
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	mov	r4, r8
 
 	/* Get the lock.  */
@@ -108,11 +115,19 @@
 	trapa	#0x14
 	SYSCALL_INST_PAD
 
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	#0, r0
+	cfi_restore_state
 6:
 #if MUTEX == 0
 	DEC (@r8, r2)
@@ -122,11 +137,19 @@
 	tst	r2, r2
 	bf	3f
 4:
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	#0, r0
+	cfi_restore_state
 
 1:
 	mov	r8, r5
@@ -159,7 +182,9 @@
 
 7:
 	mov.l	r4, @-r15
+	cfi_adjust_cfa_offset (4)
 	mov.l	r6, @-r15
+	cfi_adjust_cfa_offset (4)
 	mov	r8, r4
 #if MUTEX != 0
 	add	#MUTEX, r4
@@ -173,8 +198,11 @@
 .Lwake9b:
 
 	mov.l	@r15+, r6
+	cfi_adjust_cfa_offset (-4)
 	bra	8b
 	 mov.l	@r15+, r4
+
+	cfi_endproc
 
 #ifndef __ASSUME_PRIVATE_FUTEX
 .Lpfoff:
@@ -189,8 +217,5 @@
 	.long	__lll_unlock_wake-.Lwake9b
 	.size	__pthread_rwlock_unlock,.-__pthread_rwlock_unlock
 
-	.globl	pthread_rwlock_unlock
-pthread_rwlock_unlock = __pthread_rwlock_unlock
-
-	.globl	__pthread_rwlock_unlock_internal
-__pthread_rwlock_unlock_internal = __pthread_rwlock_unlock
+strong_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock)
+hidden_def (__pthread_rwlock_unlock)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,11 +29,20 @@
 	.globl	__pthread_rwlock_wrlock
 	.type	__pthread_rwlock_wrlock,@function
 	.align	5
+	cfi_startproc
 __pthread_rwlock_wrlock:
 	mov.l	r12, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r12, 0)
 	mov.l	r9, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r9, 0)
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	mov	r4, r8
 
 	/* Get the lock.  */
@@ -128,12 +137,22 @@
 	tst	r2, r2
 	bf	6f
 7:
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	r3, r0
+	cfi_restore_state
 
 1:
 	mov	r8, r5
@@ -217,6 +236,8 @@
 	bra	13b
 	 nop
 
+	cfi_endproc
+
 	.align	2
 .Lwait4:
 	.long	__lll_lock_wait-.Lwait4b
@@ -226,8 +247,6 @@
 	.long	__lll_lock_wait-.Lwait5b
 .Lwake5:
 	.long	__lll_unlock_wake-.Lwake5b
-	.globl	pthread_rwlock_wrlock
-pthread_rwlock_wrlock = __pthread_rwlock_wrlock
-
-	.globl	__pthread_rwlock_wrlock_internal
-__pthread_rwlock_wrlock_internal = __pthread_rwlock_wrlock
+
+strong_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock)
+hidden_def (__pthread_rwlock_wrlock)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007, 2008, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -28,6 +28,7 @@
 	.globl	__new_sem_post
 	.type	__new_sem_post,@function
 	.align	5
+	cfi_startproc
 __new_sem_post:
 	mov.l	@(VALUE,r4), r2
 0:
@@ -66,8 +67,14 @@
 	mov	#EOVERFLOW, r2
 4:
 	mov.l	r12, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r12, 0)
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	mova	.Lgot3, r0
 	mov.l	.Lgot3, r12
 	add	r0, r12
@@ -83,10 +90,17 @@
 .Lexit:
 	mov.l	r2, @r0
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	#-1, r0
+	cfi_endproc
 
 	.align	2
 .Lmax:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S Wed May 30 19:53:28 2012
@@ -170,14 +170,27 @@
 	mov	#0, r0
 
 10:
+	cfi_remember_state
 	add	#8, r15
+	cfi_adjust_cfa_offset (-8)
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	mov.l	@r15+, r9
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r9)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	rts
 	 nop
+	cfi_restore_state
 
 3:
 	neg	r0, r0

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,10 +27,17 @@
 	.globl	__new_sem_trywait
 	.type	__new_sem_trywait,@function
 	.align	5
+	cfi_startproc
 __new_sem_trywait:
 	mov.l	r12, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r12, 0)
 	mov.l	r8, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (r8, 0)
 	sts.l	pr, @-r15
+	cfi_adjust_cfa_offset (4)
+	cfi_rel_offset (pr, 0)
 	mov	r4, r8
 	mov.l	@r8, r0
 2:
@@ -44,11 +51,19 @@
 	bf/s	2b
 	 mov	r2, r0
 
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	#0, r0
+	cfi_restore_state
 
 1:
 	mov	#EAGAIN, r8
@@ -67,10 +82,18 @@
 .Lexit:
 	mov.l	r8, @r0
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r8
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r8)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	rts
 	 mov	#-1, r0
+
+	cfi_endproc
 
 	.align	2
 .Lgot1:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -71,11 +71,20 @@
 7:
 	mov	#0, r0
 9:
+	cfi_remember_state
 	lds.l	@r15+, pr
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (pr)
 	mov.l	@r15+, r12
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r12)
 	mov.l	@r15+, r10
+	cfi_adjust_cfa_offset (-4)
+	cfi_restore (r10)
 	rts
 	 mov.l	@r15+, r8
+	/* Omit CFI for restore in delay slot.  */
+	cfi_restore_state
 
 .Lafter_ret:
 1:

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -71,6 +71,7 @@
     CDISABLE; \
     mov.l @r15+,r0; \
     cfi_adjust_cfa_offset (-4); \
+    cfi_restore (r0); \
     lds.l @r15+,pr; \
     cfi_adjust_cfa_offset (-4); \
     cfi_restore (pr); \
@@ -97,10 +98,10 @@
 # define SAVE_ARGS_6	SAVE_ARGS_5
 
 # define LOAD_ARGS_0	/* Nothing.  */
-# define LOAD_ARGS_1	LOAD_ARGS_0; mov.l @(0,r15),r4
-# define LOAD_ARGS_2	LOAD_ARGS_1; mov.l @(4,r15),r5
-# define LOAD_ARGS_3	LOAD_ARGS_2; mov.l @(8,r15),r6
-# define LOAD_ARGS_4	LOAD_ARGS_3; mov.l @(12,r15),r7
+# define LOAD_ARGS_1	LOAD_ARGS_0; mov.l @(0,r15),r4; cfi_restore (r4)
+# define LOAD_ARGS_2	LOAD_ARGS_1; mov.l @(4,r15),r5; cfi_restore (r5)
+# define LOAD_ARGS_3	LOAD_ARGS_2; mov.l @(8,r15),r6; cfi_restore (r6)
+# define LOAD_ARGS_4	LOAD_ARGS_3; mov.l @(12,r15),r7; cfi_restore (r7)
 # define LOAD_ARGS_5	LOAD_ARGS_4
 # define LOAD_ARGS_6	LOAD_ARGS_5
 

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2003.
 
@@ -90,4 +90,4 @@
   return 0;
 }
 weak_alias (__pthread_once, pthread_once)
-strong_alias (__pthread_once, __pthread_once_internal)
+hidden_def (__pthread_once)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -132,11 +132,8 @@
 	.size	__pthread_once,.-__pthread_once
 
 
-	.globl	__pthread_once_internal
-__pthread_once_internal = __pthread_once
-
-	.globl	pthread_once
-pthread_once = __pthread_once
+hidden_def (__pthread_once)
+strong_alias (__pthread_once, pthread_once)
 
 
 	.type	clear_once_control,@function

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S Wed May 30 19:53:28 2012
@@ -173,8 +173,5 @@
 	cfi_endproc
 	.size	__pthread_rwlock_rdlock,.-__pthread_rwlock_rdlock
 
-	.globl	pthread_rwlock_rdlock
-pthread_rwlock_rdlock = __pthread_rwlock_rdlock
-
-	.globl	__pthread_rwlock_rdlock_internal
-__pthread_rwlock_rdlock_internal = __pthread_rwlock_rdlock
+strong_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock)
+hidden_def (__pthread_rwlock_rdlock)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S Wed May 30 19:53:28 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -122,8 +122,5 @@
 	cfi_endproc
 	.size	__pthread_rwlock_unlock,.-__pthread_rwlock_unlock
 
-	.globl	pthread_rwlock_unlock
-pthread_rwlock_unlock = __pthread_rwlock_unlock
-
-	.globl	__pthread_rwlock_unlock_internal
-__pthread_rwlock_unlock_internal = __pthread_rwlock_unlock
+strong_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock)
+hidden_def (__pthread_rwlock_unlock)

Modified: trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S Wed May 30 19:53:28 2012
@@ -161,8 +161,5 @@
 	cfi_endproc
 	.size	__pthread_rwlock_wrlock,.-__pthread_rwlock_wrlock
 
-	.globl	pthread_rwlock_wrlock
-pthread_rwlock_wrlock = __pthread_rwlock_wrlock
-
-	.globl	__pthread_rwlock_wrlock_internal
-__pthread_rwlock_wrlock_internal = __pthread_rwlock_wrlock
+strong_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock)
+hidden_def (__pthread_rwlock_wrlock)

Modified: trunk/libc/po/hr.po
==============================================================================
--- trunk/libc/po/hr.po (original)
+++ trunk/libc/po/hr.po Wed May 30 19:53:28 2012
@@ -1,125 +1,3341 @@
 # This is translation of libc to Croatian
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the glibc package.
 # Denis Lackovic <delacko@xxxxxxxxxxxxxx>, 2002.
-# This file is distributed under the same license as the libc package.
-# Denis Lackovic <delacko@xxxxxxxxxxxxxx>, 2002.
+# Tomislav Krznar <tomislav.krznar@xxxxxxxxx>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.2.5\n"
-"POT-Creation-Date: 2001-08-17 13:03-0700\n"
-"PO-Revision-Date: 2002-06-10 13:44-01\n"
-"Last-Translator: Denis Lackovic <delacko@xxxxxxxxxxxxxx>\n"
+"Project-Id-Version: libc 2.14\n"
+"POT-Creation-Date: 2011-05-31 00:06-0400\n"
+"PO-Revision-Date: 2012-04-16 17:39+0200\n"
+"Last-Translator: Tomislav Krznar <tomislav.krznar@xxxxxxxxx>\n"
 "Language-Team: Croatian <lokalizacija@xxxxxxxx>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n==1?0:1);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: TransDict server\n"
 
-#: locale/programs/ld-monetary.c:278
-#, c-format
-msgid "\t\t\t\t\t\t\t      %s: value for field `%s' must be in range %d...%d"
-msgstr "\t\t\t\t\t\t\t      %s: vrijednost za polje `%s' mora biti unutar granica %d...%d"
-
-#: nis/nis_print.c:277
-msgid "\t\tAccess Rights : "
-msgstr "\t\tDozvole pristupa : "
-
-#: nis/nis_print.c:275
-msgid "\t\tAttributes    : "
-msgstr "\t\tAtributi    : "
-
-#: sunrpc/rpc_main.c:1427
-#, c-format
-msgid "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n"
-msgstr "\t%s [-abkCLNTM][-Dime[=vrijednost]] [-i veliÃÂina] [-I [-K sekundi]] [-Y put] ulaznispis\n"
-
-#: sunrpc/rpc_main.c:1429
-#, c-format
-msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
-msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o izlaznispis] [ulaznispis]\n"
-
-#: sunrpc/rpc_main.c:1432
-#, c-format
-msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
-msgstr "\t%s [-n netid]* [-o izlaznispis] [ulaznispis]\n"
-
-#: sunrpc/rpc_main.c:1431
-#, c-format
-msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
-msgstr "\t%s [-s nettype]* [-o izlaznispis] [ulaznispis]\n"
+#: argp/argp-help.c:228
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
+msgstr "%.*s: ARGP_HELP_FMT parametar zahtijeva vrijednost"
+
+#: argp/argp-help.c:238
+#, c-format
+msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
+msgstr "%.*s: Nepoznati ARGP_HELP_FMT parametar"
+
+#: argp/argp-help.c:251
+#, c-format
+msgid "Garbage in ARGP_HELP_FMT: %s"
+msgstr "SmeÃÂe u ARGP_HELP_FMT: %s"
+
+#: argp/argp-help.c:1215
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Obavezni ili opcionalni argumenti dugaÃÂkih opcija takoÃÂer su obavezni ili opcionalni za odgovarajuÃÂe kratke opcije."
+
+#: argp/argp-help.c:1601
+msgid "Usage:"
+msgstr "Uporaba:"
+
+#: argp/argp-help.c:1605
+msgid "  or: "
+msgstr "    ili: "
+
+#: argp/argp-help.c:1617
+msgid " [OPTION...]"
+msgstr " [OPCIJA...]"
+
+#: argp/argp-help.c:1644
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "PokuÃÂajte ÃÂÂ%s --helpÃÂÂ ili ÃÂÂ%s --usageÃÂÂ za viÃÂe informacija.\n"
+
+#: argp/argp-help.c:1672
+#, c-format
+msgid "Report bugs to %s.\n"
+msgstr "Prijavite greÃÂke na %s.\n"
+
+#: argp/argp-parse.c:102
+msgid "Give this help list"
+msgstr "PrikaÃÂi ovaj popis pomoÃÂi"
+
+#: argp/argp-parse.c:103
+msgid "Give a short usage message"
+msgstr "PrikaÃÂi kratke upute za uporabu"
+
+#: argp/argp-parse.c:104
+msgid "Set the program name"
+msgstr "Postavi ime programa"
+
+#: argp/argp-parse.c:106
+msgid "Hang for SECS seconds (default 3600)"
+msgstr "Zaustavi na SECS sekundi (zadano 3600)"
+
+#: argp/argp-parse.c:167
+msgid "Print program version"
+msgstr "IspiÃÂi inaÃÂicu programa"
+
+#: argp/argp-parse.c:183
+msgid "(PROGRAM ERROR) No version known!?"
+msgstr "(GREÃÂKA PROGRAMA) Nema poznate inaÃÂice!?"
+
+#: argp/argp-parse.c:623
+#, c-format
+msgid "%s: Too many arguments\n"
+msgstr "%s: PreviÃÂe argumenata\n"
+
+#: argp/argp-parse.c:766
+msgid "(PROGRAM ERROR) Option should have been recognized!?"
+msgstr "(GREÃÂKA PROGRAMA) Opcije su trebale biti prepoznate!?"
+
+#: assert/assert-perr.c:37
+#, c-format
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgstr "%s%s%s:%u: %s%sNeoÃÂekivana greÃÂka: %s.\n"
+
+#: assert/assert.c:105
+#, c-format
+msgid ""
+"%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+"%n"
+msgstr ""
+"%s%s%s:%u: %s%sUbacivanje ÃÂÂ%sÃÂÂ nije uspjelo.\n"
+"%n"
+
+#: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:100 nss/makedb.c:61
+msgid "NAME"
+msgstr "IME"
+
+#: catgets/gencat.c:111
+msgid "Create C header file NAME containing symbol definitions"
+msgstr "Napravi datoteku C zaglavlja IME koja sadrÃÂi definicije simbola"
+
+#: catgets/gencat.c:113
+msgid "Do not use existing catalog, force new output file"
+msgstr "Nemoj koristiti postojeÃÂi katalog, prisilno stvori novu izlaznu datoteku"
+
+#: catgets/gencat.c:114 nss/makedb.c:61
+msgid "Write output to file NAME"
+msgstr "NapiÃÂi izlaz u datoteku IME"
+
+#: catgets/gencat.c:119
+msgid ""
+"Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
+"is -, output is written to standard output.\n"
+msgstr "Stvori katalog poruka.\vAko je ULAZNA-DATOTEKA -, ulaz se ÃÂita sa standardnog ulaza.  Ako je IZLAZNA-DATOTEKA -, izlaz se piÃÂe na standardni izlaz.\n"
+
+#: catgets/gencat.c:124
+msgid ""
+"-o OUTPUT-FILE [INPUT-FILE]...\n"
+"[OUTPUT-FILE [INPUT-FILE]...]"
+msgstr ""
+"-o IZLAZNA-DATOTEKA [ULAZNA-DATOTEKA]...\n"
+"[IZLAZNA-DATOTEKA [ULAZNA-DATOTEKA]...]"
+
+#: catgets/gencat.c:232 debug/pcprofiledump.c:208 debug/xtrace.sh:58
+#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sotruss.ksh:49
+#: elf/sprof.c:371 iconv/iconv_prog.c:408 iconv/iconvconfig.c:380
+#: locale/programs/locale.c:278 locale/programs/localedef.c:371
+#: login/programs/pt_chown.c:92 malloc/memusage.sh:65
+#: malloc/memusagestat.c:539 nscd/nscd.c:415 nss/getent.c:918 nss/makedb.c:231
+#: posix/getconf.c:1122 sunrpc/rpc_main.c:1492 sunrpc/rpcinfo.c:691
+#: sysdeps/unix/sysv/linux/lddlibc4.c:62
+msgid ""
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"Za upute o prijavljivanju greÃÂaka, molim pogledajte:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+
+#: catgets/gencat.c:246 debug/pcprofiledump.c:222 debug/xtrace.sh:66
+#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sotruss.ksh:76 elf/sprof.c:386
+#: iconv/iconv_prog.c:423 iconv/iconvconfig.c:395 locale/programs/locale.c:293
+#: locale/programs/localedef.c:387 login/programs/pt_chown.c:63
+#: malloc/memusage.sh:73 malloc/memusagestat.c:557 nscd/nscd.c:429
+#: nss/getent.c:87 nss/makedb.c:245 posix/getconf.c:1104
+#: sysdeps/unix/sysv/linux/lddlibc4.c:69
+#, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"This is free software; see the source for copying conditions.  There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Ovo je slobodan softver; pogledajte kod za upute o kopiranju.  NEMA jamstava;\n"
+"ÃÂak ni za TRGOVINSKU PRIKLADNOST ili ODGOVARANJE ODREÃÂENOJ SVRSI.\n"
+
+#: catgets/gencat.c:251 debug/pcprofiledump.c:227 debug/xtrace.sh:70
+#: elf/ldconfig.c:321 elf/sprof.c:392 iconv/iconv_prog.c:428
+#: iconv/iconvconfig.c:400 locale/programs/locale.c:298
+#: locale/programs/localedef.c:392 malloc/memusage.sh:77
+#: malloc/memusagestat.c:562 nscd/nscd.c:434 nss/getent.c:92 nss/makedb.c:250
+#: posix/getconf.c:1109
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Napisao %s.\n"
+
+#: catgets/gencat.c:282
+msgid "*standard input*"
+msgstr "*standardni ulaz*"
+
+#: catgets/gencat.c:288 iconv/iconv_charmap.c:170 iconv/iconv_prog.c:294
+#: nss/makedb.c:170
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "ne mogu otvoriti ulaznu datoteku ÃÂÂ%sÃÂÂ"
+
+#: catgets/gencat.c:417 catgets/gencat.c:494
+msgid "illegal set number"
+msgstr "nedozvoljeni broj skupa"
+
+#: catgets/gencat.c:444
+msgid "duplicate set definition"
+msgstr "dvostruka definicija skupa"
+
+#: catgets/gencat.c:446 catgets/gencat.c:623 catgets/gencat.c:677
+msgid "this is the first definition"
+msgstr "ovo je prva definicija"
+
+#: catgets/gencat.c:522
+#, c-format
+msgid "unknown set `%s'"
+msgstr "nepoznat skup ÃÂÂ%sÃÂÂ"
+
+#: catgets/gencat.c:563
+msgid "invalid quote character"
+msgstr "neispravan znak navodnika"
+
+#: catgets/gencat.c:576
+#, c-format
+msgid "unknown directive `%s': line ignored"
+msgstr "nepoznat propis ÃÂÂ%sÃÂÂ: redak zanemaren"
+
+#: catgets/gencat.c:621
+msgid "duplicated message number"
+msgstr "dvostruki broj poruka"
+
+#: catgets/gencat.c:674
+msgid "duplicated message identifier"
+msgstr "dvostruki identifikator poruke"
+
+#: catgets/gencat.c:731
+msgid "invalid character: message ignored"
+msgstr "neispravan znak: poruka zanemarena"
+
+#: catgets/gencat.c:774
+msgid "invalid line"
+msgstr "neispravan redak"
+
+#: catgets/gencat.c:828
+msgid "malformed line ignored"
+msgstr "izobliÃÂeni redak zanemaren"
+
+#: catgets/gencat.c:992 catgets/gencat.c:1033 nss/makedb.c:183
+#, c-format
+msgid "cannot open output file `%s'"
+msgstr "ne mogu otvoriti izlaznu datoteku ÃÂÂ%sÃÂÂ"
+
+#: catgets/gencat.c:1195 locale/programs/linereader.c:560
+msgid "invalid escape sequence"
+msgstr "neispravan izlazni niz"
+
+#: catgets/gencat.c:1217
+msgid "unterminated message"
+msgstr "nezavrÃÂena poruka"
+
+#: catgets/gencat.c:1241
+#, c-format
+msgid "while opening old catalog file"
+msgstr "pri otvaranju stare datoteke kataloga"
+
+#: catgets/gencat.c:1332
+#, c-format
+msgid "conversion modules not available"
+msgstr "moduli pretvorbe nisu dostupni"
+
+#: catgets/gencat.c:1358
+#, c-format
+msgid "cannot determine escape character"
+msgstr "ne mogu odrediti izlazni znak"
+
+#: debug/pcprofiledump.c:53
+msgid "Don't buffer output"
+msgstr "Ne koristi meÃÂuspremnik za izlaz"
+
+#: debug/pcprofiledump.c:58
+msgid "Dump information generated by PC profiling."
+msgstr "IspiÃÂi informacije stvorene PC profiliranjem."
+
+#: debug/pcprofiledump.c:61
+msgid "[FILE]"
+msgstr "[DATOTEKA]"
+
+#: debug/pcprofiledump.c:108
+#, c-format
+msgid "cannot open input file"
+msgstr "ne mogu otvoriti ulaznu datoteku"
+
+#: debug/pcprofiledump.c:115
+#, c-format
+msgid "cannot read header"
+msgstr "ne mogu proÃÂitati zaglavlje"
+
+#: debug/pcprofiledump.c:179
+#, c-format
+msgid "invalid pointer size"
+msgstr "neispravna veliÃÂina pokazivaÃÂa"
+
+#: debug/xtrace.sh:27 debug/xtrace.sh:45
+msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
+msgstr "Uporaba: xtrace [OPCIJA]... PROGRAM [PROGRAMSKAOPCIJA]...\\n"
+
+#: debug/xtrace.sh:33 malloc/memusage.sh:27
+msgid "Try \\`%s --help' or `%s --usage' for more information.\\n"
+msgstr "PokuÃÂajte \\ÃÂÂ%s --helpÃÂÂ ili ÃÂÂ%s --usageÃÂÂ za viÃÂe informacija.\\n"
+
+#: debug/xtrace.sh:39
+msgid "%s: option '%s' requires an argument.\\n"
+msgstr "%s: opcija ÃÂÂ%sÃÂÂ zahtijeva argument.\\n"
+
+#: debug/xtrace.sh:46
+msgid ""
+"Trace execution of program by printing currently executed function.\n"
+"\n"
+"     --data=FILE          Don't run the program, just print the data from FILE.\n"
+"\n"
+"   -?,--help              Print this help and exit\n"
+"      --usage             Give a short usage message\n"
+"   -V,--version           Print version information and exit\n"
+"\n"
+"Mandatory arguments to long options are also mandatory for any corresponding\n"
+"short options.\n"
+"\n"
+msgstr ""
+"Prati izvrÃÂavanje programa ispisivanjem trenutno izvoÃÂene funkcije.\n"
+"\n"
+"     --data=DATOTEKA      Ne pokreÃÂi program, samo ispiÃÂi podatke iz DATOTEKE.\n"
+"\n"
+"   -?,--help              IspiÃÂi ovu pomoÃÂ i izaÃÂi\n"
+"      --usage             IspiÃÂi kratke upute za uporabu\n"
+"   -V,--version           IspiÃÂi informacije o inaÃÂici i izaÃÂi\n"
+"\n"
+"Obavezni argumenti dugaÃÂkih opcija takoÃÂer su obavezni za kratke opcije.\n"
+"\n"
+
+#: debug/xtrace.sh:127
+msgid "xtrace: unrecognized option \\`$1'\\n"
+msgstr "xtrace: neprepoznata opcija \\ÃÂÂ$1ÃÂÂ\\n"
+
+#: debug/xtrace.sh:140
+msgid "No program name given\\n"
+msgstr "Nije navedeno ime programa\\n"
+
+#: debug/xtrace.sh:148
+#, sh-format
+msgid "executable \\`$program' not found\\n"
+msgstr "izvrÃÂna datoteka \\ÃÂÂ$programÃÂÂ nije naÃÂena\\n"
+
+#: debug/xtrace.sh:152
+#, sh-format
+msgid "\\`$program' is no executable\\n"
+msgstr "\\ÃÂÂ$programÃÂÂ nije izvrÃÂna datoteka\\n"
+
+#: dlfcn/dlinfo.c:64
+msgid "RTLD_SELF used in code not dynamically loaded"
+msgstr "RTLD_SELF koriÃÂten u kodu se ne uÃÂitava dinamiÃÂki"
+
+#: dlfcn/dlinfo.c:73
+msgid "unsupported dlinfo request"
+msgstr "nepodrÃÂani dlinfo zahtjev"
+
+#: dlfcn/dlmopen.c:64
+msgid "invalid namespace"
+msgstr "neispravan prostor imena"
+
+#: dlfcn/dlmopen.c:69
+msgid "invalid mode"
+msgstr "neispravan mod"
+
+#: dlfcn/dlopen.c:65
+msgid "invalid mode parameter"
+msgstr "neispravan parametar moda"
+
+#: elf/cache.c:69
+msgid "unknown"
+msgstr "nepoznato"
+
+#: elf/cache.c:112
+msgid "Unknown OS"
+msgstr "Nepoznati OS"
+
+#: elf/cache.c:117
+#, c-format
+msgid ", OS ABI: %s %d.%d.%d"
+msgstr ", OS ABI: %s %d.%d.%d"
+
+#: elf/cache.c:134 elf/ldconfig.c:1305
+#, c-format
+msgid "Can't open cache file %s\n"
+msgstr "Ne mogu otvoriti datoteku spremnika %s\n"
+
+#: elf/cache.c:148
+#, c-format
+msgid "mmap of cache file failed.\n"
+msgstr "mmap datoteke spremnika nije uspio.\n"
+
+#: elf/cache.c:152 elf/cache.c:166
+#, c-format
+msgid "File is not a cache file.\n"
+msgstr "Datoteka nije datoteka spremnika.\n"
+
+#: elf/cache.c:199 elf/cache.c:209
+#, c-format
+msgid "%d libs found in cache `%s'\n"
+msgstr "%d biblioteka naÃÂeno u spremniku ÃÂÂ%sÃÂÂ\n"
+
+#: elf/cache.c:403
+#, c-format
+msgid "Can't create temporary cache file %s"
+msgstr "Ne mogu napraviti privremenu datoteku spremnika %s"
+
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
+#, c-format
+msgid "Writing of cache data failed"
+msgstr "Zapisivanje podataka spremnika nije uspjelo"
+
+#: elf/cache.c:435
+#, c-format
+msgid "Changing access rights of %s to %#o failed"
+msgstr "Promjena pristupnih dozvola %s u %#o nije uspjela"
+
+#: elf/cache.c:440
+#, c-format
+msgid "Renaming of %s to %s failed"
+msgstr "Preimenovanje %s u %s nije uspjelo"
+
+#: elf/dl-close.c:387 elf/dl-open.c:397
+msgid "cannot create scope list"
+msgstr "ne mogu napraviti popis podruÃÂja"
+
+#: elf/dl-close.c:767
+msgid "shared object not open"
+msgstr "dijeljeni objekt nije otvoren"
+
+#: elf/dl-deps.c:114
+msgid "DST not allowed in SUID/SGID programs"
+msgstr "DST nije dozvoljen u SUID/SGID programima"
+
+#: elf/dl-deps.c:127
+msgid "empty dynamic string token substitution"
+msgstr "zamjena znaka praznog dinamiÃÂkog niza znakova"
+
+#: elf/dl-deps.c:133
+#, c-format
+msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
+msgstr "ne mogu uÃÂitati pomoÃÂnu datoteku ÃÂÂ%sÃÂÂ zbog zamjene znaka praznog dinamiÃÂkog niza znakova\n"
+
+#: elf/dl-deps.c:474
+msgid "cannot allocate dependency list"
+msgstr "ne mogu alocirati popis ovisnosti"
+
+#: elf/dl-deps.c:514 elf/dl-deps.c:574
+msgid "cannot allocate symbol search list"
+msgstr "ne mogu alocirati popis za traÃÂenje simbola"
+
+#: elf/dl-deps.c:554
+msgid "Filters not supported with LD_TRACE_PRELINKING"
+msgstr "Filtri nisu podrÃÂani uz LD_TRACE_PRELINKING"
+
+#: elf/dl-error.c:77
+msgid "DYNAMIC LINKER BUG!!!"
+msgstr "GREÃÂKA DINAMIÃÂKOG LINKERA (BUG)!!!"
+
+#: elf/dl-error.c:124
+msgid "error while loading shared libraries"
+msgstr "greÃÂka pri uÃÂitavanju dijeljenih biblioteka"
+
+#: elf/dl-fptr.c:88
+msgid "cannot map pages for fdesc table"
+msgstr "ne mogu pridruÃÂiti stranice fdesc tablici"
+
+#: elf/dl-fptr.c:192
+msgid "cannot map pages for fptr table"
+msgstr "ne mogu pridruÃÂiti stranice fptr tablici"
+
+#: elf/dl-fptr.c:221
+msgid "internal error: symidx out of range of fptr table"
+msgstr "interna greÃÂka: symidx izvan dometa fptr tablice"
+
+#: elf/dl-load.c:471
+msgid "cannot allocate name record"
+msgstr "ne mogu alocirati zapis imena"
+
+#: elf/dl-load.c:548 elf/dl-load.c:664 elf/dl-load.c:749 elf/dl-load.c:862
+msgid "cannot create cache for search path"
+msgstr "ne mogu napraviti spremnik za putanju traÃÂenja"
+
+#: elf/dl-load.c:639
+msgid "cannot create RUNPATH/RPATH copy"
+msgstr "ne mogu napraviti RUNPATH/RPATH kopiju"
+
+#: elf/dl-load.c:735
+msgid "cannot create search path array"
+msgstr "ne mogu napraviti polje putanja traÃÂenja"
+
+#: elf/dl-load.c:931
+msgid "cannot stat shared object"
+msgstr "ne mogu izvrÃÂiti stat na dijeljenom objektu"
+
+#: elf/dl-load.c:1009
+msgid "cannot open zero fill device"
+msgstr "ne mogu otvoriti neispunjeni ureÃÂaj"
+
+#: elf/dl-load.c:1055 elf/dl-load.c:2313
+msgid "cannot create shared object descriptor"
+msgstr "ne mogu napraviti opisnik dijeljenog objekta"
+
+#: elf/dl-load.c:1074 elf/dl-load.c:1730 elf/dl-load.c:1833
+msgid "cannot read file data"
+msgstr "ne mogu proÃÂitati podatke datoteke"
+
+#: elf/dl-load.c:1120
+msgid "ELF load command alignment not page-aligned"
+msgstr "ELF load naredba nije poravnata sa stranicom"
+
+#: elf/dl-load.c:1127
+msgid "ELF load command address/offset not properly aligned"
+msgstr "Adresa/pomak ELF load naredbe nema pravilno poravnanje"
+
+#: elf/dl-load.c:1210
+msgid "cannot allocate TLS data structures for initial thread"
+msgstr "ne mogu alocirati TLS podatkovne strukture za poÃÂetnu dretvu"
+
+#: elf/dl-load.c:1233
+msgid "cannot handle TLS data"
+msgstr "ne mogu raditi s TLS podacima"
+
+#: elf/dl-load.c:1252
+msgid "object file has no loadable segments"
+msgstr "datoteka objekta nema uÃÂitljive segmente"
+
+#: elf/dl-load.c:1288
+msgid "failed to map segment from shared object"
+msgstr "nisam uspio pridruÃÂiti segment iz dijeljenog objekta"
+
+#: elf/dl-load.c:1314
+msgid "cannot dynamically load executable"
+msgstr "ne mogu dinamiÃÂki uÃÂitati izvrÃÂnu datoteku"
+
+#: elf/dl-load.c:1376
+msgid "cannot change memory protections"
+msgstr "ne mogu promijeniti zaÃÂtite memorije"
+
+#: elf/dl-load.c:1395
+msgid "cannot map zero-fill pages"
+msgstr "ne mogu pridruÃÂiti neispunjene stranice"
+
+#: elf/dl-load.c:1409
+msgid "object file has no dynamic section"
+msgstr "datoteka objekta nema dinamiÃÂki odjeljak"
+

[... 15959 lines stripped ...]
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits