From 1942576bb11c2d85dad8c6f3e4438226d285dd0c Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 19 Jul 2012 10:05:00 -0700 Subject: Change Implies to shell script --- ChangeLog.implies | 73 ++++++++++++++++++++++ configure | 11 +--- configure.in | 11 +--- nptl/ChangeLog.implies | 6 ++ nptl/sysdeps/unix/sysv/linux/Implies | 2 +- nptl/sysdeps/unix/sysv/linux/i386/Implies | 2 +- nptl/sysdeps/unix/sysv/linux/i386/i786/Implies | 2 +- nptl/sysdeps/unix/sysv/linux/x86_64/Implies | 2 +- ports/ChangeLog.implies | 38 +++++++++++ ports/sysdeps/alpha/Implies | 4 +- ports/sysdeps/alpha/alphaev6/Implies | 2 +- ports/sysdeps/alpha/alphaev67/Implies | 2 +- ports/sysdeps/alpha/alphaev67/fpu/Implies | 2 +- ports/sysdeps/am33/Implies | 2 + ports/sysdeps/arm/Implies | 2 + ports/sysdeps/arm/armv7/Implies | 2 +- ports/sysdeps/hppa/hppa1.1/Implies | 2 + ports/sysdeps/ia64/Implies | 4 +- ports/sysdeps/m68k/Implies | 6 +- ports/sysdeps/m68k/m680x0/Implies | 2 +- ports/sysdeps/mips/Implies | 4 +- ports/sysdeps/mips/mips32/Implies | 4 +- ports/sysdeps/mips/mips64/Implies | 4 +- ports/sysdeps/mips/mips64/n32/Implies | 2 + ports/sysdeps/mips/mips64/n64/Implies | 2 + ports/sysdeps/powerpc/powerpc32/440/Implies | 4 +- ports/sysdeps/powerpc/powerpc32/464/Implies | 4 +- ports/sysdeps/powerpc/powerpc32/476/Implies | 4 +- ports/sysdeps/tile/Implies | 4 +- ports/sysdeps/tile/tilegx/tilegx32/Implies | 2 + ports/sysdeps/tile/tilegx/tilegx64/Implies | 2 + ports/sysdeps/tile/tilepro/Implies | 4 +- ports/sysdeps/unix/sysv/linux/alpha/Implies | 6 +- .../unix/sysv/linux/alpha/alphaev6/fpu/Implies | 2 +- .../unix/sysv/linux/alpha/alphaev67/fpu/Implies | 2 +- ports/sysdeps/unix/sysv/linux/alpha/fpu/Implies | 2 +- ports/sysdeps/unix/sysv/linux/ia64/Implies | 2 +- .../unix/sysv/linux/powerpc/powerpc32/405/Implies | 4 +- .../unix/sysv/linux/powerpc/powerpc32/440/Implies | 4 +- .../unix/sysv/linux/powerpc/powerpc32/464/Implies | 4 +- .../unix/sysv/linux/powerpc/powerpc32/476/Implies | 4 +- .../sysv/linux/powerpc/powerpc32/nofpu/Implies | 4 +- .../unix/sysv/linux/tile/tilegx/tilegx32/Implies | 2 + .../unix/sysv/linux/tile/tilegx/tilegx64/Implies | 2 + ports/sysdeps/unix/sysv/linux/tile/tilepro/Implies | 2 + sysdeps/i386/Implies | 2 + sysdeps/i386/fpu/Implies | 2 +- sysdeps/i386/i586/Implies | 2 +- sysdeps/i386/i686/Implies | 2 +- sysdeps/i386/i786/Implies | 2 +- sysdeps/mach/hurd/Implies | 4 +- sysdeps/powerpc/Implies | 2 + sysdeps/powerpc/powerpc32/970/Implies | 4 +- sysdeps/powerpc/powerpc32/Implies | 2 +- sysdeps/powerpc/powerpc32/power5+/Implies | 4 +- sysdeps/powerpc/powerpc32/power5/Implies | 4 +- sysdeps/powerpc/powerpc32/power6/Implies | 4 +- sysdeps/powerpc/powerpc32/power6x/Implies | 4 +- sysdeps/powerpc/powerpc32/power7/Implies | 4 +- sysdeps/powerpc/powerpc64/970/Implies | 4 +- sysdeps/powerpc/powerpc64/Implies | 2 +- sysdeps/powerpc/powerpc64/power5+/Implies | 4 +- sysdeps/powerpc/powerpc64/power5/Implies | 4 +- sysdeps/powerpc/powerpc64/power6/Implies | 4 +- sysdeps/powerpc/powerpc64/power6x/Implies | 4 +- sysdeps/powerpc/powerpc64/power7/Implies | 4 +- sysdeps/s390/Implies | 2 + sysdeps/s390/s390-32/Implies | 2 +- sysdeps/s390/s390-64/Implies | 2 +- sysdeps/sh/Implies | 2 + sysdeps/sparc/sparc32/Implies | 4 +- .../sparcv9/fpu/unix/sysv/linux/multiarch/Implies | 2 + sysdeps/sparc/sparc64/Implies | 4 +- sysdeps/unix/Implies | 2 +- sysdeps/unix/bsd/Implies | 2 +- sysdeps/unix/sysv/linux/Implies | 4 +- sysdeps/unix/sysv/linux/i386/Implies | 2 +- sysdeps/unix/sysv/linux/powerpc/Implies | 4 +- .../unix/sysv/linux/powerpc/powerpc32/970/Implies | 4 +- .../unix/sysv/linux/powerpc/powerpc32/a2/Implies | 4 +- .../unix/sysv/linux/powerpc/powerpc32/cell/Implies | 4 +- .../sysv/linux/powerpc/powerpc32/cell/fpu/Implies | 2 +- .../unix/sysv/linux/powerpc/powerpc32/fpu/Implies | 2 +- .../sysv/linux/powerpc/powerpc32/power4/Implies | 4 +- .../sysv/linux/powerpc/powerpc32/power5+/Implies | 4 +- .../sysv/linux/powerpc/powerpc32/power5/Implies | 4 +- .../sysv/linux/powerpc/powerpc32/power6/Implies | 4 +- .../sysv/linux/powerpc/powerpc32/power6x/Implies | 4 +- .../sysv/linux/powerpc/powerpc32/power7/Implies | 4 +- .../unix/sysv/linux/powerpc/powerpc64/970/Implies | 4 +- sysdeps/unix/sysv/linux/powerpc/powerpc64/Implies | 2 +- .../unix/sysv/linux/powerpc/powerpc64/a2/Implies | 4 +- .../unix/sysv/linux/powerpc/powerpc64/cell/Implies | 4 +- .../sysv/linux/powerpc/powerpc64/cell/fpu/Implies | 2 +- .../unix/sysv/linux/powerpc/powerpc64/fpu/Implies | 2 +- .../sysv/linux/powerpc/powerpc64/power4/Implies | 4 +- .../sysv/linux/powerpc/powerpc64/power5+/Implies | 4 +- .../sysv/linux/powerpc/powerpc64/power5/Implies | 4 +- .../sysv/linux/powerpc/powerpc64/power6/Implies | 4 +- .../sysv/linux/powerpc/powerpc64/power6x/Implies | 4 +- .../sysv/linux/powerpc/powerpc64/power7/Implies | 4 +- sysdeps/unix/sysv/linux/s390/Implies | 4 +- sysdeps/unix/sysv/linux/s390/fpu/Implies | 2 +- sysdeps/unix/sysv/linux/s390/s390-64/Implies | 2 +- sysdeps/unix/sysv/linux/sparc/sparc32/Implies | 4 +- sysdeps/unix/sysv/linux/sparc/sparc32/fpu/Implies | 2 +- .../sysv/linux/sparc/sparc32/sparcv9/fpu/Implies | 4 +- sysdeps/unix/sysv/linux/sparc/sparc64/Implies | 2 +- sysdeps/unix/sysv/linux/x86_64/Implies | 4 +- sysdeps/x86_64/Implies | 8 ++- sysdeps/x86_64/fpu/Implies | 2 +- 111 files changed, 306 insertions(+), 167 deletions(-) create mode 100644 nptl/ChangeLog.implies create mode 100644 ports/ChangeLog.implies 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 + + * 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 * 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 + + * 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 + + * 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 <