This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/pr14941 created. glibc-2.16-ports-merge-863-gcbbb996
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 Dec 2012 19:56:07 -0000
- Subject: GNU C Library master sources branch hjl/pr14941 created. glibc-2.16-ports-merge-863-gcbbb996
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/pr14941 has been created
at cbbb9961acea278ac7e250da4c2b9b95451d5772 (commit)
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cbbb9961acea278ac7e250da4c2b9b95451d5772
commit cbbb9961acea278ac7e250da4c2b9b95451d5772
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Mon Dec 10 11:54:27 2012 -0800
Properly check x86 directory for i386 and x86_64
Properly check multiarch directory.
diff --git a/ChangeLog.pr14941 b/ChangeLog.pr14941
new file mode 100644
index 0000000..6ed2858
--- /dev/null
+++ b/ChangeLog.pr14941
@@ -0,0 +1,19 @@
+2012-12-10 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #14941]
+ * configure.in: Also check x86 directory for i386 and x86_64.
+ Add m0sub and msub for multiarch check.
+ * configure: Regenerated.
+ * sysdeps/i386/Implies: Removed x86.
+ * sysdeps/x86_64/Implies: Likewise.
+ * sysdeps/unix/sysv/linux/i386/Implies: Removed.
+ * sysdeps/unix/sysv/linux/x86_64/Implies: Remove
+ unix/sysv/linux/x86.
+
+nptl/
+
+2012-12-10 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #14941]
+ * sysdeps/unix/sysv/linux/i386/Implies: Removed.
+ * sysdeps/unix/sysv/linux/x86_64/Implies: Likewise.
diff --git a/configure b/configure
index 8799b7d..9cb0926 100755
--- a/configure
+++ b/configure
@@ -4342,41 +4342,52 @@ while m=`echo $tail | sed 's@^\(.*\)/\([^/]*\)$@& \1@'`; test -n "$m"; do
done
+# Add /x86 for i386 and x86_64.
+case "$base_machine" in
+ i[34567]86 | x86_64)
+ mach="$mach /x86"
+ ;;
+esac
+
# Find what sysdep directories exist.
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..f1536b2 100644
--- a/configure.in
+++ b/configure.in
@@ -690,41 +690,52 @@ done
dnl We are done with glob and regexp uses of [ and ]; return to autoconf.
changequote([,])dnl
+# Add /x86 for i386 and x86_64.
+case "$base_machine" in
+ i[[34567]]86 | x86_64)
+ mach="$mach /x86"
+ ;;
+esac
+
# Find what sysdep directories exist.
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/nptl/sysdeps/unix/sysv/linux/i386/Implies b/nptl/sysdeps/unix/sysv/linux/i386/Implies
deleted file mode 100644
index ccc7eaa..0000000
--- a/nptl/sysdeps/unix/sysv/linux/i386/Implies
+++ /dev/null
@@ -1 +0,0 @@
-unix/sysv/linux/x86
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/Implies b/nptl/sysdeps/unix/sysv/linux/x86_64/Implies
deleted file mode 100644
index ccc7eaa..0000000
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/Implies
+++ /dev/null
@@ -1 +0,0 @@
-unix/sysv/linux/x86
diff --git a/sysdeps/i386/Implies b/sysdeps/i386/Implies
index 20b2dff..3a32442 100644
--- a/sysdeps/i386/Implies
+++ b/sysdeps/i386/Implies
@@ -1,4 +1,3 @@
-x86
wordsize-32
ieee754/ldbl-96
ieee754/dbl-64
diff --git a/sysdeps/unix/sysv/linux/i386/Implies b/sysdeps/unix/sysv/linux/i386/Implies
deleted file mode 100644
index ccc7eaa..0000000
--- a/sysdeps/unix/sysv/linux/i386/Implies
+++ /dev/null
@@ -1 +0,0 @@
-unix/sysv/linux/x86
diff --git a/sysdeps/unix/sysv/linux/x86_64/Implies b/sysdeps/unix/sysv/linux/x86_64/Implies
index c7a65c9..8d91c80 100644
--- a/sysdeps/unix/sysv/linux/x86_64/Implies
+++ b/sysdeps/unix/sysv/linux/x86_64/Implies
@@ -1,2 +1 @@
-unix/sysv/linux/x86
unix/sysv/linux/wordsize-64
diff --git a/sysdeps/x86_64/Implies b/sysdeps/x86_64/Implies
index 811c19a..c8d7d2d 100644
--- a/sysdeps/x86_64/Implies
+++ b/sysdeps/x86_64/Implies
@@ -1,4 +1,3 @@
-x86
ieee754/ldbl-96
ieee754/dbl-64/wordsize-64
ieee754/dbl-64
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources