From 5ffd72d07ed593bda45f85340045a6900554ecf9 Mon Sep 17 00:00:00 2001 From: Bruno Cardoso Lopes Date: Mon, 12 Dec 2016 23:06:58 +0000 Subject: [PATCH] Revert "[Headers] Add #include_next for tgmath.h on Darwin" Reverts r289181: it's currently breaking modules using simd.h in 10.12 SDK. This reverts commit 6e73e3464e96a4e00492c24aa790d36e1adb5702. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@289487 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Headers/tgmath.h | 9 --------- test/Headers/Inputs/usr/include/tgmath.h | 4 ---- test/Headers/tgmath-darwin.c | 12 ------------ 3 files changed, 25 deletions(-) delete mode 100644 test/Headers/Inputs/usr/include/tgmath.h delete mode 100644 test/Headers/tgmath-darwin.c diff --git a/lib/Headers/tgmath.h b/lib/Headers/tgmath.h index 0b8b5ce277..318e1185fe 100644 --- a/lib/Headers/tgmath.h +++ b/lib/Headers/tgmath.h @@ -25,14 +25,6 @@ #ifndef __TGMATH_H #define __TGMATH_H -/* - * Allow additional definitions and implementation-defined values on Apple - * platforms. - */ -#if defined(__APPLE__) && __STDC_HOSTED__ && __has_include_next() -# include_next -#else - /* C99 7.22 Type-generic math . */ #include @@ -1379,5 +1371,4 @@ static long double #undef _TG_ATTRS #endif /* __cplusplus */ -#endif /* __has_include_next */ #endif /* __TGMATH_H */ diff --git a/test/Headers/Inputs/usr/include/tgmath.h b/test/Headers/Inputs/usr/include/tgmath.h deleted file mode 100644 index 897962d9e1..0000000000 --- a/test/Headers/Inputs/usr/include/tgmath.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef SYS_TGMATH_H -#define SYS_TGMATH_H - -#endif /* SYS_TGMATH_H */ diff --git a/test/Headers/tgmath-darwin.c b/test/Headers/tgmath-darwin.c deleted file mode 100644 index b24b6c0c72..0000000000 --- a/test/Headers/tgmath-darwin.c +++ /dev/null @@ -1,12 +0,0 @@ -// REQUIRES: system-darwin -// RUN: %clang -target x86_64-apple-darwin10 -fsyntax-only -std=c11 -isysroot %S/Inputs %s -#include - -// Test the #include_next on tgmath.h works on Darwin. -#ifndef SYS_TGMATH_H - #error "SYS_TGMATH_H not defined" -#endif - -#ifndef __TGMATH_H - #error "__TGMATH_H not defined" -#endif -- 2.40.0