This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[committed] Restore nios2 builds
- From: Jeff Law <law at redhat dot com>
- To: gcc-patches <gcc-patches at gcc dot gnu dot org>
- Date: Tue, 17 Jul 2018 14:23:38 -0600
- Subject: [committed] Restore nios2 builds
The recent alignment changes broke nios2 as it referenced
align_labels_log. This patch updates it to use align_labels.levels[0].log.
Installing on the trunk.
Jeff
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2e724217fa4..d8057a074a1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-17 Jeff Law <law@redhat.com>
+
+ * config/nios2/nios2.c (nios2_label_align): Update for recent
+ changes which dropped ALIGN_LABELS_LOG.
+
2018-07-17 Andreas Schwab <schwab@linux-m68k.org>
* config/m68k/m68k.md (umulsi3_highpart+1, const_umulsi3_highpart)
diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
index 3581ad9340d..344181a496b 100644
--- a/gcc/config/nios2/nios2.c
+++ b/gcc/config/nios2/nios2.c
@@ -5403,8 +5403,8 @@ nios2_label_align (rtx label)
int n = CODE_LABEL_NUMBER (label);
if (label_align && n >= min_labelno && n <= max_labelno)
- return MAX (label_align[n - min_labelno], align_labels_log);
- return align_labels_log;
+ return MAX (label_align[n - min_labelno], align_labels.levels[0].log);
+ return align_labels.levels[0].log;
}
/* Implement ADJUST_REG_ALLOC_ORDER. We use the default ordering