diff options
| author | dim <dim@FreeBSD.org> | 2012-08-15 19:34:23 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-08-15 19:34:23 +0000 |
| commit | 721c201bd55ffb73cb2ba8d39e0570fa38c44e15 (patch) | |
| tree | eacfc83d988e4b9d11114387ae7dc41243f2a363 /projects/sample/autoconf/m4 | |
| parent | 2b2816e083a455f7a656ae88b0fd059d1688bb36 (diff) | |
| download | FreeBSD-src-721c201bd55ffb73cb2ba8d39e0570fa38c44e15.zip FreeBSD-src-721c201bd55ffb73cb2ba8d39e0570fa38c44e15.tar.gz | |
Vendor import of llvm trunk r161861:
http://llvm.org/svn/llvm-project/llvm/trunk@161861
Diffstat (limited to 'projects/sample/autoconf/m4')
| -rw-r--r-- | projects/sample/autoconf/m4/config_makefile.m4 | 4 | ||||
| -rw-r--r-- | projects/sample/autoconf/m4/func_isinf.m4 | 2 | ||||
| -rw-r--r-- | projects/sample/autoconf/m4/huge_val.m4 | 4 | ||||
| -rw-r--r-- | projects/sample/autoconf/m4/link_options.m4 | 2 | ||||
| -rw-r--r-- | projects/sample/autoconf/m4/rand48.m4 | 2 | ||||
| -rw-r--r-- | projects/sample/autoconf/m4/visibility_inlines_hidden.m4 | 6 |
6 files changed, 11 insertions, 9 deletions
diff --git a/projects/sample/autoconf/m4/config_makefile.m4 b/projects/sample/autoconf/m4/config_makefile.m4 index d9bfcb8..b1eaffd 100644 --- a/projects/sample/autoconf/m4/config_makefile.m4 +++ b/projects/sample/autoconf/m4/config_makefile.m4 @@ -4,6 +4,6 @@ # AC_DEFUN([AC_CONFIG_MAKEFILE], [AC_CONFIG_COMMANDS($1, - [${srcdir}/autoconf/mkinstalldirs `dirname $1` - ${SHELL} ${srcdir}/autoconf/install-sh -m 0644 -c ${srcdir}/$1 $1]) + [${llvm_src}/autoconf/mkinstalldirs `dirname $1` + ${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/$1 $1]) ]) diff --git a/projects/sample/autoconf/m4/func_isinf.m4 b/projects/sample/autoconf/m4/func_isinf.m4 index 5c000f8..22ba81d 100644 --- a/projects/sample/autoconf/m4/func_isinf.m4 +++ b/projects/sample/autoconf/m4/func_isinf.m4 @@ -1,5 +1,5 @@ # -# This function determins if the the isinf function isavailable on this +# This function determins if the isinf function isavailable on this # platform. # AC_DEFUN([AC_FUNC_ISINF],[ diff --git a/projects/sample/autoconf/m4/huge_val.m4 b/projects/sample/autoconf/m4/huge_val.m4 index 7ef9dca..6c9a22e 100644 --- a/projects/sample/autoconf/m4/huge_val.m4 +++ b/projects/sample/autoconf/m4/huge_val.m4 @@ -1,12 +1,12 @@ # -# This function determins if the the HUGE_VAL macro is compilable with the +# This function determins if the HUGE_VAL macro is compilable with the # -pedantic switch or not. XCode < 2.4.1 doesn't get it right. # AC_DEFUN([AC_HUGE_VAL_CHECK],[ AC_CACHE_CHECK([for HUGE_VAL sanity], [ac_cv_huge_val_sanity],[ AC_LANG_PUSH([C++]) ac_save_CXXFLAGS=$CXXFLAGS - CXXFLAGS+=" -pedantic" + CXXFLAGS="$CXXFLAGS -pedantic" AC_RUN_IFELSE( AC_LANG_PROGRAM( [#include <math.h>], diff --git a/projects/sample/autoconf/m4/link_options.m4 b/projects/sample/autoconf/m4/link_options.m4 index 4c5f2f4..57da4a0 100644 --- a/projects/sample/autoconf/m4/link_options.m4 +++ b/projects/sample/autoconf/m4/link_options.m4 @@ -10,7 +10,7 @@ AC_DEFUN([AC_LINK_GET_VERSION], # Check for ld64. if (echo "$version_string" | grep -q "ld64"); then - llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)#\1#") + llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)\( (.*)\)\{0,1\}#\1#") else llvm_cv_link_version=$(echo "$version_string" | sed -e "s#[^0-9]*\([0-9.]*\).*#\1#") fi diff --git a/projects/sample/autoconf/m4/rand48.m4 b/projects/sample/autoconf/m4/rand48.m4 index 56705d8..76f08fa 100644 --- a/projects/sample/autoconf/m4/rand48.m4 +++ b/projects/sample/autoconf/m4/rand48.m4 @@ -1,5 +1,5 @@ # -# This function determins if the the srand48,drand48,lrand48 functions are +# This function determins if the srand48,drand48,lrand48 functions are # available on this platform. # AC_DEFUN([AC_FUNC_RAND48],[ diff --git a/projects/sample/autoconf/m4/visibility_inlines_hidden.m4 b/projects/sample/autoconf/m4/visibility_inlines_hidden.m4 index 42ddbe9..b1cc42a 100644 --- a/projects/sample/autoconf/m4/visibility_inlines_hidden.m4 +++ b/projects/sample/autoconf/m4/visibility_inlines_hidden.m4 @@ -8,8 +8,10 @@ AC_DEFUN([AC_CXX_USE_VISIBILITY_INLINES_HIDDEN], [llvm_cv_cxx_visibility_inlines_hidden], [ AC_LANG_PUSH([C++]) oldcxxflags="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + CXXFLAGS="$CXXFLAGS -O0 -fvisibility-inlines-hidden -Werror" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [template <typename T> struct X { void __attribute__((noinline)) f() {} };], + [X<int>().f();])], [llvm_cv_cxx_visibility_inlines_hidden=yes],[llvm_cv_cxx_visibility_inlines_hidden=no]) CXXFLAGS="$oldcxxflags" AC_LANG_POP([C++]) |
