This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
Re: PATCH: Re: Do we really want to use i586 code for i686?
On Mon, Nov 12, 2001 at 05:25:59PM -0500, Roland McGrath wrote:
>
> > That may work. How about we have
> >
> > local:i586
> >
> > to indicate it should apply locally? It can be used both in libc and
> > add-ons.
>
> Something like that seems ok to me. I don't have much opinion about syntax.
How about this?
H.J.
----
2001-11-12 H.J. Lu <hjl@gnu.org>
* configure.in: Limit Implies within the subdirectory if there
is a `local:' prefix.
* configure: Rebuild.
2001-11-12 H.J. Lu <hjl@gnu.org>
* sysdeps/i386/i686/Implies: Preappend `local:'.
--- libc/configure.in.addon Wed Aug 29 11:48:49 2001
+++ libc/configure.in Mon Nov 12 14:46:47 2001
@@ -502,26 +502,34 @@ while test $# -gt 0; do
# Collect more names from the `Implies' file (removing comments).
implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/Implies`"
implied=
- for x in $implied_candidate; do
+ for xi in $implied_candidate; do
found=no
+ x=`echo $xi | sed -e "s/local://"`
+ if test $x = $xi; then
+ local=no
+ else
+ local=yes
+ fi
if test -d $xsrcdir$name_base/$x; then
implied="$implied $name_base/$x";
found=yes
fi
- for d in $add_ons_pfx ''; do
- try="${d}sysdeps/$x"
- case $d in
- /*) try_srcdir= ;;
- *) try_srcdir=$srcdir/ ;;
- esac
- test -n "$enable_debug_configure" &&
- echo "[DEBUG]: $name implied $x try($d) {$try_srcdir}$try" >&2
- if test $try != $xsrcdir$name_base/$x && test -d $try_srcdir$try;
- then
- implied="$implied $try"
- found=yes
- fi
- done
+ if test $local = "no"; then
+ for d in $add_ons_pfx ''; do
+ try="${d}sysdeps/$x"
+ case $d in
+ /*) try_srcdir= ;;
+ *) try_srcdir=$srcdir/ ;;
+ esac
+ test -n "$enable_debug_configure" &&
+ echo "[DEBUG]: $name implied $x try($d) {$try_srcdir}$try" >&2
+ if test $try != $xsrcdir$name_base/$x && test -d $try_srcdir$try;
+ then
+ implied="$implied $try"
+ found=yes
+ fi
+ done
+ fi
if test $found = no; then
AC_MSG_WARN($name/Implies specifies nonexistent $x)
fi
--- libc/linuxthreads/sysdeps/i386/i686/Implies.addon Sat Apr 21 00:54:13 2001
+++ libc/linuxthreads/sysdeps/i386/i686/Implies Mon Nov 12 14:44:23 2001
@@ -1 +1 @@
-i386/i586
+local:i386/i586