[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r21257 - in /fsf/trunk/libc: ./ grp/ iconvdata/ intl/ io/ localedata/ localedata/locales/ malloc/ posix/ string/
- To: commits@xxxxxxxxxx
- Subject: [Commits] r21257 - in /fsf/trunk/libc: ./ grp/ iconvdata/ intl/ io/ localedata/ localedata/locales/ malloc/ posix/ string/
- From: eglibc@xxxxxxxxxx
- Date: Sat, 20 Oct 2012 00:02:26 -0000
Author: eglibc
Date: Sat Oct 20 00:02:24 2012
New Revision: 21257
Log:
Import glibc-mainline for 2012-10-20
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/Makeconfig
fsf/trunk/libc/NEWS
fsf/trunk/libc/configure
fsf/trunk/libc/configure.in
fsf/trunk/libc/grp/Makefile
fsf/trunk/libc/grp/tst_fgetgrent.sh
fsf/trunk/libc/iconvdata/Makefile
fsf/trunk/libc/iconvdata/tst-table.sh
fsf/trunk/libc/iconvdata/tst-tables.sh
fsf/trunk/libc/intl/Makefile
fsf/trunk/libc/intl/tst-gettext.sh
fsf/trunk/libc/intl/tst-gettext2.sh
fsf/trunk/libc/intl/tst-translit.sh
fsf/trunk/libc/io/Makefile
fsf/trunk/libc/io/ftwtest-sh
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/locales/de_AT
fsf/trunk/libc/localedata/locales/mr_IN
fsf/trunk/libc/localedata/tst-wctype.sh
fsf/trunk/libc/malloc/Makefile
fsf/trunk/libc/malloc/tst-mtrace.sh
fsf/trunk/libc/posix/Makefile
fsf/trunk/libc/posix/tst-getconf.sh
fsf/trunk/libc/posix/wordexp-tst.sh
fsf/trunk/libc/string/test-memmem.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Oct 20 00:02:24 2012
@@ -1,3 +1,87 @@
+2012-10-19 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * io/Makefile ($(objpfx)ftwtest.out): Depend on ftwtest-sh. Pass
+ script to $(SHELL) as $<. Pass $(common-objpfx) to script
+ directly. Pass built executable to script as
+ $(built-program-cmd).
+ * io/ftwtest-sh (ldso): Remove variable. Run ftwtest directly as
+ $testprogram without using LD_LIBRARY_PATH and $ldso.
+
+ * grp/Makefile ($(objpfx)tst_fgetgrent.out): Pass
+ $(run-program-prefix) to tst_fgetgrent.sh, not $(elf-objpfx) and
+ $(rtld-installed-name).
+ * grp/tst_fgetgrent.sh (elf_objpfx): Remove variable.
+ (rtld_installed_name): Likewise.
+ (library_path): Likewise.
+ (run_program_prefix): New variable. Use it to run tst_fgetgrent.
+ * iconvdata/Makefile ($(objpfx)tst-tables.out): Pass
+ $(run-program-prefix) to tst-tables.sh.
+ * iconvdata/tst-table.sh (run_program_prefix): New variable. Use
+ it to run tst-table-from and tst-table-to.
+ * iconvdata/tst-tables.sh (run_program_prefix): New variable.
+ Pass it to tst-table.sh.
+ * intl/Makefile ($(objpfx)tst-gettext.out): Pass
+ $(run-program-prefix) to tst-gettext.sh.
+ ($(objpfx)tst-translit.out): Pass $(run-program-prefix) to
+ tst-translit.sh.
+ ($(objpfx)tst-gettext2.out): Pass $(run-program-prefix) to
+ tst-gettext2.sh.
+ * intl/tst-gettext.sh (run_program_prefix): New variable. Use it
+ to run tst-gettext.
+ * intl/tst-gettext2.sh (run_program_prefix): New variable. Use it
+ to run tst-gettext2.
+ * intl/tst-translit.sh (run_program_prefix): New variable. Use it
+ to run tst-translit.
+ * malloc/Makefile ($(objpfx)tst-mtrace.out): Pass
+ $(run-program-prefix) to tst-mtrace.sh.
+ * malloc/tst-mtrace.sh (run_program_prefix): New variable. Use it
+ to run tst-mtrace.
+ * posix/Makefile ($(objpfx)wordexp-tst.out): Pass
+ $(run-program-prefix) to wordexp-tst.sh, not $(elf-objpfx) and
+ $(rtld-installed-name).
+ * posix/wordexp-tst.sh (elf_objpfx): Remove variable.
+ (rtld_installed_name): Likewise.
+ (run_program_prefix): New variable. Use it to run wordexp-test.
+
+ * Makeconfig (ARCH): Remove all definitions.
+ (machine): Likewise.
+ [ARCH]: Remove conditional code.
+ [!objdir]: Give error.
+ [!objdir] (objpfx): Remove.
+ [!objdir] (common-objpfx): Likewise.
+ [!objdir] (common-objdir): Likewise.
+ * configure.in (config_makefile): Remove. Hardcode Makefile in
+ AC_CONFIG_FILES call.
+ * configure: Regenerated.
+
+ [BZ #13888]
+ * io/ftwtest-sh (tmp): Set to use the working directory, not /tmp
+ or TMPDIR.
+ (testout): Likewise.
+
+ * posix/Makefile ($(objpfx)tst-getconf.out): Pass
+ $(built-program-cmd) to tst-getconf.sh, not $(elf-objpfx) and
+ $(rtld-installed-name).
+ * posix/tst-getconf.sh (elf_objpfx): Remove variable.
+ (rtld_installed_name): Likwise.
+ (runit): Remove function.
+ (run_getconf): New variable, Use it for running getconf binary.
+
+2012-10-19 Jim Blandy <jimb@xxxxxxxxxxxxxxxx>
+ Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * localedata/tst-wctype.sh (run_program_prefix): Remove variable.
+ (tst_wctype): New variable. Use it directly to run test program
+ instead of passing test program name as argument.
+
+2012-10-18 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ [BZ #14716]
+ * string/test-memmem.c (check_result): New function.
+ (do_one_test): Use it.
+ (check1): New function.
+ (test_main): Use it.
+
2012-10-18 Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>
* math/Makefile: Comment on slow compilation of test-tgmath2.c.
Modified: fsf/trunk/libc/Makeconfig
==============================================================================
--- fsf/trunk/libc/Makeconfig (original)
+++ fsf/trunk/libc/Makeconfig Sat Oct 20 00:02:24 2012
@@ -31,31 +31,6 @@
ifdef subdir
.. := ../
-endif
-
-# If config.make exists, the source directory was configured,
-# so don't try to be clever and find another directory to build in.
-ifneq (,$(wildcard $(..)config.make))
-ARCH =
-machine =
-else # Not configured.
-ifndef ARCH
-ifdef machine
-ARCH = $(machine)
-endif # machine
-endif # ARCH
-endif # config.make
-
-# Directory for object files and libc.a. If this is not defined, the
-# object files live in the subdirectories where their sources live, and
-# libc.a lives in the parent directory (this probably doesn't work any
-# more).
-ifdef ARCH
-ifeq ($(filter /%,$(ARCH)),)
-objdir := $(..)$(ARCH)
-else
-objdir = $(ARCH)
-endif
endif
# $(common-objdir) is the place to put objects and
@@ -65,15 +40,7 @@
common-objpfx = $(objdir)/
common-objdir = $(objdir)
else
-objpfx :=
-ifdef ..
-common-objpfx = $(..)
-common-objdir = ..
-else
-# This is a kludge. make wizards might grok.
-common-objpfx = sysdeps/../
-common-objdir = .
-endif
+objdir must be defined by the build-directory Makefile.
endif
# Root of the sysdeps tree.
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sat Oct 20 00:02:24 2012
@@ -16,7 +16,7 @@
14331, 14336, 14337, 14347, 14349, 14376, 14417, 14459, 14476, 14477,
14505, 14510, 14516, 14518, 14519, 14530, 14532, 14538, 14543, 14544,
14545, 14557, 14562, 14568, 14576, 14579, 14583, 14587, 14602, 14621,
- 14638, 14645, 14648, 14652, 14660, 14661, 14716.
+ 14638, 14645, 14648, 14652, 14660, 14661, 14694, 14716.
* Support for STT_GNU_IFUNC symbols added for s390 and s390x.
Optimized versions of memcpy, memset, and memcmp added for System z10 and
Modified: fsf/trunk/libc/configure
==============================================================================
--- fsf/trunk/libc/configure (original)
+++ fsf/trunk/libc/configure Sat Oct 20 00:02:24 2012
@@ -7529,18 +7529,12 @@
-if test "`(cd $srcdir; pwd)`" = "`pwd`"; then
- config_makefile=
-else
- config_makefile=Makefile
-fi
-
VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h`
RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h`
-ac_config_files="$ac_config_files config.make ${config_makefile}"
+ac_config_files="$ac_config_files config.make Makefile"
ac_config_commands="$ac_config_commands default"
@@ -8259,7 +8253,7 @@
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;;
- "${config_makefile}") CONFIG_FILES="$CONFIG_FILES ${config_makefile}" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
Modified: fsf/trunk/libc/configure.in
==============================================================================
--- fsf/trunk/libc/configure.in (original)
+++ fsf/trunk/libc/configure.in Sat Oct 20 00:02:24 2012
@@ -2185,18 +2185,12 @@
dnl See sysdeps/mach/configure.in for this variable.
AC_SUBST(mach_interface_list)
-if test "`(cd $srcdir; pwd)`" = "`pwd`"; then
- config_makefile=
-else
- config_makefile=Makefile
-fi
-
VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h`
RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h`
AC_SUBST(VERSION)
AC_SUBST(RELEASE)
-AC_CONFIG_FILES([config.make ${config_makefile}])
+AC_CONFIG_FILES([config.make Makefile])
AC_CONFIG_COMMANDS([default],[[
case $CONFIG_FILES in *config.make*)
echo "$config_vars" >> config.make;;
Modified: fsf/trunk/libc/grp/Makefile
==============================================================================
--- fsf/trunk/libc/grp/Makefile (original)
+++ fsf/trunk/libc/grp/Makefile Sat Oct 20 00:02:24 2012
@@ -55,8 +55,7 @@
ifeq (yes,$(build-shared))
tests: $(objpfx)tst_fgetgrent.out
$(objpfx)tst_fgetgrent.out: tst_fgetgrent.sh $(objpfx)tst_fgetgrent
- $(SHELL) $< $(common-objpfx) $(elf-objpfx) \
- $(rtld-installed-name)
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
endif
endif
Modified: fsf/trunk/libc/grp/tst_fgetgrent.sh
==============================================================================
--- fsf/trunk/libc/grp/tst_fgetgrent.sh (original)
+++ fsf/trunk/libc/grp/tst_fgetgrent.sh Sat Oct 20 00:02:24 2012
@@ -20,24 +20,22 @@
set -e
common_objpfx=$1; shift
-elf_objpfx=$1; shift
-rtld_installed_name=$1; shift
+run_program_prefix=$1; shift
testout=${common_objpfx}/grp/tst_fgetgrent.out
-library_path=${common_objpfx}
result=0
-${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+${run_program_prefix} \
${common_objpfx}grp/tst_fgetgrent 0 > ${testout} || result=1
-${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+${run_program_prefix} \
${common_objpfx}grp/tst_fgetgrent 1 >> ${testout} || result=1
-${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+${run_program_prefix} \
${common_objpfx}grp/tst_fgetgrent 2 >> ${testout} || result=1
-${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+${run_program_prefix} \
${common_objpfx}grp/tst_fgetgrent 3 >> ${testout} || result=1
exit $result
Modified: fsf/trunk/libc/iconvdata/Makefile
==============================================================================
--- fsf/trunk/libc/iconvdata/Makefile (original)
+++ fsf/trunk/libc/iconvdata/Makefile Sat Oct 20 00:02:24 2012
@@ -304,7 +304,8 @@
$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so)) \
$(objpfx)tst-table-from $(objpfx)tst-table-to
- $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ > $@
+ $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \
+ '$(run-program-prefix)' > $@
do-tests-clean common-mostlyclean: tst-tables-clean
Modified: fsf/trunk/libc/iconvdata/tst-table.sh
==============================================================================
--- fsf/trunk/libc/iconvdata/tst-table.sh (original)
+++ fsf/trunk/libc/iconvdata/tst-table.sh Sat Oct 20 00:02:24 2012
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Bruno Haible <haible@xxxxxxxxxxxxxx>, 2000.
#
@@ -23,8 +23,9 @@
common_objpfx=$1
objpfx=$2
-charset=$3
-charmap=$4
+run_program_prefix=$3
+charset=$4
+charmap=$5
GCONV_PATH=${common_objpfx}iconvdata
export GCONV_PATH
@@ -59,12 +60,12 @@
fi
# iconv in one direction.
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
${objpfx}tst-table-from ${charset} \
> ${objpfx}tst-${charset}.table
# iconv in the other direction.
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
${objpfx}tst-table-to ${charset} | sort \
> ${objpfx}tst-${charset}.inverse.table
Modified: fsf/trunk/libc/iconvdata/tst-tables.sh
==============================================================================
--- fsf/trunk/libc/iconvdata/tst-tables.sh (original)
+++ fsf/trunk/libc/iconvdata/tst-tables.sh Sat Oct 20 00:02:24 2012
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2000-2004,2007,2011 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Bruno Haible <haible@xxxxxxxxxxxxxx>, 2000.
#
@@ -23,6 +23,7 @@
common_objpfx=$1
objpfx=$2
+run_program_prefix=$3
status=0
@@ -261,7 +262,8 @@
if test "$charset" = GB18030; then echo "This might take a while" 1>&2; fi
case ${charset} in \#*) continue;; esac
echo -n "Testing ${charset}" 1>&2
- if ${SHELL} tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}; then
+ if ${SHELL} tst-table.sh ${common_objpfx} ${objpfx} "${run_program_prefix}" \
+ ${charset} ${charmap}; then
echo 1>&2
else
echo "failed: ./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}"
Modified: fsf/trunk/libc/intl/Makefile
==============================================================================
--- fsf/trunk/libc/intl/Makefile (original)
+++ fsf/trunk/libc/intl/Makefile Sat Oct 20 00:02:24 2012
@@ -74,12 +74,14 @@
$(objpfx)mtrace-tst-gettext: $(objpfx)tst-gettext.out
$(common-objpfx)malloc/mtrace $(objpfx)tst-gettext.mtrace > $@
$(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext
- $(SHELL) $< $(common-objpfx) $(common-objpfx)intl/ \
- $(objpfx)tst-gettext.mtrace
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' \
+ $(common-objpfx)intl/ $(objpfx)tst-gettext.mtrace
$(objpfx)tst-translit.out: tst-translit.sh $(objpfx)tst-translit
- $(SHELL) $< $(common-objpfx) $(common-objpfx)intl/
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' \
+ $(common-objpfx)intl/
$(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2
- $(SHELL) $< $(common-objpfx) $(common-objpfx)intl/
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' \
+ $(common-objpfx)intl/
$(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4
$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
$(objpfx)tst-gettext6.out: tst-gettext6.sh $(objpfx)tst-gettext6
Modified: fsf/trunk/libc/intl/tst-gettext.sh
==============================================================================
--- fsf/trunk/libc/intl/tst-gettext.sh (original)
+++ fsf/trunk/libc/intl/tst-gettext.sh Sat Oct 20 00:02:24 2012
@@ -20,8 +20,9 @@
set -e
common_objpfx=$1
-objpfx=$2
-malloc_trace=$3
+run_program_prefix=$2
+objpfx=$3
+malloc_trace=$4
LC_ALL=C
export LC_ALL
@@ -53,7 +54,7 @@
# Now run the test.
MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
exit $?
Modified: fsf/trunk/libc/intl/tst-gettext2.sh
==============================================================================
--- fsf/trunk/libc/intl/tst-gettext2.sh (original)
+++ fsf/trunk/libc/intl/tst-gettext2.sh Sat Oct 20 00:02:24 2012
@@ -20,7 +20,8 @@
set -e
common_objpfx=$1
-objpfx=$2
+run_program_prefix=$2
+objpfx=$3
LC_ALL=C
export LC_ALL
@@ -66,7 +67,7 @@
export LOCPATH
# Now run the test.
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
cmp ${objpfx}tst-gettext2.out - <<EOF
String1 - Lang1: 1st string
Modified: fsf/trunk/libc/intl/tst-translit.sh
==============================================================================
--- fsf/trunk/libc/intl/tst-translit.sh (original)
+++ fsf/trunk/libc/intl/tst-translit.sh Sat Oct 20 00:02:24 2012
@@ -20,7 +20,8 @@
set -e
common_objpfx=$1
-objpfx=$2
+run_program_prefix=$2
+objpfx=$3
LC_ALL=C
export LC_ALL
@@ -36,7 +37,7 @@
LOCPATH=${common_objpfx}localedata
export LOCPATH
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
exit $?
Modified: fsf/trunk/libc/io/Makefile
==============================================================================
--- fsf/trunk/libc/io/Makefile (original)
+++ fsf/trunk/libc/io/Makefile Sat Oct 20 00:02:24 2012
@@ -101,7 +101,6 @@
ifeq ($(cross-compiling),no)
tests: $(objpfx)ftwtest.out
-$(objpfx)ftwtest.out: $(objpfx)ftwtest
- $(SHELL) ftwtest-sh $(shell cd $(common-objpfx). && pwd)/ \
- $(shell cd $(<D) && pwd)/$(<F) > $@
+$(objpfx)ftwtest.out: ftwtest-sh $(objpfx)ftwtest
+ $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
endif
Modified: fsf/trunk/libc/io/ftwtest-sh
==============================================================================
--- fsf/trunk/libc/io/ftwtest-sh (original)
+++ fsf/trunk/libc/io/ftwtest-sh Sat Oct 20 00:02:24 2012
@@ -44,10 +44,8 @@
export LANG
# First create our scenario:
-tmp=`echo ${TMPDIR:-/tmp} | sed 's|\(.\)/*$|\1|'`
+tmp=`pwd | sed 's|\(.\)/*$|\1|'`
tmpdir=$tmp/ftwtest.d
-
-[ -f ${objpfx}elf/ld.so ] && ldso=${objpfx}elf/ld.so
trap 'chmod -fR a+x $tmpdir; rm -fr $tmpdir $testout' 1 2 3 15
@@ -71,9 +69,9 @@
echo > $tmpdir/bar/xo
chmod a-x,a+r $tmpdir/bar
-testout=${TMPDIR:-/tmp}/ftwtest.out
-
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram $tmpdir |
+testout=$tmp/ftwtest.out
+
+$testprogram $tmpdir |
sort > $testout
cat <<EOF | cmp $testout - || exit 1
@@ -92,7 +90,7 @@
EOF
rm $testout
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --depth $tmpdir |
+$testprogram --depth $tmpdir |
sort > $testout
cat <<EOF | cmp $testout - || exit 1
@@ -111,7 +109,7 @@
EOF
rm $testout
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --phys $tmpdir |
+$testprogram --phys $tmpdir |
sort > $testout
cat <<EOF | cmp $testout - || exit 1
@@ -135,7 +133,7 @@
# For the next test everything must be readable.
chmod -fR a+x $tmpdir
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir $tmpdir |
+$testprogram --chdir $tmpdir |
sort > $testout
# perhaps $tmp involves some symlinks...
@@ -159,7 +157,7 @@
curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd`
cd "$tmp"
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d |
+$testprogram --chdir ftwtest.d |
sort > $testout
cd "$curwd"
@@ -181,7 +179,7 @@
curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd`
cd "$tmp"
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/. |
+$testprogram --chdir ftwtest.d/. |
sort > $testout
cd "$curwd"
@@ -203,7 +201,7 @@
curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd`
cd "$tmp"
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/foo/lvl1/link@1 |
+$testprogram --chdir ftwtest.d/foo/lvl1/link@1 |
sort > $testout
cd "$curwd"
@@ -212,7 +210,7 @@
EOF
rm $testout
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --early-exit $tmpdir |
+$testprogram --early-exit $tmpdir |
sort > $testout
cat <<EOF | cmp $testout - || exit 1
@@ -226,7 +224,7 @@
echo > $tmpdir/foo/lvl1b/file2@1b
echo > $tmpdir/foo/lvl1b/file3@1b
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-subtree=lvl1 $tmpdir |
+$testprogram --skip-subtree=lvl1 $tmpdir |
sort > $testout
cat <<EOF | diff -u $testout - || exit 1
@@ -243,7 +241,7 @@
EOF
rm $testout
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-siblings=lvl1 $tmpdir |
+$testprogram --skip-siblings=lvl1 $tmpdir |
sort > $testout
# The filesystem is not required to put lvl1 before lvl1b.
@@ -267,7 +265,7 @@
EOF
rm $testout
-LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-siblings=file@1b $tmpdir |
+$testprogram --skip-siblings=file@1b $tmpdir |
sort > $testout
# The filesystem is not required to put file2@1b and file3@1b after file@1b.
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Sat Oct 20 00:02:24 2012
@@ -1,3 +1,15 @@
+2012-10-19 Florian Pritz <bluewind@xxxxxxx>
+
+ [BZ #13758]
+ * locales/de_AT (LC_TIME): Change month name from "FebruAr" to
+ "Februar".
+
+2012-10-19 Pravin Satpute <psatpute@xxxxxxxxxx>
+
+ [BZ #14694]
+ * locales/mr_IN: Fix Wednesday in DAY and August, September and
+ October in ABMON and MON.
+
2012-09-24 Dmitry V. Levin <ldv@xxxxxxxxxxxx>
* gen-locale.sh: Add "set -e".
Modified: fsf/trunk/libc/localedata/locales/de_AT
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_AT (original)
+++ fsf/trunk/libc/localedata/locales/de_AT Sat Oct 20 00:02:24 2012
@@ -100,7 +100,7 @@
"<U0053><U0065><U0070>";"<U004F><U006B><U0074>";/
"<U004E><U006F><U0076>";"<U0044><U0065><U007A>"
mon "<U004A><U00E4><U006E><U006E><U0065><U0072>";/
- "<U0046><U0065><U0062><U0072><U0075><U0041><U0072>";/
+ "<U0046><U0065><U0062><U0072><U0075><U0061><U0072>";/
"<U004D><U00E4><U0072><U007A>";/
"<U0041><U0070><U0072><U0069><U006C>";/
"<U004D><U0061><U0069>";/
Modified: fsf/trunk/libc/localedata/locales/mr_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/mr_IN (original)
+++ fsf/trunk/libc/localedata/locales/mr_IN Sat Oct 20 00:02:24 2012
@@ -1,8 +1,7 @@
comment_char %
escape_char /
% Marathi language locale for India.
-% Contributed by Kentaroh Noji <knoji@xxxxxxxxxx> and
-% Tetsuji Orita <orita@xxxxxxxxxx>.
+% Contributed by Kentaroh Noji and Tetsuji Orita <orita@xxxxxxxxxx>.
LC_IDENTIFICATION
title "Marathi language locale for India"
@@ -109,7 +108,7 @@
day "<U0930><U0935><U093F><U0935><U093E><U0930>";/
"<U0938><U094B><U092E><U0935><U093E><U0930>";/
"<U092E><U0902><U0917><U0933><U0935><U093E><U0930>";/
- "<U092E><U0902><U0917><U0933><U0935><U093E><U0930>";/
+ "<U092C><U0941><U0927><U0935><U093E><U0930>";/
"<U0917><U0941><U0930><U0941><U0935><U093E><U0930>";/
"<U0936><U0941><U0915><U094D><U0930><U0935><U093E><U0930>";/
"<U0936><U0928><U093F><U0935><U093E><U0930>"
@@ -122,9 +121,9 @@
"<U092E><U0947>";/
"<U091C><U0942><U0928>";/
"<U091C><U0941><U0932><U0948>";/
- "<U0913><U0917><U0938><U094D><U091F>";/
- "<U0938><U0947><U092A><U094D><U091F><U0947><U0902><U092C><U0930>";/
- "<U0913><U0915><U094D><U091F><U094B><U092C><U0930>";/
+ "<U0911><U0917><U0938><U094D><U091F>";/
+ "<U0938><U092A><U094D><U091F><U0947><U0902><U092C><U0930>";/
+ "<U0911><U0915><U094D><U091F><U094B><U092C><U0930>";/
"<U0928><U094B><U0935><U094D><U0939><U0947><U0902><U092C><U0930>";/
"<U0921><U093F><U0938><U0947><U0902><U092C><U0930>"
%
@@ -136,9 +135,9 @@
"<U092E><U0947>";/
"<U091C><U0942><U0928>";/
"<U091C><U0941><U0932><U0948>";/
- "<U0913><U0917><U0938><U094D><U091F>";/
- "<U0938><U0947><U092A><U094D><U091F><U0947><U0902><U092C><U0930>";/
- "<U0913><U0915><U094D><U091F><U094B><U092C><U0930>";/
+ "<U0911><U0917><U0938><U094D><U091F>";/
+ "<U0938><U092A><U094D><U091F><U0947><U0902><U092C><U0930>";/
+ "<U0911><U0915><U094D><U091F><U094B><U092C><U0930>";/
"<U0928><U094B><U0935><U094D><U0939><U0947><U0902><U092C><U0930>";/
"<U0921><U093F><U0938><U0947><U0902><U092C><U0930>"
%
Modified: fsf/trunk/libc/localedata/tst-wctype.sh
==============================================================================
--- fsf/trunk/libc/localedata/tst-wctype.sh (original)
+++ fsf/trunk/libc/localedata/tst-wctype.sh Sat Oct 20 00:02:24 2012
@@ -20,12 +20,11 @@
set -e
common_objpfx=$1
-run_program_prefix=$2
+tst_wctype=$2
# Run the test program.
LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
-LC_ALL=ja_JP.EUC-JP ${run_program_prefix} \
- ${common_objpfx}localedata/tst-wctype < tst-wctype.input \
+LC_ALL=ja_JP.EUC-JP ${tst_wctype} < tst-wctype.input \
> ${common_objpfx}localedata/tst-wctype.out
exit $?
Modified: fsf/trunk/libc/malloc/Makefile
==============================================================================
--- fsf/trunk/libc/malloc/Makefile (original)
+++ fsf/trunk/libc/malloc/Makefile Sat Oct 20 00:02:24 2012
@@ -109,7 +109,7 @@
ifneq ($(PERL),no)
tests: $(objpfx)tst-mtrace.out
$(objpfx)tst-mtrace.out: tst-mtrace.sh $(objpfx)tst-mtrace
- $(SHELL) $< $(common-objpfx)
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
endif
endif
endif
Modified: fsf/trunk/libc/malloc/tst-mtrace.sh
==============================================================================
--- fsf/trunk/libc/malloc/tst-mtrace.sh (original)
+++ fsf/trunk/libc/malloc/tst-mtrace.sh Sat Oct 20 00:02:24 2012
@@ -20,13 +20,14 @@
set -e
common_objpfx=$1; shift
+run_program_prefix=$1; shift
status=0
trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
${common_objpfx}malloc/tst-mtrace || status=1
if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
Modified: fsf/trunk/libc/posix/Makefile
==============================================================================
--- fsf/trunk/libc/posix/Makefile (original)
+++ fsf/trunk/libc/posix/Makefile Sat Oct 20 00:02:24 2012
@@ -120,8 +120,7 @@
$(SHELL) $< $(common-objpfx) $(elf-objpfx) \
$(rtld-installed-name)
$(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test
- $(SHELL) $< $(common-objpfx) $(elf-objpfx) \
- $(rtld-installed-name)
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
endif
endif
@@ -277,7 +276,7 @@
$(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@
$(objpfx)tst-getconf.out: tst-getconf.sh $(objpfx)getconf
- $(SHELL) $< $(common-objpfx) $(elf-objpfx) $(rtld-installed-name)
+ $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
ifeq (yes,$(build-shared))
$(objpfx)tst-regex: $(common-objpfx)rt/librt.so
Modified: fsf/trunk/libc/posix/tst-getconf.sh
==============================================================================
--- fsf/trunk/libc/posix/tst-getconf.sh (original)
+++ fsf/trunk/libc/posix/tst-getconf.sh Sat Oct 20 00:02:24 2012
@@ -20,18 +20,7 @@
set -e
common_objpfx=$1; shift
-elf_objpfx=$1; shift
-if [ $# -eq 0 ]; then
- # Static case.
- runit() {
- "$@"
- }
-else
- rtld_installed_name=$1; shift
- runit() {
- ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
- }
-fi
+run_getconf=$1; shift
logfile=$common_objpfx/posix/tst-getconf.out
@@ -45,7 +34,7 @@
result=0
while read name; do
echo -n "getconf $name: " >> $logfile
- runit ${common_objpfx}posix/getconf "$name" 2>> $logfile >> $logfile
+ ${run_getconf} "$name" 2>> $logfile >> $logfile
if test $? -ne 0; then
echo "*** $name FAILED" >> $logfile
result=1
@@ -223,7 +212,7 @@
while read name; do
echo -n "getconf $name /: " >> $logfile
- runit ${common_objpfx}posix/getconf "$name" / 2>> $logfile >> $logfile
+ ${run_getconf} "$name" / 2>> $logfile >> $logfile
if test $? -ne 0; then
echo "*** $name FAILED" >> $logfile
result=1
Modified: fsf/trunk/libc/posix/wordexp-tst.sh
==============================================================================
--- fsf/trunk/libc/posix/wordexp-tst.sh (original)
+++ fsf/trunk/libc/posix/wordexp-tst.sh Sat Oct 20 00:02:24 2012
@@ -24,8 +24,7 @@
# The others are just there to be parameters.
common_objpfx=$1; shift
-elf_objpfx=$1; shift
-rtld_installed_name=$1; shift
+run_program_prefix=$1; shift
logfile=${common_objpfx}posix/wordexp-tst.out
testout=${common_objpfx}posix/wordexp-test-result
@@ -39,7 +38,7 @@
export IFS
failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '$*' > ${testout}1
cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
wordexp returned 0
@@ -51,7 +50,7 @@
fi
failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '${*}' unquoted > ${testout}2
cat <<"EOF" | cmp - ${testout}2 >> $logfile || failed=1
wordexp returned 0
@@ -64,7 +63,7 @@
fi
failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '$@' unquoted > ${testout}3
cat <<"EOF" | cmp - ${testout}3 >> $logfile || failed=1
wordexp returned 0
@@ -77,7 +76,7 @@
fi
failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '"$* quoted"' param > ${testout}4
cat <<"EOF" | cmp - ${testout}4 >> $logfile || failed=1
wordexp returned 0
@@ -89,7 +88,7 @@
fi
failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '"$@ quoted"' param > ${testout}5
cat <<"EOF" | cmp - ${testout}5 >> $logfile || failed=1
wordexp returned 0
@@ -103,7 +102,7 @@
# Why? Because bash does it that way..
failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '$#' 2 3 4 5 > ${testout}6
cat <<"EOF" | cmp - ${testout}6 >> $logfile || failed=1
wordexp returned 0
@@ -115,7 +114,7 @@
fi
failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '$2 ${3} $4' 2nd 3rd "4 th" > ${testout}7
cat <<"EOF" | cmp - ${testout}7 >> $logfile || failed=1
wordexp returned 0
@@ -130,7 +129,7 @@
fi
failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '${11}' 2 3 4 5 6 7 8 9 10 11 > ${testout}8
cat <<"EOF" | cmp - ${testout}8 >> $logfile || failed=1
wordexp returned 0
@@ -142,7 +141,7 @@
fi
failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '"a $@ b"' c d > ${testout}9
cat <<"EOF" | cmp - ${testout}9 >> $logfile || failed=1
wordexp returned 0
@@ -155,7 +154,7 @@
status=1
fi
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${run_program_prefix} \
${common_objpfx}posix/wordexp-test '${#@} ${#2} *$**' two 3 4 > ${testout}10
cat <<"EOF" | cmp - ${testout}10 || failed=1
wordexp returned 0
Modified: fsf/trunk/libc/string/test-memmem.c
==============================================================================
--- fsf/trunk/libc/string/test-memmem.c (original)
+++ fsf/trunk/libc/string/test-memmem.c Sat Oct 20 00:02:24 2012
@@ -56,8 +56,8 @@
return NULL;
}
-static void
-do_one_test (impl_t *impl, const void *haystack, size_t haystack_len,
+static int
+check_result (impl_t *impl, const void *haystack, size_t haystack_len,
const void *needle, size_t needle_len, const void *expected)
{
void *res;
@@ -68,8 +68,19 @@
error (0, 0, "Wrong result in function %s %p %p", impl->name,
res, expected);
ret = 1;
- return;
+ return -1;
}
+
+ return 0;
+}
+
+static void
+do_one_test (impl_t *impl, const void *haystack, size_t haystack_len,
+ const void *needle, size_t needle_len, const void *expected)
+{
+ if (check_result (impl, haystack, haystack_len, needle, needle_len,
+ expected) < 0)
+ return;
if (HP_TIMING_AVAIL)
{
@@ -145,6 +156,22 @@
}
}
+static void
+check1 (void)
+{
+
+ const char search_buf_data[5] = { 0x56, 0x34, 0x12, 0x78, 0x78 };
+ const char pattern[2] = { 0x78, 0x56 };
+ void *search_buf = (void *) buf1 + page_size - sizeof search_buf_data;
+ void *exp_result;
+
+ memcpy (search_buf, search_buf_data, sizeof search_buf_data);
+ exp_result = simple_memmem (search_buf, sizeof search_buf_data,
+ pattern, sizeof pattern);
+ FOR_EACH_IMPL (impl, 0)
+ check_result (impl, search_buf, sizeof search_buf_data,
+ pattern, sizeof pattern, exp_result);
+}
static const char *const strs[] =
{
@@ -161,6 +188,8 @@
test_init ();
+ check1 ();
+
printf ("%23s", "");
FOR_EACH_IMPL (impl, 0)
printf ("\t%s", impl->name);
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits