GNU C Library master sources branch, hjl/order, created. glibc-2.15-586-ga2e3214

[hjl 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, hjl/order has been created
        at  a2e3214d007c8c7cf6070fac053a1ff70c1b08b1 (commit)

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

commit a2e3214d007c8c7cf6070fac053a1ff70c1b08b1
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Mon Apr 9 13:07:33 2012 -0700

    Combine Implies from x86_64/64 with Implies from x86_64.

diff --git a/ChangeLog.order b/ChangeLog.order
index 490f7c0..98ffae1 100644
--- a/ChangeLog.order
+++ b/ChangeLog.order
@@ -1,3 +1,9 @@
+2012-04-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in: Combine Implies from x86_64/64 with Implies
+	from x86_64.
+	* configure: Regenerated.
+
 2012-04-08  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86_64/Implies (wordsize-64): Moved to ...
diff --git a/configure b/configure
index 3d54d72..ac29b2f 100755
--- a/configure
+++ b/configure
@@ -4381,6 +4381,28 @@ $as_echo "$as_me: WARNING: $name/Implies specifies nonexistent $x" >&2;}
   # configuration components; this ensures that for sysv4, unix/common
   # (implied by unix/sysv/sysv4) comes before unix/sysv (in ostry (here $*)
   # after sysv4).
+  if test $machine != $base_machine; then
+    # For x86_64/64, combine Implies from x86_64/64 with Implies from
+    # x86_64 so that implied directories from x86_64/64 are placed
+    # after x86_64.
+    case $name in
+    */$machine)
+      case $parent in
+      */$base_machine)
+	if test -f $xsrcdir$parent/Implies; then
+	  implied_parent=`echo implied_$parent | sed -e "s/-/_/g" -e "s@/@_@g"`
+	  eval "${implied_parent}=\"\$implied\""
+	  implied=
+	fi
+	;;
+      esac
+      ;;
+    */$base_machine)
+      implied_name=`echo implied_$name | sed -e "s/-/_/g" -e "s@/@_@g"`
+      eval "implied=\"\$${implied_name} \$implied\""
+      ;;
+    esac
+  fi
   sysnames="`echo $implied $* $parent`"
   test -n "$sysnames" && set $sysnames
 done
diff --git a/configure.in b/configure.in
index d8c55b1..8a5a15a 100644
--- a/configure.in
+++ b/configure.in
@@ -819,6 +819,28 @@ changequote([,])dnl
   # configuration components; this ensures that for sysv4, unix/common
   # (implied by unix/sysv/sysv4) comes before unix/sysv (in ostry (here $*)
   # after sysv4).
+  if test $machine != $base_machine; then
+    # For x86_64/64, combine Implies from x86_64/64 with Implies from
+    # x86_64 so that implied directories from x86_64/64 are placed
+    # after x86_64.
+    case $name in
+    */$machine)
+      case $parent in
+      */$base_machine)
+	if test -f $xsrcdir$parent/Implies; then
+	  implied_parent=`echo implied_$parent | sed -e "s/-/_/g" -e "s@/@_@g"`
+	  eval "${implied_parent}=\"\$implied\""
+	  implied=
+	fi
+	;;
+      esac
+      ;;
+    */$base_machine)
+      implied_name=`echo implied_$name | sed -e "s/-/_/g" -e "s@/@_@g"`
+      eval "implied=\"\$${implied_name} \$implied\""
+      ;;
+    esac
+  fi
   sysnames="`echo $implied $* $parent`"
   test -n "$sysnames" && set $sysnames
 done

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

commit 17b44cacabff2b7995735962f5dd4d631f7b6f3b
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sun Apr 8 07:33:02 2012 -0700

    Move wordsize-64 to sysdeps/x86_64/64/Implies

diff --git a/ChangeLog.order b/ChangeLog.order
new file mode 100644
index 0000000..490f7c0
--- /dev/null
+++ b/ChangeLog.order
@@ -0,0 +1,4 @@
+2012-04-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/Implies (wordsize-64): Moved to ...
+	* sysdeps/x86_64/64/Implies: Here.  New file.
diff --git a/sysdeps/x86_64/64/Implies b/sysdeps/x86_64/64/Implies
new file mode 100644
index 0000000..a8cae95
--- /dev/null
+++ b/sysdeps/x86_64/64/Implies
@@ -0,0 +1 @@
+wordsize-64
diff --git a/sysdeps/x86_64/Implies b/sysdeps/x86_64/Implies
index 2e0a323..c8d7d2d 100644
--- a/sysdeps/x86_64/Implies
+++ b/sysdeps/x86_64/Implies
@@ -1,4 +1,3 @@
-wordsize-64
 ieee754/ldbl-96
 ieee754/dbl-64/wordsize-64
 ieee754/dbl-64

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


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