[src/trunk]: src/external/gpl3/gcc/dist/gcc Since add_debug_regex_map is used...

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

details:   https://anonhg.NetBSD.org/src/rev/1b44b3d86523
branches:  trunk
changeset: 464796:1b44b3d86523
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Oct 23 18:55:36 2019 +0000

description:
Since add_debug_regex_map is used in opts-global.c unconditionally, we can't
disable the code with #ifndef __NetBSD__ because it breaks cross-building.

diffstat:

 external/gpl3/gcc/dist/gcc/file-prefix-map.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 331b7d118ad1 -r 1b44b3d86523 external/gpl3/gcc/dist/gcc/file-prefix-map.c
--- a/external/gpl3/gcc/dist/gcc/file-prefix-map.c      Wed Oct 23 18:08:31 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/file-prefix-map.c      Wed Oct 23 18:55:36 2019 +0000
@@ -123,7 +123,8 @@
   return remap_filename (macro_prefix_maps, filename);
 }
 
-#ifndef __NetBSD__
+/* Original GCC version disabled. The NetBSD version handles regex */
+#if 0
 /* Remap using -fdebug-prefix-map.  Return the GC-allocated new name
    corresponding to FILENAME or FILENAME if no remapping was performed.  */
 const char *
@@ -131,7 +132,12 @@
 {
   return remap_filename (debug_prefix_maps, filename);
 }
-#else
+#endif
+
+/*****
+ ***** The following code is a NetBSD extension that allows regex and
+ ***** \[0-9] substitutition arguments.
+ *****/
 
 /* Perform user-specified mapping of debug filename prefixes.  Return
    the new name corresponding to FILENAME.  */
@@ -238,4 +244,3 @@
 {
    return remap_debug_regex_filename (remap_debug_prefix_filename (filename));
 }
-#endif