re PR target/44805 (FAIL: gcc.c-torture/execute/builtins/strpcpy-2.c execution, at -O1 and above)

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

From-SVN: r162278

gcc/ChangeLog

+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

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)		\