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
	* gcc/opts.c (parse_and_check_align_values): Allow 4 alignment values.

From-SVN: r273533

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 063ae505e7b0d31b7ac6a0cbe21060cb2ccdc804..c2d1caa81b99dd2b0d3b3859118c3ce8de37ac21 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-07-16  Wilco Dijkstra  <wdijkstr@arm.com>
+
+       Backport from mainline
+       2019-05-30  Wilco Dijkstra  <wdijkstr@arm.com>
+
+       PR driver/90684
+       * gcc/opts.c (parse_and_check_align_values): Allow 4 alignment values.
+
 2019-07-14  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline

diff --git a/gcc/opts.c b/gcc/opts.c
index 6d6ff19de2d96b474c98f2b07f9b17c76ec47266..6164d49fa08ff6bd3ec7bf57cc626ce8b6f220eb 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -2016,14 +2016,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%> "