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 1e30212e5fde9d8b0a52f08d59d2a0dec0946fd8..df39537c785fa0ad395460192e945d8684e9364d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-13  Nick Clifton  <nickc@redhat.com>
+
+       * 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  <rguenther@suse.de>
 
        * 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 209518c6d3808ed941721b67c7591f3817472969..050ac68dc8e74c6da9d845347da9a03fc7c1b439 100644 (file)
--- 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)       \