dbgcnt: enhance behavior.

	* dbgcnt.def: Sort counters.
	* opts.c (common_handle_option): Do not compile if
	-fdbg-cnt-list is enabled.

From-SVN: r223287

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d26fdf..549fdac 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-18  Martin Liska  <mliska@suse.cz>
+
+       * dbgcnt.def: Sort counters.
+       * opts.c (common_handle_option): Do not compile if
+       -fdbg-cnt-list is enabled.
+
 2015-05-18  Tom de Vries  <tom@codesourcery.com>
 
        * gimplify.c (gimplify_modify_expr): Remove do_deref handling.

diff --git a/gcc/dbgcnt.def b/gcc/dbgcnt.def
index 4b26e77..95f6b06 100644 (file)
--- a/gcc/dbgcnt.def
+++ b/gcc/dbgcnt.def
@@ -144,8 +144,8 @@ echo ubound: $ub
 DEBUG_COUNTER (auto_inc_dec)
 DEBUG_COUNTER (ccp)
 DEBUG_COUNTER (cfg_cleanup)
-DEBUG_COUNTER (cse2_move2add)
 DEBUG_COUNTER (cprop)
+DEBUG_COUNTER (cse2_move2add)
 DEBUG_COUNTER (dce)
 DEBUG_COUNTER (dce_fast)
 DEBUG_COUNTER (dce_ud)
@@ -155,6 +155,7 @@ DEBUG_COUNTER (df_byte_scan)
 DEBUG_COUNTER (dse)
 DEBUG_COUNTER (dse1)
 DEBUG_COUNTER (dse2)
+DEBUG_COUNTER (eipa_sra)
 DEBUG_COUNTER (gcse2_delete)
 DEBUG_COUNTER (global_alloc_at_func)
 DEBUG_COUNTER (global_alloc_at_reg)
@@ -162,31 +163,31 @@ DEBUG_COUNTER (graphite_scop)
 DEBUG_COUNTER (hoist)
 DEBUG_COUNTER (hoist_insn)
 DEBUG_COUNTER (ia64_sched2)
-DEBUG_COUNTER (if_conversion)
-DEBUG_COUNTER (if_conversion_tree)
 DEBUG_COUNTER (if_after_combine)
 DEBUG_COUNTER (if_after_reload)
+DEBUG_COUNTER (if_conversion)
+DEBUG_COUNTER (if_conversion_tree)
+DEBUG_COUNTER (ira_move)
 DEBUG_COUNTER (local_alloc_for_sched)
+DEBUG_COUNTER (merged_ipa_icf)
 DEBUG_COUNTER (postreload_cse)
 DEBUG_COUNTER (pre)
 DEBUG_COUNTER (pre_insn)
-DEBUG_COUNTER (treepre_insert)
-DEBUG_COUNTER (tree_sra)
-DEBUG_COUNTER (eipa_sra)
-DEBUG_COUNTER (vect_loop)
-DEBUG_COUNTER (vect_slp)
+DEBUG_COUNTER (registered_jump_thread)
 DEBUG_COUNTER (sched2_func)
 DEBUG_COUNTER (sched_block)
+DEBUG_COUNTER (sched_breakdep)
 DEBUG_COUNTER (sched_func)
 DEBUG_COUNTER (sched_insn)
-DEBUG_COUNTER (sched_breakdep)
 DEBUG_COUNTER (sched_region)
 DEBUG_COUNTER (sel_sched_cnt)
-DEBUG_COUNTER (sel_sched_region_cnt)
 DEBUG_COUNTER (sel_sched_insn_cnt)
+DEBUG_COUNTER (sel_sched_region_cnt)
 DEBUG_COUNTER (sms_sched_loop)
-DEBUG_COUNTER (store_motion)
 DEBUG_COUNTER (split_for_sched2)
+DEBUG_COUNTER (store_motion)
 DEBUG_COUNTER (tail_call)
-DEBUG_COUNTER (ira_move)
-DEBUG_COUNTER (registered_jump_thread)
+DEBUG_COUNTER (treepre_insert)
+DEBUG_COUNTER (tree_sra)
+DEBUG_COUNTER (vect_loop)
+DEBUG_COUNTER (vect_slp)

diff --git a/gcc/opts.c b/gcc/opts.c
index cf92334..9deb8df 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1759,8 +1759,12 @@ common_handle_option (struct gcc_options *opts,
       break;
 
     case OPT_fdbg_cnt_:
+      /* Deferred.  */
+      break;
+
     case OPT_fdbg_cnt_list:
       /* Deferred.  */
+      opts->x_exit_after_options = true;
       break;
 
     case OPT_fdebug_prefix_map_: