GNU C Library master sources branch master updated. glibc-2.18-182-g0a834dd

[vapier at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  0a834ddecbb08b79cbcf7d9460ab3d3d539c9962 (commit)
      from  e74a6fd9067e41bffe12406fc86277132bad5043 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0a834ddecbb08b79cbcf7d9460ab3d3d539c9962

commit 0a834ddecbb08b79cbcf7d9460ab3d3d539c9962
Author: Patrick 'P. J.' McDermott <pj@pehjota.net>
Date:   Wed Sep 11 17:53:08 2013 -0400

    don't use Bash-specific ${parameter/pattern/string} expansion
    
    sysdeps/unix/make-syscalls.sh and sysdeps/unix/Makefile use GNU Bash's
    ${parameter/pattern/string} parameter expansion.  Non-Bash shells (e.g.
    dash or BusyBox ash when built with CONFIG_ASH_BASH_COMPAT disabled)
    don't support this expansion syntax.  So glibc will fail to build when
    $(SHELL) expands to a path that isn't provided by Bash.
    
    An example build failure:
    
        for dir in [...]; do \
          test -f $dir/syscalls.list && \
          { sysdirs='[...]' \
            asm_CPP='gcc -c    -I[...]   -D_LIBC_REENTRANT -include include/libc-symbols.h       -DASSEMBLER  -g -Wa,--noexecstack   -E -x assembler-with-cpp' \
            /bin/sh sysdeps/unix/make-syscalls.sh $dir || exit 1; }; \
          test $dir = sysdeps/unix && break; \
        done > [build-dir]/sysd-syscallsT
        sysdeps/unix/make-syscalls.sh: line 273: syntax error: bad substitution
    
    This patch simply replaces the three instances of the Bash-only syntax
    in these files with an echo and sed command substitution.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index 19152d6..3594b32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-11  P. J. McDermott  <pj@pehjota.net>
+
+	* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Don't use
+	${Bash-specific parameter/pattern/string} parameter expansion.
+	* sysdeps/unix/make-syscalls.sh: Likewise.
+
 2013-09-27  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* sysdeps/sh/stackguard-macros.h: New file.
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index 375561f..2b607a0 100644
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -51,12 +51,14 @@ $(objpfx)stub-syscalls.c: $(common-objpfx)sysd-syscalls \
 	 for call in $(unix-stub-syscalls); do \
 	   case $$call in \
 	   *@@*) \
-	     ver=$${call##*@}; call=$${call%%@*}; ver=$${ver//./_}; \
+	     ver=$${call##*@}; call=$${call%%@*}; \
+	     ver=`echo "$ver" | sed 's/\./_/g'`; \
 	     echo "strong_alias (_no_syscall, __$${call}_$${ver})"; \
 	     echo "versioned_symbol (libc, __$${call}_$${ver}, $$call, $$ver);"\
 	     ;; \
 	   *@*) \
-	     ver=$${call##*@}; call=$${call%%@*}; ver=$${ver//./_}; \
+	     ver=$${call##*@}; call=$${call%%@*}; \
+	     ver=`echo "$ver" | sed 's/\./_/g'`; \
 	     echo "strong_alias (_no_syscall, __$${call}_$${ver})"; \
 	     echo "compat_symbol (libc, __$${call}_$${ver}, $$call, $$ver);" \
 	     ;; \
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh
index f04f2ab..6eba62c 100644
--- a/sysdeps/unix/make-syscalls.sh
+++ b/sysdeps/unix/make-syscalls.sh
@@ -275,7 +275,7 @@ while read file srcfile caller syscall args strong weak; do
     # name in the vDSO and KERNEL_X.Y is its symbol version.
     vdso_symbol="${vdso_syscall%@*}"
     vdso_symver="${vdso_syscall#*@}"
-    vdso_symver="${vdso_symver//./_}"
+    vdso_symver=`echo "$vdso_symver" | sed 's/\./_/g'`
     echo "\
 \$(foreach p,\$(sysd-rules-targets),\$(objpfx)\$(patsubst %,\$p,$file).os): \\
 		\$(..)sysdeps/unix/make-syscalls.sh\

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |    6 ++++++
 sysdeps/unix/Makefile         |    6 ++++--
 sysdeps/unix/make-syscalls.sh |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources