svn merge -r131256:139562 svn+ssh://gcc.gnu.org/svn/gcc/branches/redhat/fc6-4_1-branchredhat/fc5-4_1-branch

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/fc5-4_1-branch@143674 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 10 insertions, 4 deletions

diff --git a/gcc/testsuite/obj-c++.dg/encode-3.mm b/gcc/testsuite/obj-c++.dg/encode-3.mm
index c67a972ddce..842a0bf37e5 100644
--- a/gcc/testsuite/obj-c++.dg/encode-3.mm
+++ b/gcc/testsuite/obj-c++.dg/encode-3.mm
@@ -14,16 +14,22 @@ Vec<double> dd;
 const char *enc = @encode(Vec<float>);
 const char *enc2 = @encode(Vec<double>);
 
+#ifdef __LP64__
+#define L "q"
+#else
+#define L "l"
+#endif
+
 int main(void) {
-  char *encode = @encode(long);
+  const char *encode = @encode(long);
 
-  if (strcmp (encode, "l"))
+  if (strcmp (encode, L))
     abort();
 
-  if (strcmp (enc, "{Vec<float>=fflq}"))
+  if (strcmp (enc, "{Vec<float>=ff" L "q}"))
     abort();
 
-  if (strcmp (enc2, "{Vec<double>=ddlq}"))
+  if (strcmp (enc2, "{Vec<double>=dd" L "q}"))
     abort();
 
   return 0;