This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 01/15] Support multiarch under OS directory
- From: Andi Kleen <andi at firstfloor dot org>
- To: libc-alpha at sourceware dot org
- Cc: hjl dot tools at gmail dot com
- Date: Sat, 22 Dec 2012 19:02:28 -0800
- Subject: [PATCH 01/15] Support multiarch under OS directory
From: "H.J. Lu" <hjl.tools@gmail.com>
---
ChangeLog.pr14941 | 5 ++++
configure | 62 ++++++++++++++++++++++++++++------------------------
configure.in | 62 ++++++++++++++++++++++++++++------------------------
3 files changed, 71 insertions(+), 58 deletions(-)
create mode 100644 ChangeLog.pr14941
diff --git a/ChangeLog.pr14941 b/ChangeLog.pr14941
new file mode 100644
index 0000000..9057080
--- /dev/null
+++ b/ChangeLog.pr14941
@@ -0,0 +1,5 @@
+2012-12-10 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #14941]
+ * configure.in: Add m0sub and msub for multiarch check.
+ * configure: Regenerated.
diff --git a/configure b/configure
index 8799b7d..bf73d05 100755
--- a/configure
+++ b/configure
@@ -4347,36 +4347,40 @@ sysnames_add_ons=
sysnames=
for b in $base ''; do
for m0 in $mach ''; do
- for v in /$vendor ''; do
- test "$v" = / && continue
- for o in /$ostry ''; do
- test "$o" = / && continue
- for m in $multi_arch_d $mach ''; do
- for d in $add_ons_pfx ''; do
- for a in $add_ons_sfx ''; do
- if test -n "$m0$m0sub$b$v$o$m$msub"; then
- try_srcdir="${srcdir}/"
- case "$d" in
- /*) try_srcdir= ;;
- esac
- try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
- test -n "$enable_debug_configure" &&
- echo "$0 DEBUG: try $try" >&2
- if test -d "$try_srcdir$try"; then
- sysnames="$sysnames $try"
- { test -n "$o" || test -n "$b"; } && os_used=t
- { test -n "$m" || test -n "$m0"; } && machine_used=t
- case x${m0:-$m} in
- x*/$submachine) submachine_used=t ;;
- esac
- if test -n "$d"; then
- case "$sysnames_add_ons" in
- *" $d "*) ;;
- *|'') sysnames_add_ons="$sysnames_add_ons $d" ;;
+ for m0sub in $mach ''; do
+ for v in /$vendor ''; do
+ test "$v" = / && continue
+ for o in /$ostry ''; do
+ test "$o" = / && continue
+ for m in $multi_arch_d $mach ''; do
+ for msub in $multi_arch_d $mach ''; do
+ for d in $add_ons_pfx ''; do
+ for a in $add_ons_sfx ''; do
+ if test -n "$m0$m0sub$b$v$o$m$msub"; then
+ try_srcdir="${srcdir}/"
+ case "$d" in
+ /*) try_srcdir= ;;
esac
- fi
- fi
- fi
+ try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
+ test -n "$enable_debug_configure" &&
+ echo "$0 DEBUG: try $try" >&2
+ if test -d "$try_srcdir$try"; then
+ sysnames="$sysnames $try"
+ { test -n "$o" || test -n "$b"; } && os_used=t
+ { test -n "$m" || test -n "$m0"; } && machine_used=t
+ case x${m0:-$m} in
+ x*/$submachine) submachine_used=t ;;
+ esac
+ if test -n "$d"; then
+ case "$sysnames_add_ons" in
+ *" $d "*) ;;
+ *|'') sysnames_add_ons="$sysnames_add_ons $d" ;;
+ esac
+ fi
+ fi
+ fi
+ done
+ done
done
done
done
diff --git a/configure.in b/configure.in
index d369382..e0f391d 100644
--- a/configure.in
+++ b/configure.in
@@ -695,36 +695,40 @@ sysnames_add_ons=
sysnames=
for b in $base ''; do
for m0 in $mach ''; do
- for v in /$vendor ''; do
- test "$v" = / && continue
- for o in /$ostry ''; do
- test "$o" = / && continue
- for m in $multi_arch_d $mach ''; do
- for d in $add_ons_pfx ''; do
- for a in $add_ons_sfx ''; do
- if test -n "$m0$m0sub$b$v$o$m$msub"; then
- try_srcdir="${srcdir}/"
- case "$d" in
- /*) try_srcdir= ;;
- esac
- try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
- test -n "$enable_debug_configure" &&
- echo "$0 [DEBUG]: try $try" >&2
- if test -d "$try_srcdir$try"; then
- sysnames="$sysnames $try"
- { test -n "$o" || test -n "$b"; } && os_used=t
- { test -n "$m" || test -n "$m0"; } && machine_used=t
- case x${m0:-$m} in
- x*/$submachine) submachine_used=t ;;
- esac
- if test -n "$d"; then
- case "$sysnames_add_ons" in
- *" $d "*) ;;
- *|'') sysnames_add_ons="$sysnames_add_ons $d" ;;
+ for m0sub in $mach ''; do
+ for v in /$vendor ''; do
+ test "$v" = / && continue
+ for o in /$ostry ''; do
+ test "$o" = / && continue
+ for m in $multi_arch_d $mach ''; do
+ for msub in $multi_arch_d $mach ''; do
+ for d in $add_ons_pfx ''; do
+ for a in $add_ons_sfx ''; do
+ if test -n "$m0$m0sub$b$v$o$m$msub"; then
+ try_srcdir="${srcdir}/"
+ case "$d" in
+ /*) try_srcdir= ;;
esac
- fi
- fi
- fi
+ try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
+ test -n "$enable_debug_configure" &&
+ echo "$0 [DEBUG]: try $try" >&2
+ if test -d "$try_srcdir$try"; then
+ sysnames="$sysnames $try"
+ { test -n "$o" || test -n "$b"; } && os_used=t
+ { test -n "$m" || test -n "$m0"; } && machine_used=t
+ case x${m0:-$m} in
+ x*/$submachine) submachine_used=t ;;
+ esac
+ if test -n "$d"; then
+ case "$sysnames_add_ons" in
+ *" $d "*) ;;
+ *|'') sysnames_add_ons="$sysnames_add_ons $d" ;;
+ esac
+ fi
+ fi
+ fi
+ done
+ done
done
done
done
--
1.7.7.6