From: Nick Clifton Date: Fri, 13 Jun 2014 13:33:09 +0000 (+0000) Subject: rx.h (JUMP_ALIGN): Return the log value if user requested alignment is active. X-Git-Tag: releases/gcc-5.1.0~6892 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6c438246c239c86847cb38bedcb7d85711b1863;p=thirdparty%2Fgcc.git rx.h (JUMP_ALIGN): Return the log value if user requested alignment is active. * config/rx/rx.h (JUMP_ALIGN): Return the log value if user requested alignment is active. (LABEL_ALIGN): Likewise. (LOOP_ALIGN): Likewise. From-SVN: r211638 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1e30212e5fde..df39537c785f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-06-13 Nick Clifton + + * config/rx/rx.h (JUMP_ALIGN): Return the log value if user + requested alignment is active. + (LABEL_ALIGN): Likewise. + (LOOP_ALIGN): Likewise. + 2014-06-13 Richard Biener * tree-ssa-pre.c (eliminate_dom_walker::before_dom_children): diff --git a/gcc/config/rx/rx.h b/gcc/config/rx/rx.h index 209518c6d380..050ac68dc8e7 100644 --- a/gcc/config/rx/rx.h +++ b/gcc/config/rx/rx.h @@ -433,9 +433,9 @@ typedef unsigned int CUMULATIVE_ARGS; /* Compute the alignment needed for label X in various situations. If the user has specified an alignment then honour that, otherwise use rx_align_for_label. */ -#define JUMP_ALIGN(x) (align_jumps ? align_jumps : rx_align_for_label (x, 0)) -#define LABEL_ALIGN(x) (align_labels ? align_labels : rx_align_for_label (x, 3)) -#define LOOP_ALIGN(x) (align_loops ? align_loops : rx_align_for_label (x, 2)) +#define JUMP_ALIGN(x) (align_jumps > 1 ? align_jumps_log : rx_align_for_label (x, 0)) +#define LABEL_ALIGN(x) (align_labels > 1 ? align_labels_log : rx_align_for_label (x, 3)) +#define LOOP_ALIGN(x) (align_loops > 1 ? align_loops_log : rx_align_for_label (x, 2)) #define LABEL_ALIGN_AFTER_BARRIER(x) rx_align_for_label (x, 0) #define ASM_OUTPUT_MAX_SKIP_ALIGN(STREAM, LOG, MAX_SKIP) \