Stick to clang inside llvm when jit-rebuild and some minor build fixes

Now it's nesessary to add clang 3.7 source into llvm-3.7.1cppbe source:
cd <llvm_source>/tools
git clone http://llvm.org/git/clang
cd clang
git checkout release_37
And then build and install llvm as usual.

Author: zhroma

configure

@@ -823,7 +823,6 @@ with_wal_segsize
 with_CC
 enable_llvm_jit
 with_llvm_config
-with_clang
 enable_jit_rebuild
 enable_depend
 enable_cassert
@@ -1520,7 +1519,6 @@ Optional Packages:
                           set WAL segment size in MB [16]
   --with-CC=CMD           set compiler (deprecated)
   --with-llvm-config=PATH how to run llvm-config
-  --with-clang=PATH       how to run clang
   --with-tcl              build Tcl modules (PL/Tcl)
   --with-tclconfig=DIR    tclConfig.sh is in DIR
   --with-perl             build Perl modules (PL/Perl)
@@ -5277,27 +5275,6 @@ fi
 
 
 
-# Check whether --with-clang was given.
-if test "${with_clang+set}" = set; then :
-  withval=$with_clang;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-clang option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-clang option" "$LINENO" 5
-      ;;
-    *)
-
-      ;;
-  esac
-
-fi
-
-
-
-
-
 # Check whether --enable-jit-rebuild was given.
 if test "${enable_jit_rebuild+set}" = set; then :
   enableval=$enable_jit_rebuild;
@@ -15347,16 +15324,13 @@ $as_echo "$LLVM_VERSION bad" >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_VERSION ok" >&5
 $as_echo "$LLVM_VERSION ok" >&6; }
 
-    clang="clang-3.7"
-    if test "x$with_clang" != "x"; then
-      clang=$with_clang
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang 3.7" >&5
-$as_echo_n "checking for clang 3.7... " >&6; }
-    if $clang --version | grep "version 3.7" ; then :
+    clang=`$llvm_config --bindir`/clang;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang version 3.7.1cppbe" >&5
+$as_echo_n "checking for clang version 3.7.1cppbe... " >&6; }
+    if $clang --version | grep "version 3.7.1cppbe" ; then :
 
 else
-  as_fn_error $? "clang 3.7 required, unable to run using \"$clang\"" "$LINENO" 5
+  as_fn_error $? "clang 3.7.1cppbe required, unable to run using \"$clang\", pls build it inside LLVM" "$LINENO" 5
 fi
 
   fi

configure.in

@@ -557,7 +557,6 @@ PGAC_ARG_BOOL(enable, llvm-jit, yes, [turn off LLVM JIT],
 AC_SUBST(enable_llvm_jit)
 
 PGAC_ARG_REQ(with, llvm-config, [PATH], [how to run llvm-config])
-PGAC_ARG_REQ(with, clang, [PATH], [how to run clang])
 
 PGAC_ARG_BOOL(enable, jit-rebuild, no, [rebuild bitcode files and LLVM C++ API files])
 AC_SUBST(enable_jit_rebuild)
@@ -2057,7 +2056,7 @@ if test "$enable_llvm_jit" = yes ; then
   LLVM_VERSION_MAJOR=`echo $LLVM_VERSION | grep -E '^[[0-9.]]+' | awk -F. '{print $1}'`
   LLVM_VERSION_MINOR=`echo $LLVM_VERSION | grep -E '^[[0-9.]]+' | awk -F. '{print $2}'`
   LLVM_VERSION_PATCH=`echo $LLVM_VERSION | grep -E '^[[0-9.]]+' | awk -F. '{print $3}'`
-  if (test "x$LLVM_VERSION_MAJOR" != "x3") || ((test "x$LLVM_VERSION_MINOR" != "x7")); then
+  if (test "x$LLVM_VERSION_MAJOR" != "x3") || (test "x$LLVM_VERSION_MINOR" != "x7"); then
     AC_MSG_RESULT([$LLVM_VERSION bad])
     AC_MSG_ERROR([LLVM version 3.7(.1) required])
   fi
@@ -2071,13 +2070,10 @@ if test "$enable_llvm_jit" = yes ; then
     fi
     AC_MSG_RESULT([$LLVM_VERSION ok])
 
-    clang="clang-3.7"
-    if test "x$with_clang" != "x"; then
-      clang=$with_clang
-    fi
-    AC_MSG_CHECKING([for clang 3.7])
-    AS_IF([$clang --version | grep "version 3.7" ], [],
-          [AC_MSG_ERROR([clang 3.7 required, unable to run using "$clang"])])
+    clang=`$llvm_config --bindir`/clang;
+    AC_MSG_CHECKING([for clang version 3.7.1cppbe])
+    AS_IF([$clang --version | grep "version 3.7.1cppbe" ], [],
+          [AC_MSG_ERROR([clang 3.7.1cppbe required, unable to run using "$clang", pls build it inside LLVM])])
     AC_SUBST(clang)
   fi
 

src/backend/executor/llvm_backend/Makefile

@@ -12,7 +12,12 @@ subdir = src/backend/executor/llvm_backend
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
+ifeq ($(enable_debug), yes)
+CXXFLAGS := $(shell $(llvm_config) --cxxflags)
+else
 CXXFLAGS := $(shell $(llvm_config) --cxxflags) -g0
+endif
+
 LLVM_BACKEND_FILE_LIMIT := 50
 OBJS := llvm_backend_wrapper.o llvm_backend.a
 
@@ -36,7 +41,7 @@ ifeq ($(enable_jit_rebuild), yes)
   LLC := $(BINDIR)/llc
 
   OPT_OPTIONS := -O3
-  CLANG_OPTS := $(CPPFLAGS) $(CFLAGS) -g0 \
+  CLANG_OPTS := $(CPPFLAGS) $(CFLAGS) -O2 -g0 \
 	-Wno-invalid-command-line-argument \
 	-Wno-unused-command-line-argument \
 	-Wno-ignored-attributes \