This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: PATCH: Move sysdeps/x86_64/Implies to sysdeps/x86_64/64
I tried the following patch (the real change has more indentation diffs)
and it didn't change anything for an existing x86_64-linux-gnu
configuration. Can you try this with x86_64/64/Implies-after containing
wordsize-64 and see how it comes out for x86_64 and x32 cases with your
changes?
I definitely want other people to give opinions about this before we decide
what to do.
Thanks,
Roland
diff --git a/configure.in b/configure.in
index 2363015..391a8d3 100644
--- a/configure.in
+++ b/configure.in
@@ -785,14 +785,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_type`"
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
@@ -802,10 +804,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 "*) ;;
@@ -814,12 +816,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"
@@ -836,7 +837,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