Module Name: src
Committed By: mrg
Date: Wed Nov 6 09:10:50 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd64.h
Log Message:
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*.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.24 -r1.25 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.60 src/external/gpl3/gcc/dist/gcc/config.gcc:1.61
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.60 Wed Oct 16 07:35:14 2019
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Wed Nov 6 09:10:50 2019
@@ -2531,14 +2531,15 @@ powerpc*-*-freebsd*)
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
Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.24 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.25
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.24 Tue Nov 5 20:06:41 2019
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h Wed Nov 6 09:10:50 2019
@@ -204,8 +204,8 @@ extern int dot_symbols;
%{,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 }, \
