diff --git a/gcc/opts.cc b/gcc/opts.cc
index 2433ace06d213d2a82e5e35ea6ec533887b08956..0db866bdb357eccc4fb201f2a059931a83621e59 100644
--- a/gcc/opts.cc
+++ b/gcc/opts.cc
@@ -3450,12 +3450,19 @@ common_handle_option (struct gcc_options *opts,
       break;
     
     case OPT_fauto_bolt_:
-      opts->x_flag_auto_bolt = true;
+      if (get_optimize_decision_from_ai4c ())
+	{
+	  opts->x_flag_auto_bolt = true;
+	}
       /* FALLTHRU */
     case OPT_fauto_bolt:
       if (opts->x_flag_bolt_use)
         error_at (loc,
 		  "-fauto-bolt conflicts with -fbolt-use.");
+      if (get_optimize_decision_from_ai4c ())
+	{
+	  opts->x_flag_auto_bolt = true;
+	}
       break;
 
     case OPT_fbolt_use_:
@@ -3463,6 +3470,10 @@ common_handle_option (struct gcc_options *opts,
       if (opts->x_flag_auto_bolt)
         error_at (loc,
 		  "-fauto-bolt conflicts with -fbolt-use.");
+      if (get_optimize_decision_from_ai4c ())
+	{
+	  opts->x_flag_bolt_use = true;
+	}
     break;
 
     case OPT_fbolt_target_: