GNU C Library master sources branch roland/configure-multiarch created. glibc-2.17-101-ge065b7f

[roland 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, roland/configure-multiarch has been created
        at  e065b7f02eed172a09cd5fca7369efe5d44c30a9 (commit)

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e065b7f02eed172a09cd5fca7369efe5d44c30a9

commit e065b7f02eed172a09cd5fca7369efe5d44c30a9
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jan 10 16:22:12 2013 -0800

    Fix multiarch handling in sysdeps generation.

diff --git a/ChangeLog b/ChangeLog
index e1bdc5d..5267e61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-01-10  Roland McGrath  <roland@hack.frob.com>
 
+	* configure.in (sysnames): Use $multi_arch_d in setting up $mach list,
+	not in the main loop.
+	* configure: Regenerated.
+
 	* configure.in (sysnames): Drop use of $m0sub and $msub, which are
 	never set.
 	* configure: Regenerated.
diff --git a/configure b/configure
index bdca5b3..5def4ea 100755
--- a/configure
+++ b/configure
@@ -4281,6 +4281,7 @@ if test x"$libc_cv_ld_gnu_indirect_function" != xyes; then
     multi_arch=no
   fi
 fi
+multi_arch_d=
 if test x"$multi_arch" != xno; then
   multi_arch_d=/multiarch
 fi
@@ -4333,11 +4334,17 @@ while m=`echo $tail | sed 's@^\(.*\)/\([^/]*\)$@& \1@'`; test -n "$m"; do
   set $m
   # Prepend the machine's FPU directory unless --without-fp.
   if test "$with_fp" = yes; then
-    mach="$mach /$1/fpu"
+    maybe_fpu=/fpu
   else
-    mach="$mach /$1/nofpu"
+    maybe_fpu=/nofpu
   fi
-  mach="$mach /$1"
+  # For each machine term, try it with and then without /multiarch.
+  for try_fpu in $maybe_fpu ''; do
+    for try_multi in $multi_arch_d ''; do
+echo >&2 "XXX try_fpu=$try_fpu try_multi=$try_multi try /$1$try_fpu$try_multi"
+      mach="$mach /$1$try_fpu$try_multi"
+    done
+  done
   tail="$2"
 done
 
@@ -4351,7 +4358,7 @@ for b in $base ''; do
       test "$v" = / && continue
       for o in /$ostry ''; do
 	test "$o" = / && continue
-	for m in $multi_arch_d $mach ''; do
+	for m in $mach ''; do
 	  for d in $add_ons_pfx ''; do
 	    for a in $add_ons_sfx ''; do
 	      try_suffix="$m0$b$v$o$m"
diff --git a/configure.in b/configure.in
index 96da720..797707a 100644
--- a/configure.in
+++ b/configure.in
@@ -626,6 +626,7 @@ if test x"$libc_cv_ld_gnu_indirect_function" != xyes; then
     multi_arch=no
   fi
 fi
+multi_arch_d=
 if test x"$multi_arch" != xno; then
   multi_arch_d=/multiarch
 fi
@@ -679,11 +680,16 @@ while m=`echo $tail | sed 's@^\(.*\)/\([^/]*\)$@& \1@'`; test -n "$m"; do
   set $m
   # Prepend the machine's FPU directory unless --without-fp.
   if test "$with_fp" = yes; then
-    mach="$mach /$1/fpu"
+    maybe_fpu=/fpu
   else
-    mach="$mach /$1/nofpu"
+    maybe_fpu=/nofpu
   fi
-  mach="$mach /$1"
+  # For each machine term, try it with and then without /multiarch.
+  for try_fpu in $maybe_fpu ''; do
+    for try_multi in $multi_arch_d ''; do
+      mach="$mach /$1$try_fpu$try_multi"
+    done
+  done
   tail="$2"
 done
 
@@ -699,7 +705,7 @@ for b in $base ''; do
       test "$v" = / && continue
       for o in /$ostry ''; do
 	test "$o" = / && continue
-	for m in $multi_arch_d $mach ''; do
+	for m in $mach ''; do
 	  for d in $add_ons_pfx ''; do
 	    for a in $add_ons_sfx ''; do
 	      try_suffix="$m0$b$v$o$m"

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2a31272c30761266bfccd0882d2ebd0ae00d264b

commit 2a31272c30761266bfccd0882d2ebd0ae00d264b
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jan 10 15:20:49 2013 -0800

    Remove some old cruft variables from configure.

diff --git a/ChangeLog b/ChangeLog
index 952a844..e1bdc5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@
 	never set.
 	* configure: Regenerated.
 
+2013-01-10  Roland McGrath  <roland@hack.frob.com>
+
+	* configure.in (sysnames): Drop use of $m0sub and $msub, which are
+	never set.
+	* configure: Regenerated.
+
 2013-01-10  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/sparc32/sparcv9/mul_1.S: Properly optimize for 32-bit

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


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