Change Implies to shell script hjl/implies

111 files changed, 306 insertions, 167 deletions

diff --git a/ChangeLog.implies b/ChangeLog.implies
index 94350b394a..0fee3321fb 100644
--- a/ChangeLog.implies
+++ b/ChangeLog.implies
@@ -1,3 +1,76 @@
+2012-07-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in (sysnames): Run Implies to get implied directory.
+	* configure: Regenerated.
+	* sysdeps/i386/Implies: Changed it to shell script.
+	* sysdeps/i386/fpu/Implies: Likewise.
+	* sysdeps/i386/i586/Implies: Likewise.
+	* sysdeps/i386/i686/Implies: Likewise.
+	* sysdeps/i386/i786/Implies: Likewise.
+	* sysdeps/mach/hurd/Implies: Likewise.
+	* sysdeps/powerpc/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/970/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/power5+/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/power5/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/power6/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/power6x/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/power7/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/970/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5+/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power5/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power6x/Implies: Likewise.
+	* sysdeps/powerpc/powerpc64/power7/Implies: Likewise.
+	* sysdeps/s390/Implies: Likewise.
+	* sysdeps/s390/s390-32/Implies: Likewise.
+	* sysdeps/s390/s390-64/Implies: Likewise.
+	* sysdeps/sh/Implies: Likewise.
+	* sysdeps/sparc/sparc32/Implies: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/unix/sysv/linux/multiarch/Implies:
+	Likewise.
+	* sysdeps/sparc/sparc64/Implies: Likewise.
+	* sysdeps/unix/Implies: Likewise.
+	* sysdeps/unix/bsd/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/i386/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/970/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/a2/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/fpu/Implies:
+	Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power4/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power5+/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power5/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power6x/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power7/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/a2/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/fpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power4/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power5+/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power5/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power6x/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power7/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/s390/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/s390/fpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-64/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/fpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/fpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/Implies: Likewise.
+	* sysdeps/x86_64/Implies: Likewise.
+	* sysdeps/x86_64/fpu/Implies: Likewise.
+
 2012-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* configure.in (sysnames): Don't look for Implies-before and
diff --git a/configure b/configure
index fab64655a8..55c7fe920d 100755
--- a/configure
+++ b/configure
@@ -4278,18 +4278,9 @@ while test $# -gt 0; do
 
   if test -f $xsrcdir$name/Implies; then
     # Collect more names from the `Implies' file (removing comments).
-    implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/Implies`"
+    implied_candidate="`. $xsrcdir$name/Implies`"
     implied=
     for x in $implied_candidate; do
-      case $x in
-	"\$"*:*:*)
-	  implied_var="`echo $x | sed 's/:.*$//'`"
-	  eval "implied_var=$implied_var"
-	  implied_cond="`echo $x | sed 's/.*:\(.*\):.*$/\1/'`"
-	  test "$implied_var" = "$implied_cond" || continue
-	  x="`echo $x | sed 's/.*://'`"
-	  ;;
-      esac
       found=no
       if test -d $xsrcdir$name_base/$x; then
 	implied="$implied $name_base/$x";
diff --git a/configure.in b/configure.in
index 4ff5802e3e..42742d0a0b 100644
--- a/configure.in
+++ b/configure.in
@@ -771,18 +771,9 @@ while test $# -gt 0; do
 
   if test -f $xsrcdir$name/Implies; then
     # Collect more names from the `Implies' file (removing comments).
-    implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/Implies`"
+    implied_candidate="`. $xsrcdir$name/Implies`"
     implied=
     for x in $implied_candidate; do
-      case $x in
-	"\$"*:*:*)
-	  implied_var="`echo $x | sed 's/:.*$//'`"
-	  eval "implied_var=$implied_var"
-	  implied_cond="`echo $x | sed 's/.*:\(.*\):.*$/\1/'`"
-	  test "$implied_var" = "$implied_cond" || continue
-	  x="`echo $x | sed 's/.*://'`"
-	  ;;
-      esac
       found=no
       if test -d $xsrcdir$name_base/$x; then
 	implied="$implied $name_base/$x";
diff --git a/nptl/ChangeLog.implies b/nptl/ChangeLog.implies
new file mode 100644
index 0000000000..4c4981ce1b
--- /dev/null
+++ b/nptl/ChangeLog.implies
@@ -0,0 +1,6 @@
+2012-07-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/unix/sysv/linux/Implies: Changed it to shell script.
+	* sysdeps/unix/sysv/linux/i386/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/i386/i786/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/Implies: Likewise.
diff --git a/nptl/sysdeps/unix/sysv/linux/Implies b/nptl/sysdeps/unix/sysv/linux/Implies
index f1b3e8939c..d1eaa927e3 100644
--- a/nptl/sysdeps/unix/sysv/linux/Implies
+++ b/nptl/sysdeps/unix/sysv/linux/Implies
@@ -1 +1 @@
-pthread
+echo pthread
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/Implies b/nptl/sysdeps/unix/sysv/linux/i386/Implies
index ccc7eaa8a4..3ee13c7528 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/Implies
+++ b/nptl/sysdeps/unix/sysv/linux/i386/Implies
@@ -1 +1 @@
-unix/sysv/linux/x86
+echo unix/sysv/linux/x86
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i786/Implies b/nptl/sysdeps/unix/sysv/linux/i386/i786/Implies
index 7cb7d9a678..28d310de99 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i786/Implies
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i786/Implies
@@ -1,2 +1,2 @@
 # The PPro and PII cores are mostly the same.
-unix/sysv/linux/i386/i686
+echo unix/sysv/linux/i386/i686
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/Implies b/nptl/sysdeps/unix/sysv/linux/x86_64/Implies
index ccc7eaa8a4..3ee13c7528 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/Implies
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/Implies
@@ -1 +1 @@
-unix/sysv/linux/x86
+echo unix/sysv/linux/x86
diff --git a/ports/ChangeLog.implies b/ports/ChangeLog.implies
new file mode 100644
index 0000000000..c654bc925f
--- /dev/null
+++ b/ports/ChangeLog.implies
@@ -0,0 +1,38 @@
+2012-07-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/alpha/Implies: Changed it to shell script.
+	* sysdeps/alpha/alphaev6/Implies: Likewise.
+	* sysdeps/alpha/alphaev67/Implies: Likewise.
+	* sysdeps/alpha/alphaev67/fpu/Implies: Likewise.
+	* sysdeps/am33/Implies: Likewise.
+	* sysdeps/arm/Implies: Likewise.
+	* sysdeps/arm/armv7/Implies: Likewise.
+	* sysdeps/hppa/hppa1.1/Implies: Likewise.
+	* sysdeps/ia64/Implies: Likewise.
+	* sysdeps/m68k/Implies: Likewise.
+	* sysdeps/m68k/m680x0/Implies: Likewise.
+	* sysdeps/mips/Implies: Likewise.
+	* sysdeps/mips/mips32/Implies: Likewise.
+	* sysdeps/mips/mips64/Implies: Likewise.
+	* sysdeps/mips/mips64/n32/Implies: Likewise.
+	* sysdeps/mips/mips64/n64/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/440/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/464/Implies: Likewise.
+	* sysdeps/powerpc/powerpc32/476/Implies: Likewise.
+	* sysdeps/tile/Implies: Likewise.
+	* sysdeps/tile/tilegx/tilegx32/Implies: Likewise.
+	* sysdeps/tile/tilegx/tilegx64/Implies: Likewise.
+	* sysdeps/tile/tilepro/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/alphaev6/fpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/alphaev67/fpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/fpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/405/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/440/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/464/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/476/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Implies: Likewise.
+	* sysdeps/unix/sysv/linux/tile/tilepro/Implies: Likewise.
diff --git a/ports/sysdeps/alpha/Implies b/ports/sysdeps/alpha/Implies
index d03783b127..052cf76a70 100644
--- a/ports/sysdeps/alpha/Implies
+++ b/ports/sysdeps/alpha/Implies
@@ -1,7 +1,9 @@
-wordsize-64
+echo wordsize-64
 # Alpha uses IEEE 754 single, double and quad precision floating point.
+cat <<EOF
 ieee754/ldbl-128
 ieee754/dbl-64/wordsize-64
 ieee754/dbl-64
 ieee754/flt-32
 alpha/soft-fp
+EOF
diff --git a/ports/sysdeps/alpha/alphaev6/Implies b/ports/sysdeps/alpha/alphaev6/Implies
index 0e7fc170ba..bbc504e8f9 100644
--- a/ports/sysdeps/alpha/alphaev6/Implies
+++ b/ports/sysdeps/alpha/alphaev6/Implies
@@ -1 +1 @@
-alpha/alphaev5
+echo alpha/alphaev5
diff --git a/ports/sysdeps/alpha/alphaev67/Implies b/ports/sysdeps/alpha/alphaev67/Implies
index 49d19c4ad8..fcf4e266dc 100644
--- a/ports/sysdeps/alpha/alphaev67/Implies
+++ b/ports/sysdeps/alpha/alphaev67/Implies
@@ -1 +1 @@
-alpha/alphaev6
+echo alpha/alphaev6
diff --git a/ports/sysdeps/alpha/alphaev67/fpu/Implies b/ports/sysdeps/alpha/alphaev67/fpu/Implies
index 9e3f12d0ac..b6fd139066 100644
--- a/ports/sysdeps/alpha/alphaev67/fpu/Implies
+++ b/ports/sysdeps/alpha/alphaev67/fpu/Implies
@@ -1 +1 @@
-alpha/alphaev6/fpu
+echo alpha/alphaev6/fpu
diff --git a/ports/sysdeps/am33/Implies b/ports/sysdeps/am33/Implies
index 780c4e2467..9a77a8115e 100644
--- a/ports/sysdeps/am33/Implies
+++ b/ports/sysdeps/am33/Implies
@@ -1,3 +1,5 @@
+cat <<EOF
 wordsize-32
 ieee754/flt-32
 ieee754/dbl-64
+EOF
diff --git a/ports/sysdeps/arm/Implies b/ports/sysdeps/arm/Implies
index 780c4e2467..9a77a8115e 100644
--- a/ports/sysdeps/arm/Implies
+++ b/ports/sysdeps/arm/Implies
@@ -1,3 +1,5 @@
+cat <<EOF
 wordsize-32
 ieee754/flt-32
 ieee754/dbl-64
+EOF
diff --git a/ports/sysdeps/arm/armv7/Implies b/ports/sysdeps/arm/armv7/Implies
index c6cd0eb877..4b06075d64 100644
--- a/ports/sysdeps/arm/armv7/Implies
+++ b/ports/sysdeps/arm/armv7/Implies
@@ -1,2 +1,2 @@
 # We can do everything that 6T2 can
-arm/armv6t2
+echo arm/armv6t2
diff --git a/ports/sysdeps/hppa/hppa1.1/Implies b/ports/sysdeps/hppa/hppa1.1/Implies
index 780c4e2467..9a77a8115e 100644
--- a/ports/sysdeps/hppa/hppa1.1/Implies
+++ b/ports/sysdeps/hppa/hppa1.1/Implies
@@ -1,3 +1,5 @@
+cat <<EOF
 wordsize-32
 ieee754/flt-32
 ieee754/dbl-64
+EOF
diff --git a/ports/sysdeps/ia64/Implies b/ports/sysdeps/ia64/Implies
index 8524257020..7ec90aa188 100644
--- a/ports/sysdeps/ia64/Implies
+++ b/ports/sysdeps/ia64/Implies
@@ -1,5 +1,7 @@
-wordsize-64
+echo wordsize-64
 # ia64 uses IEEE 754 floating point.
+cat <<EOF
 ieee754/ldbl-96
 ieee754/dbl-64
 ieee754/flt-32
+EOF
diff --git a/ports/sysdeps/m68k/Implies b/ports/sysdeps/m68k/Implies
index beaba937de..da21446765 100644
--- a/ports/sysdeps/m68k/Implies
+++ b/ports/sysdeps/m68k/Implies
@@ -1,4 +1,4 @@
-wordsize-32
+echo wordsize-32
 # 68k uses IEEE 754 floating point.
-ieee754/dbl-64
-ieee754/flt-32
+echo ieee754/dbl-64
+echo ieee754/flt-32
diff --git a/ports/sysdeps/m68k/m680x0/Implies b/ports/sysdeps/m68k/m680x0/Implies
index abf356d9e8..d9ce70656c 100644
--- a/ports/sysdeps/m68k/m680x0/Implies
+++ b/ports/sysdeps/m68k/m680x0/Implies
@@ -1 +1 @@
-ieee754/ldbl-96
+echo ieee754/ldbl-96
diff --git a/ports/sysdeps/mips/Implies b/ports/sysdeps/mips/Implies
index 8c18cb3034..b852ea3cbd 100644
--- a/ports/sysdeps/mips/Implies
+++ b/ports/sysdeps/mips/Implies
@@ -1,3 +1,3 @@
 # MIPS uses IEEE 754 floating point.
-ieee754/flt-32
-ieee754/dbl-64
+echo ieee754/flt-32
+echo ieee754/dbl-64
diff --git a/ports/sysdeps/mips/mips32/Implies b/ports/sysdeps/mips/mips32/Implies
index fab98d7312..d8ef1de47c 100644
--- a/ports/sysdeps/mips/mips32/Implies
+++ b/ports/sysdeps/mips/mips32/Implies
@@ -1,2 +1,2 @@
-mips
-wordsize-32
+echo mips
+echo wordsize-32
diff --git a/ports/sysdeps/mips/mips64/Implies b/ports/sysdeps/mips/mips64/Implies
index 8c18cb3034..b852ea3cbd 100644
--- a/ports/sysdeps/mips/mips64/Implies
+++ b/ports/sysdeps/mips/mips64/Implies
@@ -1,3 +1,3 @@
 # MIPS uses IEEE 754 floating point.
-ieee754/flt-32
-ieee754/dbl-64
+echo ieee754/flt-32
+echo ieee754/dbl-64
diff --git a/ports/sysdeps/mips/mips64/n32/Implies b/ports/sysdeps/mips/mips64/n32/Implies
index bed8f14c30..d0aa17cc6a 100644
--- a/ports/sysdeps/mips/mips64/n32/Implies
+++ b/ports/sysdeps/mips/mips64/n32/Implies
@@ -1,5 +1,7 @@
+cat <<EOF
 ieee754/ldbl-128
 mips/mips64/soft-fp
 mips/mips64
 mips
 wordsize-32
+EOF
diff --git a/ports/sysdeps/mips/mips64/n64/Implies b/ports/sysdeps/mips/mips64/n64/Implies
index 214b85c776..871fb71e52 100644
--- a/ports/sysdeps/mips/mips64/n64/Implies
+++ b/ports/sysdeps/mips/mips64/n64/Implies
@@ -1,5 +1,7 @@
+cat <<EOF
 ieee754/ldbl-128
 mips/mips64/soft-fp
 mips/mips64
 mips
 wordsize-64
+EOF
diff --git a/ports/sysdeps/powerpc/powerpc32/440/Implies b/ports/sysdeps/powerpc/powerpc32/440/Implies
index 70c0d2eda3..c166052cfa 100644
--- a/ports/sysdeps/powerpc/powerpc32/440/Implies
+++ b/ports/sysdeps/powerpc/powerpc32/440/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/405/fpu
-powerpc/powerpc32/405
+echo powerpc/powerpc32/405/fpu
+echo powerpc/powerpc32/405
diff --git a/ports/sysdeps/powerpc/powerpc32/464/Implies b/ports/sysdeps/powerpc/powerpc32/464/Implies
index c3e52c5504..6897a98093 100644
--- a/ports/sysdeps/powerpc/powerpc32/464/Implies
+++ b/ports/sysdeps/powerpc/powerpc32/464/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/440/fpu
-powerpc/powerpc32/440
+echo powerpc/powerpc32/440/fpu
+echo powerpc/powerpc32/440
diff --git a/ports/sysdeps/powerpc/powerpc32/476/Implies b/ports/sysdeps/powerpc/powerpc32/476/Implies
index 2829f9ccaf..b99611cfa9 100644
--- a/ports/sysdeps/powerpc/powerpc32/476/Implies
+++ b/ports/sysdeps/powerpc/powerpc32/476/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/464/fpu
-powerpc/powerpc32/464
+echo powerpc/powerpc32/464/fpu
+echo powerpc/powerpc32/464
diff --git a/ports/sysdeps/tile/Implies b/ports/sysdeps/tile/Implies
index 5b29b26128..da1a8b0210 100644
--- a/ports/sysdeps/tile/Implies
+++ b/ports/sysdeps/tile/Implies
@@ -1,2 +1,2 @@
-ieee754/dbl-64
-ieee754/flt-32
+echo ieee754/dbl-64
+echo ieee754/flt-32
diff --git a/ports/sysdeps/tile/tilegx/tilegx32/Implies b/ports/sysdeps/tile/tilegx/tilegx32/Implies
index 993b7f4cd1..e55debae07 100644
--- a/ports/sysdeps/tile/tilegx/tilegx32/Implies
+++ b/ports/sysdeps/tile/tilegx/tilegx32/Implies
@@ -1,3 +1,5 @@
+cat <<EOF
 tile/tilegx
 tile
 wordsize-32
+EOF
diff --git a/ports/sysdeps/tile/tilegx/tilegx64/Implies b/ports/sysdeps/tile/tilegx/tilegx64/Implies
index eb0686e0e6..161a4bcfe6 100644
--- a/ports/sysdeps/tile/tilegx/tilegx64/Implies
+++ b/ports/sysdeps/tile/tilegx/tilegx64/Implies
@@ -1,3 +1,5 @@
+cat <<EOF
 tile/tilegx
 tile
 wordsize-64
+EOF
diff --git a/ports/sysdeps/tile/tilepro/Implies b/ports/sysdeps/tile/tilepro/Implies
index 709e1dc122..1032b8ce59 100644
--- a/ports/sysdeps/tile/tilepro/Implies
+++ b/ports/sysdeps/tile/tilepro/Implies
@@ -1,2 +1,2 @@
-tile
-wordsize-32
+echo tile
+echo wordsize-32
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/Implies b/ports/sysdeps/unix/sysv/linux/alpha/Implies
index 1616efecbe..ebfe4d63a3 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/Implies
+++ b/ports/sysdeps/unix/sysv/linux/alpha/Implies
@@ -1,4 +1,4 @@
-unix/sysv/linux/wordsize-64
+echo unix/sysv/linux/wordsize-64
 # These supply the ABI compatibility for when long double was double.
-ieee754/ldbl-64-128
-ieee754/ldbl-opt
+echo ieee754/ldbl-64-128
+echo ieee754/ldbl-opt
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/alphaev6/fpu/Implies b/ports/sysdeps/unix/sysv/linux/alpha/alphaev6/fpu/Implies
index 0d7000dc2d..be1e3856a1 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/alphaev6/fpu/Implies
+++ b/ports/sysdeps/unix/sysv/linux/alpha/alphaev6/fpu/Implies
@@ -1,2 +1,2 @@
 # Override ldbl-opt with alpha specific routines.
-alpha/alphaev6/fpu
+echo alpha/alphaev6/fpu
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/alphaev67/fpu/Implies b/ports/sysdeps/unix/sysv/linux/alpha/alphaev67/fpu/Implies
index 617c388d2d..32937c1968 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/alphaev67/fpu/Implies
+++ b/ports/sysdeps/unix/sysv/linux/alpha/alphaev67/fpu/Implies
@@ -1,2 +1,2 @@
 # Override ldbl-opt with alpha specific routines.
-alpha/alphaev67/fpu
+echo alpha/alphaev67/fpu
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/fpu/Implies b/ports/sysdeps/unix/sysv/linux/alpha/fpu/Implies
index d76f511c2e..7fab677edd 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/fpu/Implies
+++ b/ports/sysdeps/unix/sysv/linux/alpha/fpu/Implies
@@ -1,2 +1,2 @@
 # Override ldbl-opt with alpha specific routines.
-alpha/fpu
+echo alpha/fpu
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/Implies b/ports/sysdeps/unix/sysv/linux/ia64/Implies
index 8d91c80097..b83f72218a 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/Implies
+++ b/ports/sysdeps/unix/sysv/linux/ia64/Implies
@@ -1 +1 @@
-unix/sysv/linux/wordsize-64
+echo unix/sysv/linux/wordsize-64
diff --git a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/405/Implies b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/405/Implies
index 70c0d2eda3..c166052cfa 100644
--- a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/405/Implies
+++ b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/405/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/405/fpu
-powerpc/powerpc32/405
+echo powerpc/powerpc32/405/fpu
+echo powerpc/powerpc32/405
diff --git a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/440/Implies b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/440/Implies
index c3e52c5504..6897a98093 100644
--- a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/440/Implies
+++ b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/440/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/440/fpu
-powerpc/powerpc32/440
+echo powerpc/powerpc32/440/fpu
+echo powerpc/powerpc32/440
diff --git a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/464/Implies b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/464/Implies
index 2829f9ccaf..b99611cfa9 100644
--- a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/464/Implies
+++ b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/464/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/464/fpu
-powerpc/powerpc32/464
+echo powerpc/powerpc32/464/fpu
+echo powerpc/powerpc32/464
diff --git a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/476/Implies b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/476/Implies
index 80f917079e..45dd0aee60 100644
--- a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/476/Implies
+++ b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/476/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/476/fpu
-powerpc/powerpc32/476
+echo powerpc/powerpc32/476/fpu
+echo powerpc/powerpc32/476
diff --git a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies
index 40836b6fb4..6c4777d3fc 100644
--- a/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies
+++ b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies
@@ -1,2 +1,2 @@
-powerpc/nofpu
-powerpc/soft-fp
+echo powerpc/nofpu
+echo powerpc/soft-fp
diff --git a/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Implies b/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Implies
index 9090d3fb8b..e47d1103bb 100644
--- a/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Implies
+++ b/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Implies
@@ -1,4 +1,6 @@
+cat <<EOF
 unix/sysv/linux/tile/tilegx
 unix/sysv/linux/tile
 unix/sysv/linux/generic/wordsize-32
 unix/sysv/linux/generic
+EOF
diff --git a/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Implies b/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Implies
index e4e0800c0a..ee2b17ba18 100644
--- a/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Implies
+++ b/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Implies
@@ -1,4 +1,6 @@
+cat <<EOF
 unix/sysv/linux/tile/tilegx
 unix/sysv/linux/tile
 unix/sysv/linux/generic
 unix/sysv/linux/wordsize-64
+EOF
diff --git a/ports/sysdeps/unix/sysv/linux/tile/tilepro/Implies b/ports/sysdeps/unix/sysv/linux/tile/tilepro/Implies
index 0023bb77aa..4b17e72539 100644
--- a/ports/sysdeps/unix/sysv/linux/tile/tilepro/Implies
+++ b/ports/sysdeps/unix/sysv/linux/tile/tilepro/Implies
@@ -1,3 +1,5 @@
+cat <<EOF
 unix/sysv/linux/tile
 unix/sysv/linux/generic/wordsize-32
 unix/sysv/linux/generic
+EOF
diff --git a/sysdeps/i386/Implies b/sysdeps/i386/Implies
index 20b2dffc29..86490bca97 100644
--- a/sysdeps/i386/Implies
+++ b/sysdeps/i386/Implies
@@ -1,5 +1,7 @@
+cat <<EOF
 x86
 wordsize-32
 ieee754/ldbl-96
 ieee754/dbl-64
 ieee754/flt-32
+EOF
diff --git a/sysdeps/i386/fpu/Implies b/sysdeps/i386/fpu/Implies
index 2b745a34fb..f825e6e0fb 100644
--- a/sysdeps/i386/fpu/Implies
+++ b/sysdeps/i386/fpu/Implies
@@ -1 +1 @@
-x86/fpu
+echo x86/fpu
diff --git a/sysdeps/i386/i586/Implies b/sysdeps/i386/i586/Implies
index 477cd741ce..1a2a4566f2 100644
--- a/sysdeps/i386/i586/Implies
+++ b/sysdeps/i386/i586/Implies
@@ -1,2 +1,2 @@
 # Code optimized for i486 is better than simple i386 code.
-i386/i486
+echo i386/i486
diff --git a/sysdeps/i386/i686/Implies b/sysdeps/i386/i686/Implies
index e1fcccd5f4..617dceb5d1 100644
--- a/sysdeps/i386/i686/Implies
+++ b/sysdeps/i386/i686/Implies
@@ -1,4 +1,4 @@
 # Due to the reordering and the other nifty extensions in the i686 it is
 # not really good to use heavily i586 optimized code on a i686.  It's
 # better to use i486/i386 code.
-i386/i486
+echo i386/i486
diff --git a/sysdeps/i386/i786/Implies b/sysdeps/i386/i786/Implies
index 1cd29f63cf..bb28874136 100644
--- a/sysdeps/i386/i786/Implies
+++ b/sysdeps/i386/i786/Implies
@@ -1,2 +1,2 @@
 # The PPro and PII cores are mostly the same.
-i386/i686
+echo i386/i686
diff --git a/sysdeps/mach/hurd/Implies b/sysdeps/mach/hurd/Implies
index b6063463ce..5c15788d8a 100644
--- a/sysdeps/mach/hurd/Implies
+++ b/sysdeps/mach/hurd/Implies
@@ -1,5 +1,5 @@
 # The gnu subdirectory exists for things common to both Linux-based and
 # Hurd-based GNU systems.
-gnu
+echo gnu
 # The Hurd provides a rough superset of the functionality of 4.4 BSD.
-unix/bsd/bsd4.4
+echo unix/bsd/bsd4.4
diff --git a/sysdeps/powerpc/Implies b/sysdeps/powerpc/Implies
index 7ccf9a7c4a..aaf960d6fc 100644
--- a/sysdeps/powerpc/Implies
+++ b/sysdeps/powerpc/Implies
@@ -1,4 +1,6 @@
 # On PowerPC we use the IBM extended long double format.
+cat <<EOF
 ieee754/ldbl-128ibm
 ieee754/dbl-64
 ieee754/flt-32
+EOF
diff --git a/sysdeps/powerpc/powerpc32/970/Implies b/sysdeps/powerpc/powerpc32/970/Implies
index 17139bf21c..7b9aac1b78 100644
--- a/sysdeps/powerpc/powerpc32/970/Implies
+++ b/sysdeps/powerpc/powerpc32/970/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power4/fpu
-powerpc/powerpc32/power4
+echo powerpc/powerpc32/power4/fpu
+echo powerpc/powerpc32/power4
diff --git a/sysdeps/powerpc/powerpc32/Implies b/sysdeps/powerpc/powerpc32/Implies
index 39a34c5f57..da29cbe753 100644
--- a/sysdeps/powerpc/powerpc32/Implies
+++ b/sysdeps/powerpc/powerpc32/Implies
@@ -1 +1 @@
-wordsize-32
+echo wordsize-32
diff --git a/sysdeps/powerpc/powerpc32/power5+/Implies b/sysdeps/powerpc/powerpc32/power5+/Implies
index a51d2fdf95..fe0894380a 100644
--- a/sysdeps/powerpc/powerpc32/power5+/Implies
+++ b/sysdeps/powerpc/powerpc32/power5+/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power5/fpu
-powerpc/powerpc32/power5
+echo powerpc/powerpc32/power5/fpu
+echo powerpc/powerpc32/power5
diff --git a/sysdeps/powerpc/powerpc32/power5/Implies b/sysdeps/powerpc/powerpc32/power5/Implies
index 17139bf21c..7b9aac1b78 100644
--- a/sysdeps/powerpc/powerpc32/power5/Implies
+++ b/sysdeps/powerpc/powerpc32/power5/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power4/fpu
-powerpc/powerpc32/power4
+echo powerpc/powerpc32/power4/fpu
+echo powerpc/powerpc32/power4
diff --git a/sysdeps/powerpc/powerpc32/power6/Implies b/sysdeps/powerpc/powerpc32/power6/Implies
index 8e5b58a57a..bc627f892b 100644
--- a/sysdeps/powerpc/powerpc32/power6/Implies
+++ b/sysdeps/powerpc/powerpc32/power6/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power5+/fpu
-powerpc/powerpc32/power5+
+echo powerpc/powerpc32/power5+/fpu
+echo powerpc/powerpc32/power5+
diff --git a/sysdeps/powerpc/powerpc32/power6x/Implies b/sysdeps/powerpc/powerpc32/power6x/Implies
index c0e1bea435..a07922826e 100644
--- a/sysdeps/powerpc/powerpc32/power6x/Implies
+++ b/sysdeps/powerpc/powerpc32/power6x/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power6/fpu
-powerpc/powerpc32/power6
+echo powerpc/powerpc32/power6/fpu
+echo powerpc/powerpc32/power6
diff --git a/sysdeps/powerpc/powerpc32/power7/Implies b/sysdeps/powerpc/powerpc32/power7/Implies
index c0e1bea435..a07922826e 100644
--- a/sysdeps/powerpc/powerpc32/power7/Implies
+++ b/sysdeps/powerpc/powerpc32/power7/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power6/fpu
-powerpc/powerpc32/power6
+echo powerpc/powerpc32/power6/fpu
+echo powerpc/powerpc32/power6
diff --git a/sysdeps/powerpc/powerpc64/970/Implies b/sysdeps/powerpc/powerpc64/970/Implies
index bedb20b65c..d55238edb7 100644
--- a/sysdeps/powerpc/powerpc64/970/Implies
+++ b/sysdeps/powerpc/powerpc64/970/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power4/fpu
-powerpc/powerpc64/power4
+echo powerpc/powerpc64/power4/fpu
+echo powerpc/powerpc64/power4
diff --git a/sysdeps/powerpc/powerpc64/Implies b/sysdeps/powerpc/powerpc64/Implies
index a8cae95f9d..cf6ce88db2 100644
--- a/sysdeps/powerpc/powerpc64/Implies
+++ b/sysdeps/powerpc/powerpc64/Implies
@@ -1 +1 @@
-wordsize-64
+echo wordsize-64
diff --git a/sysdeps/powerpc/powerpc64/power5+/Implies b/sysdeps/powerpc/powerpc64/power5+/Implies
index a01a13ab12..f0d3f8d958 100644
--- a/sysdeps/powerpc/powerpc64/power5+/Implies
+++ b/sysdeps/powerpc/powerpc64/power5+/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power5/fpu
-powerpc/powerpc64/power5
+echo powerpc/powerpc64/power5/fpu
+echo powerpc/powerpc64/power5
diff --git a/sysdeps/powerpc/powerpc64/power5/Implies b/sysdeps/powerpc/powerpc64/power5/Implies
index bedb20b65c..d55238edb7 100644
--- a/sysdeps/powerpc/powerpc64/power5/Implies
+++ b/sysdeps/powerpc/powerpc64/power5/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power4/fpu
-powerpc/powerpc64/power4
+echo powerpc/powerpc64/power4/fpu
+echo powerpc/powerpc64/power4
diff --git a/sysdeps/powerpc/powerpc64/power6/Implies b/sysdeps/powerpc/powerpc64/power6/Implies
index 4c782d4122..72bb7ca196 100644
--- a/sysdeps/powerpc/powerpc64/power6/Implies
+++ b/sysdeps/powerpc/powerpc64/power6/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power5+/fpu
-powerpc/powerpc64/power5+
+echo powerpc/powerpc64/power5+/fpu
+echo powerpc/powerpc64/power5+
diff --git a/sysdeps/powerpc/powerpc64/power6x/Implies b/sysdeps/powerpc/powerpc64/power6x/Implies
index 9d68f39d22..579469db7f 100644
--- a/sysdeps/powerpc/powerpc64/power6x/Implies
+++ b/sysdeps/powerpc/powerpc64/power6x/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power6/fpu
-powerpc/powerpc64/power6
+echo powerpc/powerpc64/power6/fpu
+echo powerpc/powerpc64/power6
diff --git a/sysdeps/powerpc/powerpc64/power7/Implies b/sysdeps/powerpc/powerpc64/power7/Implies
index 9d68f39d22..579469db7f 100644
--- a/sysdeps/powerpc/powerpc64/power7/Implies
+++ b/sysdeps/powerpc/powerpc64/power7/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power6/fpu
-powerpc/powerpc64/power6
+echo powerpc/powerpc64/power6/fpu
+echo powerpc/powerpc64/power6
diff --git a/sysdeps/s390/Implies b/sysdeps/s390/Implies
index 1945b1f4bb..62a3604f16 100644
--- a/sysdeps/s390/Implies
+++ b/sysdeps/s390/Implies
@@ -1,3 +1,5 @@
+cat <<EOF
 ieee754/ldbl-128
 ieee754/dbl-64
 ieee754/flt-32
+EOF
diff --git a/sysdeps/s390/s390-32/Implies b/sysdeps/s390/s390-32/Implies
index 39a34c5f57..da29cbe753 100644
--- a/sysdeps/s390/s390-32/Implies
+++ b/sysdeps/s390/s390-32/Implies
@@ -1 +1 @@
-wordsize-32
+echo wordsize-32
diff --git a/sysdeps/s390/s390-64/Implies b/sysdeps/s390/s390-64/Implies
index a8cae95f9d..cf6ce88db2 100644
--- a/sysdeps/s390/s390-64/Implies
+++ b/sysdeps/s390/s390-64/Implies
@@ -1 +1 @@
-wordsize-64
+echo wordsize-64
diff --git a/sysdeps/sh/Implies b/sysdeps/sh/Implies
index 780c4e2467..9a77a8115e 100644
--- a/sysdeps/sh/Implies
+++ b/sysdeps/sh/Implies
@@ -1,3 +1,5 @@
+cat <<EOF
 wordsize-32
 ieee754/flt-32
 ieee754/dbl-64
+EOF
diff --git a/sysdeps/sparc/sparc32/Implies b/sysdeps/sparc/sparc32/Implies
index 436436a651..e1a396e5e9 100644
--- a/sysdeps/sparc/sparc32/Implies
+++ b/sysdeps/sparc/sparc32/Implies
@@ -1,6 +1,8 @@
-wordsize-32
+echo wordsize-32
 # SPARC uses IEEE 754 floating point.
+cat <<EOF
 ieee754/ldbl-128
 ieee754/dbl-64
 ieee754/flt-32
 sparc/sparc32/soft-fp
+EOF
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/unix/sysv/linux/multiarch/Implies b/sysdeps/sparc/sparc32/sparcv9/fpu/unix/sysv/linux/multiarch/Implies
index a380d8a739..f07f2db55c 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/unix/sysv/linux/multiarch/Implies
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/unix/sysv/linux/multiarch/Implies
@@ -1,4 +1,6 @@
 # We must list this here to move it ahead of the ldbl-opt code.
+cat <<EOF
 sparc/sparc32/sparcv9/fpu/multiarch
 sparc/sparc32/sparcv9/fpu
 sparc/sparc32/fpu
+EOF
diff --git a/sysdeps/sparc/sparc64/Implies b/sysdeps/sparc/sparc64/Implies
index 7abc50efcc..effb19f4a9 100644
--- a/sysdeps/sparc/sparc64/Implies
+++ b/sysdeps/sparc/sparc64/Implies
@@ -1,7 +1,9 @@
-wordsize-64
+echo wordsize-64
 # SPARC uses IEEE 754 floating point.
+cat <<EOF
 ieee754/ldbl-128
 ieee754/dbl-64/wordsize-64
 ieee754/dbl-64
 ieee754/flt-32
 sparc/sparc64/soft-fp
+EOF
diff --git a/sysdeps/unix/Implies b/sysdeps/unix/Implies
index b3188f7428..7168a30962 100644
--- a/sysdeps/unix/Implies
+++ b/sysdeps/unix/Implies
@@ -1 +1 @@
-posix
+echo posix
diff --git a/sysdeps/unix/bsd/Implies b/sysdeps/unix/bsd/Implies
index c30979e17b..e99d443a70 100644
--- a/sysdeps/unix/bsd/Implies
+++ b/sysdeps/unix/bsd/Implies
@@ -1,2 +1,2 @@
 # The directory unix/inet implements sockets and networking in the usual way.
-unix/inet
+echo unix/inet
diff --git a/sysdeps/unix/sysv/linux/Implies b/sysdeps/unix/sysv/linux/Implies
index b04bb6b33d..83d39949dd 100644
--- a/sysdeps/unix/sysv/linux/Implies
+++ b/sysdeps/unix/sysv/linux/Implies
@@ -1,6 +1,6 @@
 # The gnu subdirectory exists for things common to both Linux-based and
 # Hurd-based GNU systems.
-gnu
+echo gnu
 
 # Linux has network support in the kernel.
-unix/inet
+echo unix/inet
diff --git a/sysdeps/unix/sysv/linux/i386/Implies b/sysdeps/unix/sysv/linux/i386/Implies
index ccc7eaa8a4..3ee13c7528 100644
--- a/sysdeps/unix/sysv/linux/i386/Implies
+++ b/sysdeps/unix/sysv/linux/i386/Implies
@@ -1 +1 @@
-unix/sysv/linux/x86
+echo unix/sysv/linux/x86
diff --git a/sysdeps/unix/sysv/linux/powerpc/Implies b/sysdeps/unix/sysv/linux/powerpc/Implies
index ff27cdb568..f2bd2cda05 100644
--- a/sysdeps/unix/sysv/linux/powerpc/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/Implies
@@ -1,4 +1,4 @@
 # Make sure these routines come before ldbl-opt.
-ieee754/ldbl-128ibm
+echo ieee754/ldbl-128ibm
 # These supply the ABI compatibility for when long double was double.
-ieee754/ldbl-opt
+echo ieee754/ldbl-opt
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/970/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/970/Implies
index 0c018834af..f01c6c053f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/970/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/970/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/970/fpu
-powerpc/powerpc32/970
+echo powerpc/powerpc32/970/fpu
+echo powerpc/powerpc32/970
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/a2/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/a2/Implies
index 6d72414e55..79a5e7b5e4 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/a2/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/a2/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/a2/fpu
-powerpc/powerpc32/a2
+echo powerpc/powerpc32/a2/fpu
+echo powerpc/powerpc32/a2
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/Implies
index 29c49a4c24..46a0635af1 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/cell/fpu
-powerpc/powerpc32/cell
+echo powerpc/powerpc32/cell/fpu
+echo powerpc/powerpc32/cell
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/fpu/Implies
index 7c381f043c..c8de1f3641 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/fpu/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/fpu/Implies
@@ -1,3 +1,3 @@
 # Make sure this comes before the powerpc/powerpc32/fpu that's
 # listed in unix/sysv/linux/powerpc/powerpc32/fpu/Implies.
-powerpc/powerpc32/cell/fpu
+echo powerpc/powerpc32/cell/fpu
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/Implies
index 9f70f795bc..01bcacae07 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/Implies
@@ -1,2 +1,2 @@
 # Override ldbl-opt with powerpc32 specific routines.
-powerpc/powerpc32/fpu
+echo powerpc/powerpc32/fpu
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power4/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power4/Implies
index 17139bf21c..7b9aac1b78 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power4/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power4/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power4/fpu
-powerpc/powerpc32/power4
+echo powerpc/powerpc32/power4/fpu
+echo powerpc/powerpc32/power4
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power5+/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power5+/Implies
index 8e5b58a57a..bc627f892b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power5+/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power5+/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power5+/fpu
-powerpc/powerpc32/power5+
+echo powerpc/powerpc32/power5+/fpu
+echo powerpc/powerpc32/power5+
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power5/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power5/Implies
index a51d2fdf95..fe0894380a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power5/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power5/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power5/fpu
-powerpc/powerpc32/power5
+echo powerpc/powerpc32/power5/fpu
+echo powerpc/powerpc32/power5
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/Implies
index c0e1bea435..a07922826e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power6/fpu
-powerpc/powerpc32/power6
+echo powerpc/powerpc32/power6/fpu
+echo powerpc/powerpc32/power6
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6x/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6x/Implies
index bc9e74fcff..a80213433a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6x/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6x/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power6x/fpu
-powerpc/powerpc32/power6x
+echo powerpc/powerpc32/power6x/fpu
+echo powerpc/powerpc32/power6x
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power7/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power7/Implies
index 083f3e950a..0faa4a7250 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power7/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power7/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc32/power7/fpu
-powerpc/powerpc32/power7
+echo powerpc/powerpc32/power7/fpu
+echo powerpc/powerpc32/power7
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies
index 76a32ce7b5..e1a6b4f0ef 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/970/fpu
-powerpc/powerpc64/970
+echo powerpc/powerpc64/970/fpu
+echo powerpc/powerpc64/970
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Implies
index 8d91c80097..b83f72218a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Implies
@@ -1 +1 @@
-unix/sysv/linux/wordsize-64
+echo unix/sysv/linux/wordsize-64
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/a2/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/a2/Implies
index 39b19e9c1f..77e7ae998f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/a2/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/a2/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/a2/fpu
-powerpc/powerpc64/a2
+echo powerpc/powerpc64/a2/fpu
+echo powerpc/powerpc64/a2
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies
index 583d4084a4..db88933cc6 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/cell/fpu
-powerpc/powerpc64/cell
+echo powerpc/powerpc64/cell/fpu
+echo powerpc/powerpc64/cell
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/fpu/Implies
index b6720ecda5..120fac5271 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/fpu/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/fpu/Implies
@@ -1 +1 @@
-powerpc/powerpc64/cell/fpu
+echo powerpc/powerpc64/cell/fpu
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/Implies
index 6243d2ef27..6902a05fdd 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/Implies
@@ -1,2 +1,2 @@
 # Override ldbl-opt with powerpc64 specific routines.
-powerpc/powerpc64/fpu
+echo powerpc/powerpc64/fpu
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power4/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power4/Implies
index bedb20b65c..d55238edb7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power4/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power4/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power4/fpu
-powerpc/powerpc64/power4
+echo powerpc/powerpc64/power4/fpu
+echo powerpc/powerpc64/power4
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power5+/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power5+/Implies
index 4c782d4122..72bb7ca196 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power5+/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power5+/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power5+/fpu
-powerpc/powerpc64/power5+
+echo powerpc/powerpc64/power5+/fpu
+echo powerpc/powerpc64/power5+
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power5/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power5/Implies
index a01a13ab12..f0d3f8d958 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power5/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power5/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power5/fpu
-powerpc/powerpc64/power5
+echo powerpc/powerpc64/power5/fpu
+echo powerpc/powerpc64/power5
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/Implies
index 9d68f39d22..579469db7f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power6/fpu
-powerpc/powerpc64/power6
+echo powerpc/powerpc64/power6/fpu
+echo powerpc/powerpc64/power6
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6x/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6x/Implies
index 9019778254..97f3bc4dfe 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6x/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6x/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power6x/fpu
-powerpc/powerpc64/power6x
+echo powerpc/powerpc64/power6x/fpu
+echo powerpc/powerpc64/power6x
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power7/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power7/Implies
index 9a5e3c7277..95c6b00c4b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power7/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power7/Implies
@@ -1,2 +1,2 @@
-powerpc/powerpc64/power7/fpu
-powerpc/powerpc64/power7
+echo powerpc/powerpc64/power7/fpu
+echo powerpc/powerpc64/power7
diff --git a/sysdeps/unix/sysv/linux/s390/Implies b/sysdeps/unix/sysv/linux/s390/Implies
index efda9d27c0..1a38130075 100644
--- a/sysdeps/unix/sysv/linux/s390/Implies
+++ b/sysdeps/unix/sysv/linux/s390/Implies
@@ -1,3 +1,3 @@
 # These supply the ABI compatibility for when long double was double.
-ieee754/ldbl-64-128
-ieee754/ldbl-opt
+echo ieee754/ldbl-64-128
+echo ieee754/ldbl-opt
diff --git a/sysdeps/unix/sysv/linux/s390/fpu/Implies b/sysdeps/unix/sysv/linux/s390/fpu/Implies
index 3a8e225986..99dc84fd34 100644
--- a/sysdeps/unix/sysv/linux/s390/fpu/Implies
+++ b/sysdeps/unix/sysv/linux/s390/fpu/Implies
@@ -1,2 +1,2 @@
 # Override ldbl-opt with s390 specific routines.
-s390/fpu
+echo s390/fpu
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/Implies b/sysdeps/unix/sysv/linux/s390/s390-64/Implies
index 8d91c80097..b83f72218a 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/Implies
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/Implies
@@ -1 +1 @@
-unix/sysv/linux/wordsize-64
+echo unix/sysv/linux/wordsize-64
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Implies b/sysdeps/unix/sysv/linux/sparc/sparc32/Implies
index efda9d27c0..1a38130075 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/Implies
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Implies
@@ -1,3 +1,3 @@
 # These supply the ABI compatibility for when long double was double.
-ieee754/ldbl-64-128
-ieee754/ldbl-opt
+echo ieee754/ldbl-64-128
+echo ieee754/ldbl-opt
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/fpu/Implies b/sysdeps/unix/sysv/linux/sparc/sparc32/fpu/Implies
index dbcd1e9e6f..10c1d96302 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/fpu/Implies
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/fpu/Implies
@@ -1,2 +1,2 @@
 # We must list this here to move it ahead of the ldbl-opt code.
-sparc/sparc32/fpu
+echo sparc/sparc32/fpu
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/fpu/Implies b/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/fpu/Implies
index 70568c5d17..dfd0292a91 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/fpu/Implies
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/fpu/Implies
@@ -1,3 +1,3 @@
 # We must list this here to move it ahead of the ldbl-opt code.
-sparc/sparc32/sparcv9/fpu
-sparc/sparc32/fpu
+echo sparc/sparc32/sparcv9/fpu
+echo sparc/sparc32/fpu
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Implies b/sysdeps/unix/sysv/linux/sparc/sparc64/Implies
index 8d91c80097..b83f72218a 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/Implies
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Implies
@@ -1 +1 @@
-unix/sysv/linux/wordsize-64
+echo unix/sysv/linux/wordsize-64
diff --git a/sysdeps/unix/sysv/linux/x86_64/Implies b/sysdeps/unix/sysv/linux/x86_64/Implies
index c7a65c9386..88994932f4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/Implies
+++ b/sysdeps/unix/sysv/linux/x86_64/Implies
@@ -1,2 +1,2 @@
-unix/sysv/linux/x86
-unix/sysv/linux/wordsize-64
+echo unix/sysv/linux/x86
+echo unix/sysv/linux/wordsize-64
diff --git a/sysdeps/x86_64/Implies b/sysdeps/x86_64/Implies
index 8b4daaec77..22067abbfb 100644
--- a/sysdeps/x86_64/Implies
+++ b/sysdeps/x86_64/Implies
@@ -1,7 +1,9 @@
-x86
-$machine:x86_64/64:wordsize-64
-$machine:x86_64/x32:wordsize-32
+echo x86
+[ "$machine" = x86_64/64 ] && echo wordsize-64
+[ "$machine" = x86_64/x32 ] && echo wordsize-32
+cat <<EOF
 ieee754/ldbl-96
 ieee754/dbl-64/wordsize-64
 ieee754/dbl-64
 ieee754/flt-32
+EOF
diff --git a/sysdeps/x86_64/fpu/Implies b/sysdeps/x86_64/fpu/Implies
index 2b745a34fb..f825e6e0fb 100644
--- a/sysdeps/x86_64/fpu/Implies
+++ b/sysdeps/x86_64/fpu/Implies
@@ -1 +1 @@
-x86/fpu
+echo x86/fpu