* config.gcc (powerpc-*-linux*): Merge variants.

	* config.host (powerpc-*-linux*altivec*, powerpc-*-linux*spe): Delete.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@145484 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b8ad45..7c7b7cf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-03  Alan Modra  <amodra@bigpond.net.au>
+
+       * config.gcc (powerpc-*-linux*): Merge variants.
+

 2009-04-02  Chao-ying Fu  <fu@mips.com>
            James Grosbach <james.grosbach@microchip.com>
 
 2009-04-02  Chao-ying Fu  <fu@mips.com>
            James Grosbach <james.grosbach@microchip.com>
 

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 4d1eb8d..3eb886f 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1805,27 +1805,17 @@ powerpc-*-rtems*)
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-rtems t-rtems rs6000/t-ppccomm"
        ;;
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-rtems t-rtems rs6000/t-ppccomm"
        ;;

-powerpc-*-linux*altivec*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h glibc-stdint.h"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-       ;;
-powerpc-*-linux*spe*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h rs6000/e500.h glibc-stdint.h"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-       ;;
-powerpc-*-linux*paired*)
-        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/750cl.h glibc-stdint.h"
-        extra_options="${extra_options} rs6000/sysv4.opt"
-        tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-        ;;

 powerpc-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
 powerpc-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"

-       case ${enable_targets}:${cpu_is_64bit} in
-           *powerpc64* | all:* | *:yes)
+       maybe_biarch=yes
+       case ${target} in
+           powerpc-*-linux*spe* | powerpc-*-linux*paired*)
+               maybe_biarch= ;;
+       esac
+       case ${maybe_biarch}:${enable_targets}:${cpu_is_64bit} in
+           yes:*powerpc64* | yes:all:* | yes:*:yes)

                if test x$cpu_is_64bit = xyes; then
                    tm_file="${tm_file} rs6000/default64.h"
                fi
                if test x$cpu_is_64bit = xyes; then
                    tm_file="${tm_file} rs6000/default64.h"
                fi


@@ -1837,6 +1827,14 @@ powerpc-*-linux*)
                tm_file="${tm_file} rs6000/linux.h glibc-stdint.h"
                ;;
        esac
                tm_file="${tm_file} rs6000/linux.h glibc-stdint.h"
                ;;
        esac

+       case ${target} in
+           powerpc*-*-linux*altivec*)
+               tm_file="${tm_file} rs6000/linuxaltivec.h" ;;
+           powerpc*-*-linux*spe*)
+               tm_file="${tm_file} rs6000/linuxspe.h rs6000/e500.h" ;;
+           powerpc*-*-linux*paired*)
+               tm_file="${tm_file} rs6000/750cl.h" ;;
+       esac

        if test x${enable_secureplt} = xyes; then
                tm_file="rs6000/secureplt.h ${tm_file}"
        fi
        if test x${enable_secureplt} = xyes; then
                tm_file="rs6000/secureplt.h ${tm_file}"
        fi

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index d9d2b3d..ebabcfe 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-03  Alan Modra  <amodra@bigpond.net.au>
+
+       * config.host (powerpc-*-linux*altivec*, powerpc-*-linux*spe): Delete.
+

 2009-03-28  Joseph Myers  <joseph@codesourcery.com>
 
        * config.host (arm-*-coff*, armel-*-coff*, arm-semi-aof,
 2009-03-28  Joseph Myers  <joseph@codesourcery.com>
 
        * config.host (arm-*-coff*, armel-*-coff*, arm-semi-aof,

diff --git a/libgcc/config.host b/libgcc/config.host
index ad2ca41..2374ead 100644 (file)
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -448,12 +448,6 @@ powerpc-*-eabi*)
        ;;
 powerpc-*-rtems*)
        ;;
        ;;
 powerpc-*-rtems*)
        ;;

-powerpc-*-linux*altivec*)
-       tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128"
-       ;;
-powerpc-*-linux*spe*)
-       tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"
-       ;;

 powerpc-*-linux*)
        tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"
        ;;
 powerpc-*-linux*)
        tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"
        ;;