Last active
November 3, 2015 16:34
-
-
Save m000/c57fa35d550b49033864 to your computer and use it in GitHub Desktop.
patch to enable compilation of llvm-3.3 using gcc-4.9
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: cfe/trunk/lib/Headers/stddef.h | |
=================================================================== | |
--- cfe/trunk/lib/Headers/stddef.h (revision 201728) | |
+++ cfe/trunk/lib/Headers/stddef.h (revision 201729) | |
@@ -1,102 +1,112 @@ | |
/*===---- stddef.h - Basic type definitions --------------------------------=== | |
* | |
* Copyright (c) 2008 Eli Friedman | |
* | |
* Permission is hereby granted, free of charge, to any person obtaining a copy | |
* of this software and associated documentation files (the "Software"), to deal | |
* in the Software without restriction, including without limitation the rights | |
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
* copies of the Software, and to permit persons to whom the Software is | |
* furnished to do so, subject to the following conditions: | |
* | |
* The above copyright notice and this permission notice shall be included in | |
* all copies or substantial portions of the Software. | |
* | |
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |
* THE SOFTWARE. | |
* | |
*===-----------------------------------------------------------------------=== | |
*/ | |
#ifndef __STDDEF_H | |
#define __STDDEF_H | |
#if !defined(_PTRDIFF_T) || __has_feature(modules) | |
/* Always define ptrdiff_t when modules are available. */ | |
#if !__has_feature(modules) | |
#define _PTRDIFF_T | |
#endif | |
typedef __PTRDIFF_TYPE__ ptrdiff_t; | |
#endif | |
#if !defined(_SIZE_T) || __has_feature(modules) | |
/* Always define size_t when modules are available. */ | |
#if !__has_feature(modules) | |
#define _SIZE_T | |
#endif | |
typedef __SIZE_TYPE__ size_t; | |
#endif | |
/* ISO9899:2011 7.20 (C11 Annex K): Define rsize_t if __STDC_WANT_LIB_EXT1__ is | |
* enabled. */ | |
#if (defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1 && \ | |
!defined(_RSIZE_T)) || __has_feature(modules) | |
/* Always define rsize_t when modules are available. */ | |
#if !__has_feature(modules) | |
#define _RSIZE_T | |
#endif | |
typedef __SIZE_TYPE__ rsize_t; | |
#endif | |
#ifndef __cplusplus | |
/* Always define wchar_t when modules are available. */ | |
#if !defined(_WCHAR_T) || __has_feature(modules) | |
#if !__has_feature(modules) | |
#define _WCHAR_T | |
#if defined(_MSC_EXTENSIONS) | |
#define _WCHAR_T_DEFINED | |
#endif | |
#endif | |
typedef __WCHAR_TYPE__ wchar_t; | |
#endif | |
#endif | |
#undef NULL | |
#ifdef __cplusplus | |
# if !defined(__MINGW32__) && !defined(_MSC_VER) | |
# define NULL __null | |
# else | |
# define NULL 0 | |
# endif | |
#else | |
# define NULL ((void*)0) | |
#endif | |
#ifdef __cplusplus | |
#if defined(_MSC_EXTENSIONS) && defined(_NATIVE_NULLPTR_SUPPORTED) | |
namespace std { typedef decltype(nullptr) nullptr_t; } | |
using ::std::nullptr_t; | |
#endif | |
#endif | |
+#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L | |
+typedef struct { | |
+ long long __clang_max_align_nonce1 | |
+ __attribute__((__aligned__(__alignof__(long long)))); | |
+ long double __clang_max_align_nonce2 | |
+ __attribute__((__aligned__(__alignof__(long double)))); | |
+} max_align_t; | |
+#define __CLANG_MAX_ALIGN_T_DEFINED | |
+#endif | |
+ | |
#define offsetof(t, d) __builtin_offsetof(t, d) | |
#endif /* __STDDEF_H */ | |
/* Some C libraries expect to see a wint_t here. Others (notably MinGW) will use | |
__WINT_TYPE__ directly; accommodate both by requiring __need_wint_t */ | |
#if defined(__need_wint_t) | |
/* Always define wint_t when modules are available. */ | |
#if !defined(_WINT_T) || __has_feature(modules) | |
#if !__has_feature(modules) | |
#define _WINT_T | |
#endif | |
typedef __WINT_TYPE__ wint_t; | |
#endif | |
#undef __need_wint_t | |
#endif /* __need_wint_t */ | |
Index: cfe/trunk/test/Headers/c11.c | |
=================================================================== | |
--- cfe/trunk/test/Headers/c11.c (revision 201728) | |
+++ cfe/trunk/test/Headers/c11.c (revision 201729) | |
@@ -1,32 +1,36 @@ | |
// RUN: %clang_cc1 -fsyntax-only -verify -std=c11 %s | |
// RUN: %clang_cc1 -fsyntax-only -verify -std=c11 -fmodules %s | |
// RUN: %clang_cc1 -fsyntax-only -verify -std=c11 -ffreestanding %s | |
noreturn int f(); // expected-error 1+{{}} | |
#include <stdnoreturn.h> | |
#include <stdnoreturn.h> | |
#include <stdnoreturn.h> | |
int g(); | |
noreturn int g(); | |
int noreturn g(); | |
int g(); | |
#include <stdalign.h> | |
_Static_assert(__alignas_is_defined, ""); | |
_Static_assert(__alignof_is_defined, ""); | |
alignas(alignof(int)) char c[4]; | |
_Static_assert(__alignof(c) == 4, ""); | |
#define __STDC_WANT_LIB_EXT1__ 1 | |
#include <stddef.h> | |
rsize_t x = 0; | |
+_Static_assert(sizeof(max_align_t) >= sizeof(long long), ""); | |
+_Static_assert(alignof(max_align_t) >= alignof(long long), ""); | |
+_Static_assert(sizeof(max_align_t) >= sizeof(long double), ""); | |
+_Static_assert(alignof(max_align_t) >= alignof(long double), ""); | |
// If we are freestanding, then also check RSIZE_MAX (in a hosted implementation | |
// we will use the host stdint.h, which may not yet have C11 support). | |
#ifndef __STDC_HOSTED__ | |
#include <stdint.h> | |
rsize_t x2 = RSIZE_MAX; | |
#endif | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
We need this for compiling PANDA. This is a backup in case the original goes away.