Module Name: src
Committed By: christos
Date: Wed Oct 23 18:55:36 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/gcc: file-prefix-map.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/file-prefix-map.c
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/file-prefix-map.c
diff -u src/external/gpl3/gcc/dist/gcc/file-prefix-map.c:1.2 src/external/gpl3/gcc/dist/gcc/file-prefix-map.c:1.3
--- src/external/gpl3/gcc/dist/gcc/file-prefix-map.c:1.2 Tue Oct 1 17:17:28 2019
+++ src/external/gpl3/gcc/dist/gcc/file-prefix-map.c Wed Oct 23 14:55:36 2019
@@ -123,7 +123,8 @@ remap_macro_filename (const char *filena
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 @@ remap_debug_filename (const char *filena
{
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 @@ remap_debug_filename (const char *filena
{
return remap_debug_regex_filename (remap_debug_prefix_filename (filename));
}
-#endif
