From: Jan-Benedict Glaw <jbglaw@lug-owl.de>
Date: Mon, 20 Jan 2014 11:20:24 +0000 (+0000)
Subject: re PR bootstrap/59496 (Bootstrap fails on powerpc-apple-darwin9 after r205685)
X-Git-Tag: releases/gcc-4.9.0~1561
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c716977996bb5b73c3ab8dd7c14215697d5eed19;p=thirdparty%2Fgcc.git

re PR bootstrap/59496 (Bootstrap fails on powerpc-apple-darwin9 after r205685)

gcc:

	PR bootstrap/59496
	* config/rs6000/darwin.h (ADJUST_FIELD_ALIGN): Fix unused variable
	warning.  Amend comment to reflect current functionality.


Co-Authored-By: Iain Sandoe <iain@codesourcery.com>

From-SVN: r206802
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index deac3c39d4ee..df6ab6918f31 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-20  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+	    Iain Sandoe  <iain@codesourcery.com>
+
+	PR bootstrap/59496
+	* config/rs6000/darwin.h (ADJUST_FIELD_ALIGN): Fix unused variable
+	warning.  Amend comment to reflect current functionality.
+
 2014-01-20  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/59860
diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h
index 43a2ab514dc7..0329f3f621b4 100644
--- a/gcc/config/rs6000/darwin.h
+++ b/gcc/config/rs6000/darwin.h
@@ -321,16 +321,19 @@ extern int darwin_emit_branch_islands;
    ? GENERAL_REGS						\
    : (CLASS))
 
-/* Compute field alignment.  This is similar to the version of the
-   macro in the Apple version of GCC, except that version supports
-   'mac68k' alignment, and that version uses the computed alignment
-   always for the first field of a structure.  The first-field
-   behavior is dealt with by
-   darwin_rs6000_special_round_type_align.  */
-#define ADJUST_FIELD_ALIGN(FIELD, COMPUTED)	\
-  (TARGET_ALIGN_NATURAL ? (COMPUTED)		\
-   : (COMPUTED) == 128 ? 128			\
-   : MIN ((COMPUTED), 32))
+/* Compute field alignment.
+   This implements the 'power' alignment rule by pegging the alignment of
+   items (beyond the first aggregate field) to 32 bits.  The pegging is
+   suppressed for vector and long double items (both 128 in size).
+   There is a dummy use of the FIELD argument to avoid an unused variable
+   warning (see PR59496).  */
+#define ADJUST_FIELD_ALIGN(FIELD, COMPUTED)			\
+  ((void) (FIELD),						\
+    (TARGET_ALIGN_NATURAL					\
+     ? (COMPUTED)						\
+     : (COMPUTED) == 128					\
+	? 128							\
+	: MIN ((COMPUTED), 32)))
 
 /* Darwin increases natural record alignment to doubleword if the first
    field is an FP double while the FP fields remain word aligned.  */