From 9874a6311c6b51247caed248cfcf2d2e72095923 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 5 May 2018 21:15:28 +0300 Subject: Remove support for CILK plus. --- src/localconsts.h | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'src/localconsts.h') diff --git a/src/localconsts.h b/src/localconsts.h index a9aa48100..10ec5e110 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -121,25 +121,9 @@ #endif // __clang__ #endif // __native_client__ -#ifdef ENABLE_CILKPLUS -#ifdef __GNUC__ -#if GCC_VERSION < 60000 -#define BAD_CILKPLUS -#else // GCC_VERSION < 60000 -#define GOOD_CILKPLUS -#endif // GCC_VERSION < 60000 -#endif // __GNUC__ -#endif // ENABLE_CILKPLUS - -#if defined(ENABLE_CILKPLUS) && defined(BAD_CILKPLUS) -#define A_CONST -#define A_PURE -#define A_INLINE -#else // ENABLE_CILKPLUS #define A_CONST __attribute__ ((const)) #define A_PURE __attribute__ ((pure)) #define A_INLINE __attribute__ ((always_inline)) -#endif // ENABLE_CILKPLUS #ifdef __x86_64__ // gcc 4.8 look like support avx2, but need global define for enable any SIMD @@ -161,11 +145,7 @@ #endif // GCC_VERSION < 40900 #endif // __INTEL_COMPILER -#ifndef ENABLE_CILKPLUS #define A_NONNULL(...) __attribute__((nonnull (__VA_ARGS__))) -#else // ENABLE_CILKPLUS -#define A_NONNULL(...) -#endif // ENABLE_CILKPLUS #else // __GNUC__ #define A_UNUSED @@ -182,10 +162,6 @@ #define gnu_printf printf #endif // __clang__ -#ifdef ENABLE_CILKPLUS -#include -#endif // ENABLE_CILKPLUS - #ifdef ADVGCC #define const2 const @@ -267,25 +243,6 @@ #endif // GCC_VERSION > 40000 #endif // __GNUC__ -#ifdef __GNUC__ -#ifdef ENABLE_CILKPLUS -#if GCC_VERSION < 40900 -#define cilk_for for -#define cilk_spawn -#define cilk_sync -#elif GCC_VERSION < 50000 -#ifdef cilk_for -#undef cilk_for -#endif // cilk_for -#define cilk_for for -#endif // GCC_VERSION < 40900 -#else // ENABLE_CILKPLUS -#define cilk_for for -#define cilk_spawn -#define cilk_sync -#endif // ENABLE_CILKPLUS -#endif // __GNUC__ - #define notfinal #ifdef ENABLE_CHECKPLUGIN -- cgit v1.2.3-60-g2f50