From ce0189dc1e9a4893134a30cd05debbc88827b96d Mon Sep 17 00:00:00 2001
From: Brian Cox <BrianRCox@gmail.com>
Date: Sat, 28 Sep 2019 19:09:26 +0000
Subject: [PATCH] clang build fixes

---
 configure           | 8 ++++----
 configure.ac        | 4 ++--
 src/core/error.h    | 2 +-
 src/core/platform.h | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 0ff26f8..1fb05a8 100755
--- a/configure
+++ b/configure
@@ -3292,7 +3292,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in gcc clang suncc aCC xlc_r gxlc xlC_r xlC cl.exe
+  for ac_prog in gcc clang suncc aCC xlc_r gxlc cl
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3336,7 +3336,7 @@ fi
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in gcc clang suncc aCC xlc_r gxlc xlC_r xlC cl.exe
+  for ac_prog in gcc clang suncc aCC xlc_r gxlc cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4143,7 +4143,7 @@ if test -z "$CXX"; then
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ clang++ sunCC aCC xlc++_r gxlc++ xlC_r xlC cl.exe
+  for ac_prog in g++ clang++ sunCC aCC xlc++_r gxlc++ ixlc icc owcc cl KCC cfront c++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4187,7 +4187,7 @@ fi
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ clang++ sunCC aCC xlc++_r gxlc++ xlC_r xlC cl.exe
+  for ac_prog in g++ clang++ sunCC aCC xlc++_r gxlc++ ixlc icc owcc cl KCC cfront c++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
diff --git a/configure.ac b/configure.ac
index d87c239..362a39c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,8 @@ AH_BOTTOM([#include "core/fixups.h"])
 dnl ###################
 dnl Checks for programs
 dnl ###################
-AC_PROG_CC([gcc clang suncc aCC xlc_r gxlc xlC_r xlC cl.exe])
-AC_PROG_CXX([g++ c++ clang++ sunCC aCC xlc++_r gxlc++ xlC_r xlC cl.exe])
+AC_PROG_CC([gcc clang suncc aCC xlc_r gxlc cl])
+AC_PROG_CXX([g++ clang++ sunCC aCC xlc++_r gxlc++ ixlc icc owcc cl KCC cfront c++])
 AC_PROG_RANLIB
 AC_PROG_YACC
 AC_PROG_LN_S
diff --git a/src/core/error.h b/src/core/error.h
index a98f5f8..d0d575c 100644
--- a/src/core/error.h
+++ b/src/core/error.h
@@ -129,7 +129,7 @@ protected:
 
 // TODO: make use of 'explicit' more portable here, and/or figure out why
 // this doesn't work on so many compilers
-#if HAVE_GCC || HAVE_IBM_XLC || HAVE_IBM_GXLC || HAVE_ORACLE_SUNCC
+#if 1 //HAVE_GCC || HAVE_CLANG || HAVE_IBM_XLC || HAVE_IBM_GXLC || HAVE_ORACLE_SUNCC
 #    define TSS_BEGIN_EXCEPTION_EXPLICIT
 #else
 #    define TSS_BEGIN_EXCEPTION_EXPLICIT explicit
diff --git a/src/core/platform.h b/src/core/platform.h
index e49cefe..2e01f52 100644
--- a/src/core/platform.h
+++ b/src/core/platform.h
@@ -165,7 +165,7 @@
 #        define COMP COMP_SUNPRO
 #        define IS_SUNPRO 1
 
-#    elif defined(HAVE_IBM_XL_C || HAVE_IBM_GXLC)
+#    elif defined(HAVE_IBM_XL_C) || defined(HAVE_IBM_GXLC)
 #        define COMP COMP_XL_C
 #        define IS_XL_C 1