From: Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
Date: Sun, 10 Feb 2008 05:42:55 +0000 (+0000)
Subject: re PR objc++/27232 (encode-3.mm fails with "deprecated conversion" warning)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f4f70d59387e00881fdc719bb95d34a9c57c432;p=thirdparty%2Fgcc.git

re PR objc++/27232 (encode-3.mm fails with "deprecated conversion" warning)

	PR objc++/27232

	Backport:
	2006-09-22  Mike Stump  <mrs@apple.com>

	* obj-c++.dg/encode-3.mm: Fix for 64-bit support.

From-SVN: r132212
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4070878ff0cc..6dc0c369d0b9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-10  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR objc++/27232
+
+	Backport:
+	2006-09-22  Mike Stump  <mrs@apple.com>
+	
+	* obj-c++.dg/encode-3.mm: Fix for 64-bit support.
+
 2008-02-04  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/33631
diff --git a/gcc/testsuite/obj-c++.dg/encode-3.mm b/gcc/testsuite/obj-c++.dg/encode-3.mm
index c67a972ddcee..842a0bf37e58 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;