Get rid of bundle size controls in gcc

We do not need to be as flexible with the size of the bundles any more.

R=pasko@google.com
BUG=
TEST=

Review URL: http://codereview.chromium.org/6995077
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 01310a4..2ee95d3 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -2598,6 +2598,13 @@
       sw = "attribute";
     }
 
+  if (TARGET_NACL)
+    {
+      align_jumps = 32;
+      align_labels = 32;
+      align_functions = 32;
+    }
+
 #ifdef SUBTARGET_OVERRIDE_OPTIONS
   SUBTARGET_OVERRIDE_OPTIONS;
 #endif
@@ -7466,7 +7473,7 @@
 	  switch_to_section (get_named_section (decl, NULL, 0));
 
 	  if (TARGET_NACL)
-	    fprintf (asm_out_file, ".p2align %d\n", NACL_ALIGN_POW2);
+	    fprintf (asm_out_file, ".p2align %d\n", align_functions_log);
 	  (*targetm.asm_out.globalize_label) (asm_out_file, name);
 	  fputs ("\t.hidden\t", asm_out_file);
 	  assemble_name (asm_out_file, name);
@@ -7477,7 +7484,7 @@
 	{
 	  switch_to_section (text_section);
 	  if (TARGET_NACL)
-	    fprintf (asm_out_file, ".p2align %d\n", NACL_ALIGN_POW2);
+	    fprintf (asm_out_file, ".p2align %d\n", align_functions_log);
 	  ASM_OUTPUT_LABEL (asm_out_file, name);
 	}
 
diff --git a/gcc/config/nacl.opt b/gcc/config/nacl.opt
index ad0a815..c463774 100644
--- a/gcc/config/nacl.opt
+++ b/gcc/config/nacl.opt
@@ -23,35 +23,5 @@
 Common Report Var(flag_control_integrity) Init(1)
 Expand indirect call, jmp, and rets
 
-falign-functions
-Common Report Var(align_functions,NACL_ALIGN_BYTES) Init(NACL_ALIGN_BYTES)
-Align the start of functions
-
-falign-functions=
-Common RejectNegative Joined UInteger
-
-falign-jumps
-Common Report Var(align_jumps,NACL_ALIGN_BYTES) Init(NACL_ALIGN_BYTES)
-Align labels which are only reached by jumping
-
-falign-jumps=
-Common RejectNegative Joined UInteger
-
-falign-labels
-Common Report Var(align_labels,NACL_ALIGN_BYTES) Init(NACL_ALIGN_BYTES)
-Align all labels
-
-falign-labels=
-Common RejectNegative Joined UInteger
-
-fnacl-library-mode
-Common Report Var(flag_nacl_library_mode,1) Init(0)
-
-fnacl-align-16
-Common Report Var(flag_nacl_align_pow2,4) Init(NACL_ALIGN_POW2)
-
-fnacl-align-32
-Common Report Var(flag_nacl_align_pow2,5)
-
 finstrument-for-thread-suspension
 Common Report Var(flag_instrument_for_thread_suspension)
diff --git a/gcc/opts.c b/gcc/opts.c
index e20289f..a75db66 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -943,12 +943,9 @@
   /* 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 @@
       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)
     {