This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, hjl/order, created. glibc-2.15-590-g54e3a9e


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  54e3a9e3af77622f40fd8d94904db13cf0cf9caa (commit)

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

commit 54e3a9e3af77622f40fd8d94904db13cf0cf9caa
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Apr 10 11:27:29 2012 -0700

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

diff --git a/ChangeLog.order b/ChangeLog.order
index 35baf5d..10a7a41 100644
--- a/ChangeLog.order
+++ b/ChangeLog.order
@@ -1,3 +1,8 @@
+2012-04-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/Implies: Move wordsize-64 to ...
+	* sysdeps/x86_64/64/Implies-after: Here.  New file.
+
 2012-03-22  Roland McGrath  <roland@hack.frob.com>
 
 	* configure.in: Support Implies-after.
diff --git a/sysdeps/x86_64/64/Implies-after b/sysdeps/x86_64/64/Implies-after
new file mode 100644
index 0000000..a8cae95
--- /dev/null
+++ b/sysdeps/x86_64/64/Implies-after
@@ -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

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

commit 201ac721a70308a369ea3ce199119d853a1bd3d8
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue Apr 10 11:26:02 2012 -0700

    Support Implies-after

diff --git a/ChangeLog.order b/ChangeLog.order
new file mode 100644
index 0000000..35baf5d
--- /dev/null
+++ b/ChangeLog.order
@@ -0,0 +1,4 @@
+2012-03-22  Roland McGrath  <roland@hack.frob.com>
+
+	* configure.in: Support Implies-after.
+	* configure: Regenerated.
diff --git a/configure b/configure
index 3d54d72..0c227ad 100755
--- a/configure
+++ b/configure
@@ -4331,14 +4331,16 @@ while test $# -gt 0; do
   test -n "$enable_debug_configure" &&
   echo "DEBUG: name/Implies $xsrcdir$name/Implies" >&2
 
-  if test -f $xsrcdir$name/Implies; then
+  for implies_file in Implies Implies-after; do
+    implies_type=`echo $implies_file | sed s/-/_/`
+    eval ${implies_type}=
+    if test -f $xsrcdir$name/$implies_file; then
     # Collect more names from the `Implies' file (removing comments).
-    implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/Implies`"
-    implied=
+      implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/$implies_file`"
     for x in $implied_candidate; do
       found=no
       if test -d $xsrcdir$name_base/$x; then
-	implied="$implied $name_base/$x";
+	  eval "${implies_type}=\"\$${implies_type} \$name_base/\$x\""
 	found=yes
       fi
       for d in $add_ons_pfx ''; do
@@ -4348,10 +4350,10 @@ while test $# -gt 0; do
 	 *) try_srcdir=$srcdir/ ;;
 	esac
 	test -n "$enable_debug_configure" &&
-	 echo "DEBUG: $name implied $x try($d) {$try_srcdir}$try" >&2
+	   echo "DEBUG: $name $implies_file $x try($d) {$try_srcdir}$try" >&2
 	if test $try != $xsrcdir$name_base/$x && test -d $try_srcdir$try;
 	then
-	  implied="$implied $try"
+	    eval "${implies_type}=\"\$${implies_type} \$try\""
 	  found=yes
 	  case "$sysnames_add_ons" in
 	  *" $d "*) ;;
@@ -4360,13 +4362,12 @@ while test $# -gt 0; do
 	fi
       done
       if test $found = no; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $name/Implies specifies nonexistent $x" >&5
-$as_echo "$as_me: WARNING: $name/Implies specifies nonexistent $x" >&2;}
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $name/$implies_file specifies nonexistent $x" >&5
+$as_echo "$as_me: WARNING: $name/$implies_file specifies nonexistent $x" >&2;}
       fi
     done
-  else
-    implied=
   fi
+  done
 
   # Add NAME to the list of names.
   names="$names $name"
@@ -4381,7 +4382,7 @@ $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).
-  sysnames="`echo $implied $* $parent`"
+  sysnames="`echo $Implies $* $parent $Implies_after`"
   test -n "$sysnames" && set $sysnames
 done
 
diff --git a/configure.in b/configure.in
index d8c55b1..8449a82 100644
--- a/configure.in
+++ b/configure.in
@@ -768,14 +768,16 @@ while test $# -gt 0; do
   test -n "$enable_debug_configure" &&
   echo "[DEBUG]: name/Implies $xsrcdir$name/Implies" >&2
 
-  if test -f $xsrcdir$name/Implies; then
+  for implies_file in Implies Implies-after; do
+    implies_type=`echo $implies_file | sed s/-/_/`
+    eval ${implies_type}=
+    if test -f $xsrcdir$name/$implies_file; then
     # Collect more names from the `Implies' file (removing comments).
-    implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/Implies`"
-    implied=
+      implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/$implies_file`"
     for x in $implied_candidate; do
       found=no
       if test -d $xsrcdir$name_base/$x; then
-	implied="$implied $name_base/$x";
+	  eval "${implies_type}=\"\$${implies_type} \$name_base/\$x\""
 	found=yes
       fi
       for d in $add_ons_pfx ''; do
@@ -785,10 +787,10 @@ while test $# -gt 0; do
 	 *) try_srcdir=$srcdir/ ;;
 	esac
 	test -n "$enable_debug_configure" &&
-	 echo "[DEBUG]: $name implied $x try($d) {$try_srcdir}$try" >&2
+	   echo "[DEBUG]: $name $implies_file $x try($d) {$try_srcdir}$try" >&2
 	if test $try != $xsrcdir$name_base/$x && test -d $try_srcdir$try;
 	then
-	  implied="$implied $try"
+	    eval "${implies_type}=\"\$${implies_type} \$try\""
 	  found=yes
 	  case "$sysnames_add_ons" in
 	  *" $d "*) ;;
@@ -797,12 +799,11 @@ while test $# -gt 0; do
 	fi
       done
       if test $found = no; then
-	AC_MSG_WARN($name/Implies specifies nonexistent $x)
+	  AC_MSG_WARN($name/$implies_file specifies nonexistent $x)
       fi
     done
-  else
-    implied=
   fi
+  done
 
   # Add NAME to the list of names.
   names="$names $name"
@@ -819,7 +820,7 @@ 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).
-  sysnames="`echo $implied $* $parent`"
+  sysnames="`echo $Implies $* $parent $Implies_after`"
   test -n "$sysnames" && set $sysnames
 done
 

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


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]