From fee732e531957595665cd9bed0aed5b7326611b8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 4 May 2005 17:58:13 +0000 Subject: * intl/Makefile (tst-gettext[45].out): Pass also $(run-program-prefix) as argument to the scripts. * intl/tst-gettext2.sh: Use mkdir -p instead of test -d + mkdir. * intl/tst-gettext4.sh: Likewise. Use run_program_prefix argument. * intl/tst-gettext5.sh: Likewise. * intl/tst-translit.sh: Add mkdir -p. * sysdeps/unix/sysv/linux/i386/sysdep.h (SETUP_PIC_REG): Use .ifndef/.endif to allow use of this macro more than once per .S file. (LOAD_PIC_REG): New macro. * sysdeps/unix/sysv/linux/i386/makecontext.S: Add call frame information. * sysdeps/unix/sysv/linux/i386/getcontext.S: Likewise. * sysdeps/unix/sysv/linux/i386/vfork.S: Likewise. * sysdeps/i386/fpu/s_asinh.S: Use LOAD_PIC_REG macro. Add call frame information. * sysdeps/i386/fpu/e_log10f.S: Likewise. * sysdeps/i386/fpu/s_expm1.S: Likewise. * sysdeps/i386/fpu/e_acoshf.S: Likewise. * sysdeps/i386/fpu/e_log2l.S: Likewise. * sysdeps/i386/fpu/s_log1pf.S: Likewise. * sysdeps/i386/fpu/s_lrint.S: Likewise. * sysdeps/i386/fpu/s_llrint.S: Likewise. * sysdeps/i386/fpu/s_ilogbf.S: Likewise. * sysdeps/i386/fpu/s_cbrtl.S: Likewise. * sysdeps/i386/fpu/s_asinhf.S: Likewise. * sysdeps/i386/fpu/e_log.S: Likewise. * sysdeps/i386/fpu/e_atanhf.S: Likewise. * sysdeps/i386/fpu/s_lrintl.S: Likewise. * sysdeps/i386/fpu/e_atanhl.S: Likewise. * sysdeps/i386/fpu/e_scalb.S: Likewise. * sysdeps/i386/fpu/s_log1p.S: Likewise. * sysdeps/i386/fpu/s_nearbyintl.S: Likewise. * sysdeps/i386/fpu/s_frexpl.S: Likewise. * sysdeps/i386/fpu/s_log1pl.S: Likewise. * sysdeps/i386/fpu/s_nearbyintf.S: Likewise. * sysdeps/i386/fpu/s_cbrt.S: Likewise. * sysdeps/i386/fpu/s_expm1l.S: Likewise. * sysdeps/i386/fpu/s_lrintf.S: Likewise. * sysdeps/i386/fpu/e_acosh.S: Likewise. * sysdeps/i386/fpu/s_cexp.S: Likewise. * sysdeps/i386/fpu/s_ilogbl.S: Likewise. * sysdeps/i386/fpu/s_expm1f.S: Likewise. * sysdeps/i386/fpu/e_powl.S: Likewise. * sysdeps/i386/fpu/e_powf.S: Likewise. * sysdeps/i386/fpu/e_scalbf.S: Likewise. * sysdeps/i386/fpu/e_logl.S: Likewise. * sysdeps/i386/fpu/e_acoshl.S: Likewise. * sysdeps/i386/fpu/s_frexp.S: Likewise. * sysdeps/i386/fpu/e_pow.S: Likewise. * sysdeps/i386/fpu/e_logf.S: Likewise. * sysdeps/i386/fpu/e_log2.S: Likewise. * sysdeps/i386/fpu/s_frexpf.S: Likewise. * sysdeps/i386/fpu/s_cexpl.S: Likewise. * sysdeps/i386/fpu/s_llrintf.S: Likewise. * sysdeps/i386/fpu/s_ilogb.S: Likewise. * sysdeps/i386/fpu/e_scalbl.S: Likewise. * sysdeps/i386/fpu/e_atanh.S: Likewise. * sysdeps/i386/fpu/e_log10.S: Likewise. * sysdeps/i386/fpu/s_cbrtf.S: Likewise. * sysdeps/i386/fpu/s_cexpf.S: Likewise. * sysdeps/i386/fpu/s_llrintl.S: Likewise. * sysdeps/i386/fpu/e_log10l.S: Likewise. * sysdeps/i386/fpu/s_nearbyint.S: Likewise. * sysdeps/i386/fpu/s_asinhl.S: Likewise. * sysdeps/i386/fpu/e_log2f.S: Likewise. * sysdeps/i386/addmul_1.S: Various fixes to cfi handling. * sysdeps/i386/mul_1.S: Likewise. * sysdeps/i386/strtok.S: Likewise. * sysdeps/i386/sub_n.S: Likewise. * sysdeps/i386/submul_1.S: Likewise. * sysdeps/i386/i586/addmul_1.S: Likewise. * sysdeps/i386/i586/memcpy.S: Likewise. * sysdeps/i386/i586/mul_1.S: Likewise. * sysdeps/i386/i586/rshift.S: Likewise. * sysdeps/i386/i586/sub_n.S: Likewise. * sysdeps/i386/i586/submul_1.S: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/i386/i686/memmove.S: Likewise. * sysdeps/unix/sysv/linux/i386/clone.S: Likewise. * sysdeps/unix/sysv/linux/i386/mmap.S: Likewise. * sysdeps/unix/sysv/linux/i386/mmap64.S: Likewise. * sysdeps/unix/sysv/linux/i386/setcontext.S: Likewise. --- intl/Makefile | 4 ++-- intl/tst-gettext2.sh | 4 ++-- intl/tst-gettext4.sh | 14 +++++--------- intl/tst-gettext5.sh | 11 ++++------- intl/tst-translit.sh | 5 ++++- 5 files changed, 17 insertions(+), 21 deletions(-) (limited to 'intl') diff --git a/intl/Makefile b/intl/Makefile index 19853974d7..9da445aa38 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -87,9 +87,9 @@ $(objpfx)tst-codeset.out: tst-codeset.sh $(objpfx)tst-codeset $(objpfx)tst-gettext3.out: tst-gettext3.sh $(objpfx)tst-gettext3 $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ $(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4 - $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ + $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/ $(objpfx)tst-gettext5.out: tst-gettext5.sh $(objpfx)tst-gettext5 - $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ + $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/ endif endif diff --git a/intl/tst-gettext2.sh b/intl/tst-gettext2.sh index 53f081a798..68157f8a68 100644 --- a/intl/tst-gettext2.sh +++ b/intl/tst-gettext2.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test of gettext functions. -# Copyright (C) 2000, 2003 Free Software Foundation, Inc. +# Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc. # This file is part of the GNU C Library. # @@ -26,7 +26,7 @@ LC_ALL=C export LC_ALL # Generate the test data. -test -d ${objpfx}domaindir || mkdir ${objpfx}domaindir +mkdir -p ${objpfx}domaindir # Create the locale directories. test -d ${objpfx}domaindir/lang1 || { mkdir ${objpfx}domaindir/lang1 diff --git a/intl/tst-gettext4.sh b/intl/tst-gettext4.sh index 8acdd37882..68779be04d 100755 --- a/intl/tst-gettext4.sh +++ b/intl/tst-gettext4.sh @@ -21,18 +21,15 @@ # 02111-1307 USA. common_objpfx=$1 -objpfx=$2 +run_program_prefix=$2 +objpfx=$3 LC_ALL=C export LC_ALL -# Generate the test data. -test -d ${objpfx}domaindir || mkdir ${objpfx}domaindir # Create the domain directories. -test -d ${objpfx}domaindir/de_DE || mkdir ${objpfx}domaindir/de_DE -test -d ${objpfx}domaindir/de_DE/LC_MESSAGES || mkdir ${objpfx}domaindir/de_DE/LC_MESSAGES -test -d ${objpfx}domaindir/fr_FR || mkdir ${objpfx}domaindir/fr_FR -test -d ${objpfx}domaindir/fr_FR/LC_MESSAGES || mkdir ${objpfx}domaindir/fr_FR/LC_MESSAGES +mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES +mkdir -p ${objpfx}domaindir/fr_FR/LC_MESSAGES # Populate them. msgfmt -o ${objpfx}domaindir/de_DE/LC_MESSAGES/multithread.mo tst-gettext4-de.po msgfmt -o ${objpfx}domaindir/fr_FR/LC_MESSAGES/multithread.mo tst-gettext4-fr.po @@ -42,7 +39,6 @@ export GCONV_PATH LOCPATH=${common_objpfx}localedata export LOCPATH -${common_objpfx}elf/ld.so --library-path $common_objpfx \ -${objpfx}tst-gettext4 > ${objpfx}tst-gettext4.out +${run_program_prefix} ${objpfx}tst-gettext4 > ${objpfx}tst-gettext4.out exit $? diff --git a/intl/tst-gettext5.sh b/intl/tst-gettext5.sh index bbc58e796f..8c8d2170e4 100755 --- a/intl/tst-gettext5.sh +++ b/intl/tst-gettext5.sh @@ -22,16 +22,14 @@ # 02111-1307 USA. common_objpfx=$1 -objpfx=$2 +run_program_prefix=$2 +objpfx=$3 LC_ALL=C export LC_ALL -# Generate the test data. -test -d ${objpfx}domaindir || mkdir ${objpfx}domaindir # Create the domain directories. -test -d ${objpfx}domaindir/de_DE || mkdir ${objpfx}domaindir/de_DE -test -d ${objpfx}domaindir/de_DE/LC_MESSAGES || mkdir ${objpfx}domaindir/de_DE/LC_MESSAGES +mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES # Populate them. msgfmt -o ${objpfx}domaindir/de_DE/LC_MESSAGES/codeset.mo tstcodeset.po @@ -40,7 +38,6 @@ export GCONV_PATH LOCPATH=${common_objpfx}localedata export LOCPATH -${common_objpfx}elf/ld.so --library-path $common_objpfx \ -${objpfx}tst-gettext5 > ${objpfx}tst-gettext5.out +${run_program_prefix} ${objpfx}tst-gettext5 > ${objpfx}tst-gettext5.out exit $? diff --git a/intl/tst-translit.sh b/intl/tst-translit.sh index e2508df4df..22826e996c 100755 --- a/intl/tst-translit.sh +++ b/intl/tst-translit.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test of transliteration in gettext functions. -# Copyright (C) 2000, 2002 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc. # This file is part of the GNU C Library. # @@ -25,6 +25,9 @@ objpfx=$2 LC_ALL=C export LC_ALL +# Create the locale directories. +mkdir -p ${objpfx}localedir/existing-locale/LC_MESSAGES + msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/translit.mo \ translit.po -- cgit 1.4.1