[committed] Fix FRV builds

[Jeff Law]

More fallout from the alignment changes.  This time in frv_align_label.


Committed to the trunk.

jeff

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d8057a074a1..51e91221147 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2018-07-17  Jeff Law  <l...@redhat.com>
 
+       * config/frv/frv.c (frv_label_align): Update for recent changes
+       to label_to_alignment.
+
        * config/nios2/nios2.c (nios2_label_align): Update for recent
        changes which dropped ALIGN_LABELS_LOG.
 
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 78f1a80cdf9..6920e6ddace 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -7936,7 +7936,7 @@ frv_align_label (void)
     {
       if (LABEL_P (x))
        {
-         unsigned int subalign = 1 << label_to_alignment (x);
+         unsigned int subalign = 1 << label_to_alignment (x).levels[0].log;
          alignment = MAX (alignment, subalign);
          label = x;
        }