[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/mips Don't override TARGET...

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

details:   https://anonhg.NetBSD.org/src/rev/3fdf3eac4b5d
branches:  trunk
changeset: 954096:3fdf3eac4b5d
user:      simonb <simonb%NetBSD.org@localhost>
date:      Mon Mar 29 01:33:12 2021 +0000

description:
Don't override TARGET_ASM_OUTPUT_SOURCE_FILENAME on MIPS for NetBSD -
use the default which includes a '.file "filename"' as the first name so
that the FILE symbols type is set to the real source file name.  Needed
to make ctfconvert work.

OK mrg@.
XXX needs to be fed back to GNU.

diffstat:

 external/gpl3/gcc/dist/gcc/config/mips/mips.c     |  4 +++-
 external/gpl3/gcc/dist/gcc/config/mips/netbsd.h   |  2 ++
 external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h |  2 ++
 3 files changed, 7 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r ec036bb8ab03 -r 3fdf3eac4b5d external/gpl3/gcc/dist/gcc/config/mips/mips.c
--- a/external/gpl3/gcc/dist/gcc/config/mips/mips.c     Sun Mar 28 20:35:58 2021 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/mips/mips.c     Mon Mar 29 01:33:12 2021 +0000
@@ -9488,7 +9488,7 @@
 
 /* Implement TARGET_ASM_OUTPUT_SOURCE_FILENAME.  */
 
-static void
+static void ATTRIBUTE_UNUSED
 mips_output_filename (FILE *stream, const char *name)
 {
   /* If we are emitting DWARF-2, let dwarf2out handle the ".file"
@@ -22744,8 +22744,10 @@
 #undef TARGET_TRAMPOLINE_INIT
 #define TARGET_TRAMPOLINE_INIT mips_trampoline_init
 
+#ifndef MIPS_USE_GCC_DEFAULT_OUTPUT_SOURCE_FILENAME
 #undef TARGET_ASM_OUTPUT_SOURCE_FILENAME
 #define TARGET_ASM_OUTPUT_SOURCE_FILENAME mips_output_filename
+#endif /* MIPS_USE_GCC_DEFAULT_OUTPUT_SOURCE_FILENAME */
 
 #undef TARGET_SHIFT_TRUNCATION_MASK
 #define TARGET_SHIFT_TRUNCATION_MASK mips_shift_truncation_mask
diff -r ec036bb8ab03 -r 3fdf3eac4b5d external/gpl3/gcc/dist/gcc/config/mips/netbsd.h
--- a/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h   Sun Mar 28 20:35:58 2021 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h   Mon Mar 29 01:33:12 2021 +0000
@@ -229,3 +229,5 @@
 
 #undef TARGET_WRITABLE_EH_FRAME
 #define TARGET_WRITABLE_EH_FRAME 0
+
+#define        MIPS_USE_GCC_DEFAULT_OUTPUT_SOURCE_FILENAME
diff -r ec036bb8ab03 -r 3fdf3eac4b5d external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h
--- a/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h Sun Mar 28 20:35:58 2021 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h Mon Mar 29 01:33:12 2021 +0000
@@ -45,3 +45,5 @@
    %{mips32} %{mips32r2} %{mips64} %{mips64r2} \
    %{bestGnum} %{call_shared} %{no_archive} %{exact_version} \
    %(netbsd_link_spec)"
+
+#define        MIPS_USE_GCC_DEFAULT_OUTPUT_SOURCE_FILENAME