diff mbox

Implement C1X _Alignas, _Alignof, max_align_t, stdalign.h

Message ID CAH6eHdT7kJK6h_=RfyFkKZfpVsUXp+pGX8MHa3mU5gXgtMM=PQ@mail.gmail.com
State New
Headers show

Commit Message

Jonathan Wakely Dec. 3, 2011, 3:41 p.m. UTC 
patch ping ...

On 7 November 2011 09:58, Jonathan Wakely wrote:
>
> And then this adjusts <stdalign.h> and <stdbool.h> for C++11 conformance.
>
> C++11 requires stdbool.h so providing it is not a GCC extension, but
> defining _Bool is. I don't see the point of defining bool, true and
> false as macros in C++ and it's explicitly forbidden by C++11.
> Personally I'd prefer if _Bool was a typedef rather than a macro, but
> I haven't changed that.
>
>
> gcc/ChangeLog:
>        * ginclude/stdalign.h (__alignas_is_defined, __alignof_is_defined):
>        Define for C++.
>        * ginclude/stdbool.h (bool, true, false): Do not define for C++.
>
> libstdc++-v3/ChangeLog:
>        * testsuite/18_support/headers/cstdalign/macros.cc: New.
>        * testsuite/18_support/headers/cstdbool/macros.cc: New.
>
>
> Tested x86_64-linux, OK for trunk?

Comments

Miles Bader Dec. 6, 2011, 7:12 a.m. UTC | #1 
BTW, is there a reason that C1X _Alignas is supported, but not C++11
alignas?  Is the latter harder?

Thanks,

-Miles
Jonathan Wakely Dec. 6, 2011, 11 a.m. UTC | #2 
On 6 December 2011 07:12, Miles Bader wrote:
> BTW, is there a reason that C1X _Alignas is supported, but not C++11
> alignas?  Is the latter harder?

Huh, for some reason I thought it already was.  That makes the
stdalign.h part of my patch wrong then.
diff mbox

Patch

Index: gcc/ginclude/stdalign.h
===================================================================
--- gcc/ginclude/stdalign.h	(revision 181077)
+++ gcc/ginclude/stdalign.h	(working copy)
@@ -31,9 +31,9 @@ 
 #define alignas _Alignas
 #define alignof _Alignof
 
+#endif
+
 #define __alignas_is_defined 1
 #define __alignof_is_defined 1
 
-#endif
-
 #endif	/* stdalign.h */
Index: gcc/ginclude/stdbool.h
===================================================================
--- gcc/ginclude/stdbool.h	(revision 181077)
+++ gcc/ginclude/stdbool.h	(working copy)
@@ -1,4 +1,4 @@ 
-/* Copyright (C) 1998, 1999, 2000, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2009, 2011 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -36,11 +36,8 @@ 
 
 #else /* __cplusplus */
 
-/* Supporting <stdbool.h> in C++ is a GCC extension.  */
+/* Supporting _Bool in C++ is a GCC extension.  */
 #define _Bool	bool
-#define bool	bool
-#define false	false
-#define true	true
 
 #endif /* __cplusplus */
 
Index: libstdc++-v3/testsuite/18_support/headers/cstdalign/macros.cc
===================================================================
--- libstdc++-v3/testsuite/18_support/headers/cstdalign/macros.cc	(revision 0)
+++ libstdc++-v3/testsuite/18_support/headers/cstdalign/macros.cc	(revision 0)
@@ -0,0 +1,30 @@ 
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+
+// Copyright (C) 2011 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <cstdalign>
+
+#ifdef alignas
+# error "The header <cstdalign> defines a macro named alignas"
+#endif
+
+#ifndef __alignas_is_defined
+# error "The header <cstdalign> fails to define a macro named __alignas_is_defined"
+#endif
+
Index: libstdc++-v3/testsuite/18_support/headers/cstdbool/macros.cc
===================================================================
--- libstdc++-v3/testsuite/18_support/headers/cstdbool/macros.cc	(revision 0)
+++ libstdc++-v3/testsuite/18_support/headers/cstdbool/macros.cc	(revision 0)
@@ -0,0 +1,38 @@ 
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+
+// Copyright (C) 2011 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <cstdbool>
+
+#ifndef __bool_true_false_are_defined
+# error "The header <cstdbool> fails to define a macro named __bool_true_false_are_defined"
+#endif
+
+#ifdef bool
+# error "The header <cstdbool> defines a macro named bool"
+#endif
+
+#ifdef true
+# error "The header <cstdbool> defines a macro named true"
+#endif
+
+#ifdef false
+# error "The header <cstdbool> defines a macro named false"
+#endif
+