From 32ae3e52f1e7eb0bf06af94f58ca7abcc5494bfb Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 21 Sep 2016 00:35:59 -0400 Subject: [PATCH] Partially revert 714daaf5706e9e2b. We were mostly OK under i686/x86_64, but Clang died completely under ARM-32 and Aarch64. --- config.compat | 8 -------- config.h | 8 -------- 2 files changed, 16 deletions(-) diff --git a/config.compat b/config.compat index 040701a5..aa1f12e4 100644 --- a/config.compat +++ b/config.compat @@ -249,14 +249,6 @@ typedef unsigned int word32; typedef word64 lword; const lword LWORD_MAX = W64LIT(0xffffffffffffffff); -// Clang pretends to be GCC, but can't consume the same programs. It breaks completely with -march-x86-64 -#if defined(__GNUC__) && defined(__clang__) -# undef __GNUC__ -# undef __GNUC_MINOR__ -# undef __GNUC_PATCHLEVEL__ -# define __GNUC__ 4 -#endif - // Clang pretends to be VC++, too. // See http://github.com/weidai11/cryptopp/issues/147 #if defined(_MSC_VER) && defined(__clang__) diff --git a/config.h b/config.h index c82f7021..f5134cae 100644 --- a/config.h +++ b/config.h @@ -249,14 +249,6 @@ typedef unsigned int word32; typedef word64 lword; const lword LWORD_MAX = W64LIT(0xffffffffffffffff); -// Clang pretends to be GCC, but can't consume the same programs. It breaks completely with -march-x86-64 -#if defined(__GNUC__) && defined(__clang__) -# undef __GNUC__ -# undef __GNUC_MINOR__ -# undef __GNUC_PATCHLEVEL__ -# define __GNUC__ 4 -#endif - // Clang pretends to be VC++, too. // See http://github.com/weidai11/cryptopp/issues/147 #if defined(_MSC_VER) && defined(__clang__)