[src/trunk]: src/external/gpl3/gcc/dist/gcc revert the powerpc config.gcc cha...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7c970efaca62
branches:  trunk
changeset: 966599:7c970efaca62
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Nov 06 09:10:50 2019 +0000

description:
revert the powerpc config.gcc changes i made while merging,
they end up mis-ordering tm files.

revert the rs6000/netbsd64.h change and put it back as
SUBSUBTARGET_EXTRA_SPECS.


this seems to make the build work again, though mknative will
need a re-run for ppc*.

diffstat:

 external/gpl3/gcc/dist/gcc/config.gcc               |  5 +++--
 external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h |  4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 9b3163b30e0d -r 7c970efaca62 external/gpl3/gcc/dist/gcc/config.gcc
--- a/external/gpl3/gcc/dist/gcc/config.gcc     Wed Nov 06 07:31:20 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config.gcc     Wed Nov 06 09:10:50 2019 +0000
@@ -2531,14 +2531,15 @@
        esac
        ;;
 powerpc*-*-netbsd*)
-       tm_file="${tm_file} dbxelf.h elfos.h ${nbsd_tm_file} freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
+       tm_file="${tm_file} ${nbsd_tm_file} dbxelf.h elfos.h freebsd-spec.h"
        case ${target} in
            powerpc64*)
                tm_file="rs6000/biarch64.h ${tm_file}"
-               tm_file="${tm_file} rs6000/default64.h rs6000/netbsd64.h"
+               tm_file="${tm_file} rs6000/sysv4.h rs6000/default64.h rs6000/netbsd64.h"
                tmake_file="${tmake_file} rs6000/t-netbsd64"
                ;;
            *)
+               tm_file="${tm_file} rs6000/sysv4.h rs6000/netbsd.h"
                tmake_file="${tmake_file} rs6000/t-netbsd"
                ;;
        esac
diff -r 9b3163b30e0d -r 7c970efaca62 external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
--- a/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h       Wed Nov 06 07:31:20 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h       Wed Nov 06 09:10:50 2019 +0000
@@ -204,8 +204,8 @@
 %{,assembler|,assembler-with-cpp: %{mregnames} %{mno-regnames}}" \
   ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
 
-#undef EXTRA_SPECS
-#define EXTRA_SPECS \
+#undef SUBSUBTARGET_EXTRA_SPECS
+#define SUBSUBTARGET_EXTRA_SPECS \
   { "asm_spec_common",         ASM_SPEC_COMMON },                      \
   { "asm_spec32",              ASM_SPEC32 },                           \
   { "asm_spec64",              ASM_SPEC64 },                           \