From: Marc Glisse <marc.glisse@inria.fr>
Date: Thu, 6 Feb 2014 15:32:27 +0000 (+0100)
Subject: constexpr-attribute2.C: Restrict to target init_priority.
X-Git-Tag: releases/gcc-4.9.0~1038
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f5e5e02b74643e16969a2a6e4bbee77185efaf0;p=thirdparty%2Fgcc.git

constexpr-attribute2.C: Restrict to target init_priority.

2014-02-06  Marc Glisse  <marc.glisse@inria.fr>

	* g++.dg/cpp0x/constexpr-attribute2.C: Restrict to target
	init_priority. Test alignment of variable instead of function.

From-SVN: r207561
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ef4a72e68b2f..80892ee74e72 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-06  Marc Glisse  <marc.glisse@inria.fr>
+
+	* g++.dg/cpp0x/constexpr-attribute2.C: Restrict to target
+	init_priority. Test alignment of variable instead of function.
+
 2014-02-06  Marek Polacek  <polacek@redhat.com>
 
 	PR c/60087
@@ -162,7 +167,6 @@
 	PR ipa/59831
 	* g++.dg/ipa/devirt-24.C: New testcase.
 
->>>>>>> .r207518
 2014-02-03  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR c++/53017
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-attribute2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-attribute2.C
index 755188ee0fb9..97fc3eff3cf3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-attribute2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-attribute2.C
@@ -1,3 +1,4 @@
+// { dg-do compile { target init_priority } }
 // { dg-options -std=gnu++11 }
 
 struct t { t(); };
@@ -29,4 +30,4 @@ typedef char vec __attribute__((vector_size(size)));
 
 void f(char*) __attribute__((nonnull(pos)));
 
-void g() __attribute__((aligned(size)));
+char g __attribute__((aligned(size)));