Fix alignment option parser (PR90684)

Fix the alignment option parser to always allow up to 4 alignments.
Now -falign-functions=16:8:8:8 no longer reports an error.

    gcc/
	PR driver/90684
	* opts.c (parse_and_check_align_values): Allow 4 alignment values.
M    gcc/ChangeLog
M    gcc/opts.c

From-SVN: r271864

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 06184edd27f20cbf86ec79f92b592964666ce688..bb764ac3b47ef8b254cf91dfee82ce1b0672c33e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-03  Wilco Dijkstra  <wdijkstr@arm.com>
+
+       PR driver/90684
+       * opts.c (parse_and_check_align_values): Allow 4 alignment values.
+
 2019-06-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * config/aarch64/iterators.md (MAX_OPP): New code attr.

diff --git a/gcc/opts.c b/gcc/opts.c
index 9e396f8571478e4cee4a38b5fa7fef59528b2292..64f94ac8ffd4da68eeaa7778a7be9b529914e608 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -2022,14 +2022,7 @@ parse_and_check_align_values (const char *flag,
   free (str);
 
   /* Check that we have a correct number of values.  */
-#ifdef SUBALIGN_LOG
-  unsigned max_valid_values = 4;
-#else
-  unsigned max_valid_values = 2;
-#endif
-
-  if (result_values.is_empty ()
-      || result_values.length () > max_valid_values)
+  if (result_values.is_empty () || result_values.length () > 4)
     {
       if (report_error)
        error_at (loc, "invalid number of arguments for %<-falign-%s%> "