Force the use of -ggnu-pubnames when using -gsplit-dwarf.

gcc/
	* opts.c (finish_options): Use -ggnu-pubnames with -gsplit-dwarf.

From-SVN: r210395

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8a538b59408209cfed32eb8e92d82731004b113..3074f9c70be7dbd45d1faf4de9f0df8a4d13ae82 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-13  Cary Coutant  <ccoutant@google.com>
+
+       * opts.c (finish_options): Use -ggnu-pubnames with -gsplit-dwarf.
+
 2014-05-13  David Malcolm  <dmalcolm@redhat.com>
 
        * gengtype-parse.c (require3): Eliminate in favor of...

diff --git a/gcc/opts.c b/gcc/opts.c
index f15852d69a0a69e0cd16a6e61c3d01ce87f61ba1..269cd93ea69122d427d6f1cfab407ce42edfb55d 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -857,9 +857,9 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
     maybe_set_param_value (PARAM_MAX_STORES_TO_SINK, 0,
                            opts->x_param_values, opts_set->x_param_values);
 
-  /* The -gsplit-dwarf option requires -gpubnames.  */
+  /* The -gsplit-dwarf option requires -ggnu-pubnames.  */
   if (opts->x_dwarf_split_debug_info)
-    opts->x_debug_generate_pub_sections = 1;
+    opts->x_debug_generate_pub_sections = 2;
 }
 
 #define LEFT_COLUMN    27