Get rid of bundle size controls in gcc

gcc/opts.c

Index: gcc/opts.c
diff --git a/gcc/opts.c b/gcc/opts.c
index e20289f1a871de91aed022d405020a997b8bdf48..a75db6691651bbfe9291b3c747ef037fc3838dd1 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -943,12 +943,9 @@ decode_options (unsigned int argc, const char **argv)
   /* Just -O1/-O0 optimizations.  */
   opt1_max = (optimize <= 1);
   align_loops = opt1_max;
-  if (!flag_control_integrity)
-  {
   align_jumps = opt1_max;
   align_labels = opt1_max;
   align_functions = opt1_max;
-  }
 
   if (optimize_size)
     {
@@ -1087,21 +1084,6 @@ decode_options (unsigned int argc, const char **argv)
       flag_ira_algorithm = IRA_ALGORITHM_PRIORITY;
     }
 
-  /* NativeClient: set the alignment based on command line flags. */
-  if (flag_nacl_align_pow2 != NACL_ALIGN_POW2)
-    {
-      align_jumps = (1 << flag_nacl_align_pow2);
-      align_labels = (1 << flag_nacl_align_pow2);
-      align_functions = (1 << flag_nacl_align_pow2);
-    }
-
-  if (flag_nacl_library_mode)
-    {
-      align_jumps = 32;
-      align_labels = 32;
-      align_functions = 32;
-    }
-
   /* Save the current optimization options if this is the first call.  */
   if (first_time_p)
     {