[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r22675 - in /fsf/trunk/libc: ./ elf/ manual/ math/ nptl/ ports/ ports/sysdeps/unix/sysv/linux/aarch64/ scripts/ sysdeps/gnu/
- To: commits@xxxxxxxxxx
- Subject: [Commits] r22675 - in /fsf/trunk/libc: ./ elf/ manual/ math/ nptl/ ports/ ports/sysdeps/unix/sysv/linux/aarch64/ scripts/ sysdeps/gnu/
- From: eglibc@xxxxxxxxxx
- Date: Wed, 20 Mar 2013 00:01:55 -0000
Author: eglibc
Date: Wed Mar 20 00:01:54 2013
New Revision: 22675
Log:
Import glibc-mainline for 2013-03-20
Added:
fsf/trunk/libc/manual/threads.texi
Removed:
fsf/trunk/libc/manual/nptl.texi
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/Makeconfig
fsf/trunk/libc/Makerules
fsf/trunk/libc/config.make.in
fsf/trunk/libc/configure
fsf/trunk/libc/configure.in
fsf/trunk/libc/elf/Makefile
fsf/trunk/libc/manual/Makefile
fsf/trunk/libc/math/k_casinhf.c
fsf/trunk/libc/math/k_casinhl.c
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/allocatestack.c
fsf/trunk/libc/nptl/nptl-init.c
fsf/trunk/libc/nptl/pthreadP.h
fsf/trunk/libc/nptl/pthread_attr_getstacksize.c
fsf/trunk/libc/nptl/pthread_create.c
fsf/trunk/libc/nptl/vars.c
fsf/trunk/libc/ports/ChangeLog.aarch64
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/configure
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
fsf/trunk/libc/scripts/rellns-sh
fsf/trunk/libc/sysdeps/gnu/configure
fsf/trunk/libc/sysdeps/gnu/configure.in
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Mar 20 00:01:54 2013
@@ -1,13 +1,48 @@
+2013-03-19 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * math/k_casinhf.c (__kernel_casinhf): Consistently use float
+ constants.
+ * math/k_casinhl.c (__kernel_casinhl): Consistently use long
+ double constants.
+
+2013-03-19 Andreas Schwab <schwab@xxxxxxx>
+
+ * sysdeps/gnu/configure.in: Set libc_cv_rtldir for s390x.
+ * sysdeps/gnu/configure: Regenerate.
+
+ * configure.in: Substitute libc_cv_rtlddir.
+ * configure: Regenerate.
+ * config.make.in (rtlddir): Set from libc_cv_rtlddir.
+ * Makeconfig (rtlddir, inst_rtlddir): New variables.
+ (rtld-LDFLAGS): Use them with $(rtld-installed-name).
+ * elf/Makefile (install-others, CFLAGS-interp.c)
+ (ldso_install, common-ldd-rewrite): Likewise.
+ ($(inst_rtlddir)/$(rtld-installed-name)): Renamed from
+ $(inst_slibdir)/$(rtld-installed-name).
+ * scripts/rellns-sh: Add -p option.
+ * Makerules (make-shlib-link): Use rellns-sh to get relative name
+ for source.
+
+2013-03-19 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
+
+ * manual/nptl.texi: Renamed to ...
+ * manual/threads.texi: ... this.
+ * manual/Makefile (chapters): Update.
+
2013-03-18 Roland McGrath <roland@xxxxxxxxxxxxx>
[BZ #14812]
* argp/argp-parse.c (argp_default_options): Put N_ translation marker
on argument names, not just descriptions.
- * iconv/iconv_prog.c (options): Likewise.
- * iconv/iconvconfig.c (options): Likewise.
* malloc/memusagestat.c (options): Likewise.
* nss/getent.c (options): Likewise.
- Reported by Benno Schulenberg <bensberg@xxxxxxxxxxxxx>.
+
+2013-03-18 Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
+
+ [BZ #14812]
+ * iconv/iconv_prog.c (options): Put N_ translation marker
+ on argument names, not just descriptions.
+ * iconv/iconvconfig.c (options): Likewise.
2013-03-18 Ondrej Bilka <neleai@xxxxxxxxx>
Modified: fsf/trunk/libc/Makeconfig
==============================================================================
--- fsf/trunk/libc/Makeconfig (original)
+++ fsf/trunk/libc/Makeconfig Wed Mar 20 00:01:54 2013
@@ -151,11 +151,17 @@
endif
inst_libdir = $(install_root)$(libdir)
-# Where to install the shared library and dynamic linker.
+# Where to install the shared library.
ifndef slibdir
slibdir = $(exec_prefix)/lib
endif
inst_slibdir = $(install_root)$(slibdir)
+
+# Where to install the dynamic linker.
+ifndef rtlddir
+rtlddir = $(slibdir)
+endif
+inst_rtlddir = $(install_root)$(rtlddir)
# Prefix to put on files installed in $(libdir). For libraries `libNAME.a',
# the prefix is spliced between `lib' and the name, so the linker switch
@@ -441,7 +447,7 @@
endif
ifeq (yes,$(build-shared))
ifndef rtld-LDFLAGS
-rtld-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
+rtld-LDFLAGS = -Wl,-dynamic-linker=$(rtlddir)/$(rtld-installed-name)
endif
ifndef rtld-tests-LDFLAGS
ifeq (yes,$(build-hardcoded-path-in-tests))
Modified: fsf/trunk/libc/Makerules
==============================================================================
--- fsf/trunk/libc/Makerules (original)
+++ fsf/trunk/libc/Makerules Wed Mar 20 00:01:54 2013
@@ -864,7 +864,7 @@
symbolic-link-prog := $(common-objpfx)elf/sln
symbolic-link-list := $(common-objpfx)elf/symlink.list
define make-shlib-link
-echo $(<F) $@ >> $(symbolic-link-list)
+echo `$(..)scripts/rellns-sh -p $< $@` $@ >> $(symbolic-link-list)
endef
else # cross-compiling
# We need a definition that can be used by elf/Makefile's install rules.
@@ -874,7 +874,7 @@
ifndef make-shlib-link
define make-shlib-link
rm -f $@
-$(LN_S) $(<F) $@
+$(LN_S) `$(..)scripts/rellns-sh -p $< $@` $@
endef
endif
Modified: fsf/trunk/libc/config.make.in
==============================================================================
--- fsf/trunk/libc/config.make.in (original)
+++ fsf/trunk/libc/config.make.in Wed Mar 20 00:01:54 2013
@@ -11,6 +11,7 @@
datadir = @datadir@
libdir = @libdir@
slibdir = @libc_cv_slibdir@
+rtlddir = @libc_cv_rtlddir@
localedir = @libc_cv_localedir@
sysconfdir = @libc_cv_sysconfdir@
libexecdir = @libexecdir@
Modified: fsf/trunk/libc/configure
==============================================================================
--- fsf/trunk/libc/configure (original)
+++ fsf/trunk/libc/configure Wed Mar 20 00:01:54 2013
@@ -594,6 +594,7 @@
libc_cv_localstatedir
libc_cv_sysconfdir
libc_cv_localedir
+libc_cv_rtlddir
libc_cv_slibdir
old_glibc_headers
use_nscd
@@ -7374,6 +7375,7 @@
+
if test x$use_ldconfig = xyes; then
$as_echo "#define USE_LDCONFIG 1" >>confdefs.h
Modified: fsf/trunk/libc/configure.in
==============================================================================
--- fsf/trunk/libc/configure.in (original)
+++ fsf/trunk/libc/configure.in Wed Mar 20 00:01:54 2013
@@ -2153,6 +2153,7 @@
AC_SUBST(old_glibc_headers)
AC_SUBST(libc_cv_slibdir)
+AC_SUBST(libc_cv_rtlddir)
AC_SUBST(libc_cv_localedir)
AC_SUBST(libc_cv_sysconfdir)
AC_SUBST(libc_cv_localstatedir)
Modified: fsf/trunk/libc/elf/Makefile
==============================================================================
--- fsf/trunk/libc/elf/Makefile (original)
+++ fsf/trunk/libc/elf/Makefile Wed Mar 20 00:01:54 2013
@@ -66,7 +66,7 @@
ifeq (yes,$(build-shared))
extra-objs = $(all-rtld-routines:%=%.os) soinit.os sofini.os interp.os
generated += librtld.os dl-allobjs.os ld.so ldd
-install-others = $(inst_slibdir)/$(rtld-installed-name)
+install-others = $(inst_rtlddir)/$(rtld-installed-name)
install-bin-script = ldd
endif
@@ -340,7 +340,7 @@
| $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }'
# interp.c exists just to get this string into the libraries.
-CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \
+CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \
-DNOT_IN_libc=1
$(objpfx)interp.os: $(common-objpfx)config.make
@@ -372,18 +372,19 @@
$(make-target-directory)
$(do-install-program)
-$(inst_slibdir)/$(rtld-installed-name): \
+$(inst_rtlddir)/$(rtld-installed-name): \
$(inst_slibdir)/$(rtld-version-installed-name) \
$(inst_slibdir)/libc-$(version).so
+ $(make-target-directory)
$(make-shlib-link)
# Special target called by parent to install just the dynamic linker.
.PHONY: ldso_install
-ldso_install: $(inst_slibdir)/$(rtld-installed-name)
-endif
-
-
-common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \
+ldso_install: $(inst_rtlddir)/$(rtld-installed-name)
+endif
+
+
+common-ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
-e 's%@VERSION@%$(version)%g' \
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g'
Modified: fsf/trunk/libc/manual/Makefile
==============================================================================
--- fsf/trunk/libc/manual/Makefile (original)
+++ fsf/trunk/libc/manual/Makefile Wed Mar 20 00:01:54 2013
@@ -42,7 +42,7 @@
message search pattern io stdio llio filesys \
pipe socket terminal syslog math arith time \
resource setjmp signal startup process job nss \
- users sysinfo conf crypt debug nptl)
+ users sysinfo conf crypt debug threads)
add-chapters = $(wildcard $(foreach d, $(add-ons), ../$d/$d.texi))
appendices = lang.texi header.texi install.texi maint.texi platform.texi \
contrib.texi
Removed: fsf/trunk/libc/manual/nptl.texi
==============================================================================
--- fsf/trunk/libc/manual/nptl.texi (original)
+++ fsf/trunk/libc/manual/nptl.texi (removed)
@@ -1,44 +1,0 @@
-@node POSIX Threads
-@c @node POSIX Threads, , Cryptographic Functions, Top
-@chapter POSIX Threads
-@c %MENU% POSIX Threads
-@cindex pthreads
-
-This chapter describes the @glibcadj{} POSIX Thread implementation.
-
-@menu
-* Thread-specific Data:: Support for creating and
- managing thread-specific data
-@end menu
-
-@node Thread-specific Data
-@section Thread-specific Data
-
-The @glibcadj{} implements functions to allow users to create and manage
-data specific to a thread. Such data may be destroyed at thread exit,
-if a destructor is provided. The following functions are defined:
-
-@table @code
-
-@item int pthread_key_create (pthread_key_t *@var{key}, void (*@var{destructor})(void*))
-Create a thread-specific data key for the calling thread, referenced by
-@var{key}.
-
-Objects declared with the C++11 @code{thread_local} keyword are destroyed
-before thread-specific data, so they should not be used in thread-specific
-data destructors or even as members of the thread-specific data, since the
-latter is passed as an argument to the destructor function.
-
-@item int pthread_key_delete (pthread_key_t @var{key})
-Destroy the thread-specific data @var{key} in the calling thread. The
-destructor for the thread-specific data is not called during destruction, nor
-is it called during thread exit.
-
-@item void *pthread_getspecific (pthread_key_t @var{key})
-Return the thread-specific data associated with @var{key} in the calling
-thread.
-
-@item int pthread_setspecific (pthread_key_t @var{key}, const void *@var{value})
-Associate the thread-specific @var{value} with @var{key} in the calling thread.
-
-@end table
Added: fsf/trunk/libc/manual/threads.texi
==============================================================================
--- fsf/trunk/libc/manual/threads.texi (added)
+++ fsf/trunk/libc/manual/threads.texi Wed Mar 20 00:01:54 2013
@@ -1,0 +1,44 @@
+@node POSIX Threads
+@c @node POSIX Threads, , Cryptographic Functions, Top
+@chapter POSIX Threads
+@c %MENU% POSIX Threads
+@cindex pthreads
+
+This chapter describes the @glibcadj{} POSIX Thread implementation.
+
+@menu
+* Thread-specific Data:: Support for creating and
+ managing thread-specific data
+@end menu
+
+@node Thread-specific Data
+@section Thread-specific Data
+
+The @glibcadj{} implements functions to allow users to create and manage
+data specific to a thread. Such data may be destroyed at thread exit,
+if a destructor is provided. The following functions are defined:
+
+@table @code
+
+@item int pthread_key_create (pthread_key_t *@var{key}, void (*@var{destructor})(void*))
+Create a thread-specific data key for the calling thread, referenced by
+@var{key}.
+
+Objects declared with the C++11 @code{thread_local} keyword are destroyed
+before thread-specific data, so they should not be used in thread-specific
+data destructors or even as members of the thread-specific data, since the
+latter is passed as an argument to the destructor function.
+
+@item int pthread_key_delete (pthread_key_t @var{key})
+Destroy the thread-specific data @var{key} in the calling thread. The
+destructor for the thread-specific data is not called during destruction, nor
+is it called during thread exit.
+
+@item void *pthread_getspecific (pthread_key_t @var{key})
+Return the thread-specific data associated with @var{key} in the calling
+thread.
+
+@item int pthread_setspecific (pthread_key_t @var{key}, const void *@var{value})
+Associate the thread-specific @var{value} with @var{key} in the calling thread.
+
+@end table
Modified: fsf/trunk/libc/math/k_casinhf.c
==============================================================================
--- fsf/trunk/libc/math/k_casinhf.c (original)
+++ fsf/trunk/libc/math/k_casinhf.c Wed Mar 20 00:01:54 2013
@@ -79,8 +79,8 @@
}
else
{
- __real__ y = (rx - ix) * (rx + ix) + 1.0;
- __imag__ y = 2.0 * rx * ix;
+ __real__ y = (rx - ix) * (rx + ix) + 1.0f;
+ __imag__ y = 2.0f * rx * ix;
y = __csqrtf (y);
Modified: fsf/trunk/libc/math/k_casinhl.c
==============================================================================
--- fsf/trunk/libc/math/k_casinhl.c (original)
+++ fsf/trunk/libc/math/k_casinhl.c Wed Mar 20 00:01:54 2013
@@ -86,8 +86,8 @@
}
else
{
- __real__ y = (rx - ix) * (rx + ix) + 1.0;
- __imag__ y = 2.0 * rx * ix;
+ __real__ y = (rx - ix) * (rx + ix) + 1.0L;
+ __imag__ y = 2.0L * rx * ix;
y = __csqrtl (y);
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Wed Mar 20 00:01:54 2013
@@ -1,3 +1,19 @@
+2013-03-19 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
+
+ * allocatestack.c (allocate_stack): Use __default_pthread_attr
+ instead of __default_stacksize.
+ * nptl-init.c (__pthread_initialize_minimal_internal):
+ Likewise. Initialize guardsize.
+ * pthreadP.h (__default_pthread_attr): Declare.
+ * pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
+ Use __default_pthread_attr instead of __default_stacksize.
+ * pthread_create.c (default_attr): Remove.
+ (__pthread_create_2_1): Use __default_pthread_attr instead of
+ default_attr.
+ * vars.c (__default_stacksize): Remove.
+ (__default_pthread_attr): New static variable to store
+ default thread attributes.
+
2013-03-18 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
* pthread_barrier_init.c (default_attr): Rename to
Modified: fsf/trunk/libc/nptl/allocatestack.c
==============================================================================
--- fsf/trunk/libc/nptl/allocatestack.c (original)
+++ fsf/trunk/libc/nptl/allocatestack.c Wed Mar 20 00:01:54 2013
@@ -358,7 +358,7 @@
/* Get the stack size from the attribute if it is set. Otherwise we
use the default we determined at start time. */
- size = attr->stacksize ?: __default_stacksize;
+ size = attr->stacksize ?: __default_pthread_attr.stacksize;
/* Get memory for the stack. */
if (__builtin_expect (attr->flags & ATTR_FLAG_STACKADDR, 0))
Modified: fsf/trunk/libc/nptl/nptl-init.c
==============================================================================
--- fsf/trunk/libc/nptl/nptl-init.c (original)
+++ fsf/trunk/libc/nptl/nptl-init.c Wed Mar 20 00:01:54 2013
@@ -423,7 +423,8 @@
/* Round the resource limit up to page size. */
limit.rlim_cur = (limit.rlim_cur + pagesz - 1) & -pagesz;
- __default_stacksize = limit.rlim_cur;
+ __default_pthread_attr.stacksize = limit.rlim_cur;
+ __default_pthread_attr.guardsize = GLRO (dl_pagesize);
#ifdef SHARED
/* Transfer the old value from the dynamic linker's internal location. */
Modified: fsf/trunk/libc/nptl/pthreadP.h
==============================================================================
--- fsf/trunk/libc/nptl/pthreadP.h (original)
+++ fsf/trunk/libc/nptl/pthreadP.h Wed Mar 20 00:01:54 2013
@@ -147,8 +147,8 @@
/* Internal variables. */
-/* Default stack size. */
-extern size_t __default_stacksize attribute_hidden;
+/* Default pthread attributes. */
+extern struct pthread_attr __default_pthread_attr attribute_hidden;
/* Size and alignment of static TLS block. */
extern size_t __static_tls_size attribute_hidden;
Modified: fsf/trunk/libc/nptl/pthread_attr_getstacksize.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_attr_getstacksize.c (original)
+++ fsf/trunk/libc/nptl/pthread_attr_getstacksize.c Wed Mar 20 00:01:54 2013
@@ -32,7 +32,7 @@
/* If the user has not set a stack size we return what the system
will use as the default. */
- *stacksize = iattr->stacksize ?: __default_stacksize;
+ *stacksize = iattr->stacksize ?: __default_pthread_attr.stacksize;
return 0;
}
Modified: fsf/trunk/libc/nptl/pthread_create.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_create.c (original)
+++ fsf/trunk/libc/nptl/pthread_create.c Wed Mar 20 00:01:54 2013
@@ -435,15 +435,6 @@
}
-/* Default thread attributes for the case when the user does not
- provide any. */
-static const struct pthread_attr default_attr =
- {
- /* Just some value > 0 which gets rounded to the nearest page size. */
- .guardsize = 1,
- };
-
-
int
__pthread_create_2_1 (newthread, attr, start_routine, arg)
pthread_t *newthread;
@@ -457,7 +448,7 @@
if (iattr == NULL)
/* Is this the best idea? On NUMA machines this could mean
accessing far-away memory. */
- iattr = &default_attr;
+ iattr = &__default_pthread_attr;
struct pthread *pd = NULL;
int err = ALLOCATE_STACK (iattr, &pd);
Modified: fsf/trunk/libc/nptl/vars.c
==============================================================================
--- fsf/trunk/libc/nptl/vars.c (original)
+++ fsf/trunk/libc/nptl/vars.c Wed Mar 20 00:01:54 2013
@@ -20,13 +20,9 @@
#include <tls.h>
#include <unistd.h>
-/* Default stack size. */
-size_t __default_stacksize attribute_hidden
-#ifdef SHARED
-;
-#else
- = PTHREAD_STACK_MIN;
-#endif
+/* Default thread attributes for the case when the user does not
+ provide any. */
+struct pthread_attr __default_pthread_attr attribute_hidden;
/* Flag whether the machine is SMP or not. */
int __is_smp attribute_hidden;
Modified: fsf/trunk/libc/ports/ChangeLog.aarch64
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.aarch64 (original)
+++ fsf/trunk/libc/ports/ChangeLog.aarch64 Wed Mar 20 00:01:54 2013
@@ -1,3 +1,9 @@
+2013-03-19 Andreas Schwab <schwab@xxxxxxx>
+
+ * sysdeps/unix/sysv/linux/aarch64/configure.in: Set
+ libc_cv_rtlddir.
+ * sysdeps/unix/sysv/linux/aarch64/configure: Regenerate.
+
2013-03-14 Andreas Schwab <schwab@xxxxxxx>
* sysdeps/unix/sysv/linux/aarch64/configure.in: Set
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/configure
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/configure (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/configure Wed Mar 20 00:01:54 2013
@@ -7,6 +7,7 @@
case "$prefix" in
/usr | /usr/)
libc_cv_slibdir="/lib64"
+ libc_cv_rtlddir="/lib"
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32bit and 64bit libraries
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/configure.in (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/configure.in Wed Mar 20 00:01:54 2013
@@ -7,6 +7,7 @@
case "$prefix" in
/usr | /usr/)
libc_cv_slibdir="/lib64"
+ libc_cv_rtlddir="/lib"
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32bit and 64bit libraries
Modified: fsf/trunk/libc/scripts/rellns-sh
==============================================================================
--- fsf/trunk/libc/scripts/rellns-sh (original)
+++ fsf/trunk/libc/scripts/rellns-sh Wed Mar 20 00:01:54 2013
@@ -16,8 +16,17 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# With -p, instead of creating the link print the computed relative link
+# name.
+do_print=false
+case $1 in
+ -p)
+ do_print=true
+ shift
+ ;;
+esac
if test $# -ne 2; then
- echo "Usage: rellns SOURCE DEST" >&2
+ echo "Usage: rellns [-p] SOURCE DEST" >&2
exit 1
fi
@@ -70,4 +79,8 @@
from=`echo $from | sed 's%^[^/]*/*%%'`
done
-ln -s $rfrom$to $2
+if $do_print; then
+ echo "$rfrom$to"
+else
+ ln -s $rfrom$to $2
+fi
Modified: fsf/trunk/libc/sysdeps/gnu/configure
==============================================================================
--- fsf/trunk/libc/sysdeps/gnu/configure (original)
+++ fsf/trunk/libc/sysdeps/gnu/configure Wed Mar 20 00:01:54 2013
@@ -9,12 +9,17 @@
case "$prefix" in
/usr | /usr/)
# 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
- # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
- # and libc_cv_localedir.
+ # Allow earlier configure scripts to handle libc_cv_slibdir,
+ # libc_cv_rtlddir, libdir, and libc_cv_localedir.
test -n "$libc_cv_slibdir" || \
case $machine in
sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
libc_cv_slibdir=/lib64
+ case $machine in
+ s390/s390-64)
+ libc_cv_rtlddir=/lib
+ ;;
+ esac
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32bit and 64bit libraries
Modified: fsf/trunk/libc/sysdeps/gnu/configure.in
==============================================================================
--- fsf/trunk/libc/sysdeps/gnu/configure.in (original)
+++ fsf/trunk/libc/sysdeps/gnu/configure.in Wed Mar 20 00:01:54 2013
@@ -9,12 +9,17 @@
case "$prefix" in
/usr | /usr/)
# 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
- # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
- # and libc_cv_localedir.
+ # Allow earlier configure scripts to handle libc_cv_slibdir,
+ # libc_cv_rtlddir, libdir, and libc_cv_localedir.
test -n "$libc_cv_slibdir" || \
case $machine in
sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
libc_cv_slibdir=/lib64
+ case $machine in
+ s390/s390-64)
+ libc_cv_rtlddir=/lib
+ ;;
+ esac
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32bit and 64bit libraries
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits