PR target/44805

	* config/pa/pa.h (CONSTANT_ALIGNMENT): Align strings to BITS_PER_WORD
	on all targets.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162278 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 77938c3..ddfdc91 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,25 @@
+2010-07-17  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+       PR target/44805
+       * config/pa/pa.h (CONSTANT_ALIGNMENT): Align strings to BITS_PER_WORD
+       on all targets.
+
+Index: config/pa/pa.h
+===================================================================
+--- config/pa/pa.h     (revision 162277)
++++ config/pa/pa.h     (working copy)
+@@ -316,8 +316,9 @@
+ #define BIGGEST_ALIGNMENT (2 * BITS_PER_WORD)
+ 
+ /* Get around hp-ux assembler bug, and make strcpy of constants fast.  */
+-#define CONSTANT_ALIGNMENT(CODE, TYPEALIGN) \
+-  ((TYPEALIGN) < 32 ? 32 : (TYPEALIGN))
++#define CONSTANT_ALIGNMENT(EXP, ALIGN)                \
++  (TREE_CODE (EXP) == STRING_CST              \
++   && (ALIGN) < BITS_PER_WORD ? BITS_PER_WORD : (ALIGN))
+ 
+ /* Make arrays of chars word-aligned for the same reasons.  */
+ #define DATA_ALIGNMENT(TYPE, ALIGN)           \
 2010-07-17  Bernd Schmidt  <bernds@codesourcery.com>
 
        PR target/42235

diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index 1bb0f10..73116c5 100644 (file)
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -316,8 +316,9 @@ typedef struct GTY(()) machine_function
 #define BIGGEST_ALIGNMENT (2 * BITS_PER_WORD)
 
 /* Get around hp-ux assembler bug, and make strcpy of constants fast.  */
-#define CONSTANT_ALIGNMENT(CODE, TYPEALIGN) \
-  ((TYPEALIGN) < 32 ? 32 : (TYPEALIGN))
+#define CONSTANT_ALIGNMENT(EXP, ALIGN)         \
+  (TREE_CODE (EXP) == STRING_CST               \
+   && (ALIGN) < BITS_PER_WORD ? BITS_PER_WORD : (ALIGN))
 
 /* Make arrays of chars word-aligned for the same reasons.  */
 #define DATA_ALIGNMENT(TYPE, ALIGN)            \