Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/llvm/dist/llvm Import LLVM 3.5svn r202566.
details: https://anonhg.NetBSD.org/src/rev/99ccfbc14617
branches: trunk
changeset: 327321:99ccfbc14617
user: joerg <joerg%NetBSD.org@localhost>
date: Tue Mar 04 20:32:45 2014 +0000
description:
Import LLVM 3.5svn r202566.
diffstat:
external/bsd/llvm/dist/llvm/CMakeLists.txt | 37 +-
external/bsd/llvm/dist/llvm/CODE_OWNERS.TXT | 3 +-
external/bsd/llvm/dist/llvm/Makefile.config.in | 3 -
external/bsd/llvm/dist/llvm/Makefile.rules | 2 +
external/bsd/llvm/dist/llvm/configure | 3380 +-----------------------
5 files changed, 97 insertions(+), 3328 deletions(-)
diffs (truncated from 3638 to 300 lines):
diff -r ee115e7ef02c -r 99ccfbc14617 external/bsd/llvm/dist/llvm/CMakeLists.txt
--- a/external/bsd/llvm/dist/llvm/CMakeLists.txt Tue Mar 04 19:53:10 2014 +0000
+++ b/external/bsd/llvm/dist/llvm/CMakeLists.txt Tue Mar 04 20:32:45 2014 +0000
@@ -1,6 +1,21 @@
# See docs/CMake.html for instructions about how to build LLVM with CMake.
cmake_minimum_required(VERSION 2.8.8)
+
+# FIXME: It may be removed when we use 2.8.12.
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+ # Invalidate a couple of keywords.
+ set(cmake_2_8_12_INTERFACE)
+ set(cmake_2_8_12_PRIVATE)
+else()
+ # Use ${cmake_2_8_12_KEYWORD} intead of KEYWORD in target_link_libraries().
+ set(cmake_2_8_12_INTERFACE INTERFACE)
+ set(cmake_2_8_12_PRIVATE PRIVATE)
+ if(POLICY CMP0022)
+ cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
+ endif()
+endif()
+
project(LLVM)
# Add path for custom modules
@@ -135,11 +150,6 @@
option(BUILD_SHARED_LIBS
"Build all libraries as shared libraries instead of static" OFF)
-option(LLVM_ENABLE_CBE_PRINTF_A "Set to ON if CBE is enabled for printf %a output" ON)
-if(LLVM_ENABLE_CBE_PRINTF_A)
- set(ENABLE_CBE_PRINTF_A 1)
-endif()
-
option(LLVM_ENABLE_TIMESTAMPS "Enable embedding timestamp information in build" ON)
if(LLVM_ENABLE_TIMESTAMPS)
set(ENABLE_TIMESTAMPS 1)
@@ -188,7 +198,7 @@
option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON)
endif()
-option(LLVM_ENABLE_CXX11 "Compile with C++11 enabled." OFF)
+option(LLVM_ENABLE_CXX11 "Compile with C++11 enabled." ON)
option(LLVM_ENABLE_LIBCXX "Use libc++ if available." OFF)
option(LLVM_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)
option(LLVM_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF)
@@ -272,6 +282,9 @@
option (LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." ON)
option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm documentation." OFF)
+option (LLVM_BUILD_EXTERNAL_COMPILER_RT
+ "Build compiler-rt as an external project." OFF)
+
# All options referred to from HandleLLVMOptions have to be specified
# BEFORE this include, otherwise options will not be correctly set on
# first cmake run
@@ -423,9 +436,15 @@
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib )
-if( NOT DEFINED CMAKE_INSTALL_RPATH )
- set( CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
-endif( NOT DEFINED CMAKE_INSTALL_RPATH )
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+if (APPLE)
+ set(CMAKE_INSTALL_NAME_DIR "@rpath")
+ set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
+else(UNIX)
+ if(NOT DEFINED CMAKE_INSTALL_RPATH)
+ set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
+ endif(NOT DEFINED CMAKE_INSTALL_RPATH)
+endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
diff -r ee115e7ef02c -r 99ccfbc14617 external/bsd/llvm/dist/llvm/CODE_OWNERS.TXT
--- a/external/bsd/llvm/dist/llvm/CODE_OWNERS.TXT Tue Mar 04 19:53:10 2014 +0000
+++ b/external/bsd/llvm/dist/llvm/CODE_OWNERS.TXT Tue Mar 04 20:32:45 2014 +0000
@@ -58,7 +58,8 @@
E: grosbach%apple.com@localhost
D: MC layer
-N: Howard Hinnant
+N: Marshall Clow
+E: mclow.lists%gmail.com@localhost
D: libc++
N: Justin Holewinski
diff -r ee115e7ef02c -r 99ccfbc14617 external/bsd/llvm/dist/llvm/Makefile.config.in
--- a/external/bsd/llvm/dist/llvm/Makefile.config.in Tue Mar 04 19:53:10 2014 +0000
+++ b/external/bsd/llvm/dist/llvm/Makefile.config.in Tue Mar 04 20:32:45 2014 +0000
@@ -345,9 +345,6 @@
# Enable JIT for this platform
TARGET_HAS_JIT = @TARGET_HAS_JIT@
-# Environment variable to set to change the runtime shared library search path.
-SHLIBPATH_VAR = @SHLIBPATH_VAR@
-
# Shared library extension for host platform.
SHLIBEXT = @SHLIBEXT@
diff -r ee115e7ef02c -r 99ccfbc14617 external/bsd/llvm/dist/llvm/Makefile.rules
--- a/external/bsd/llvm/dist/llvm/Makefile.rules Tue Mar 04 19:53:10 2014 +0000
+++ b/external/bsd/llvm/dist/llvm/Makefile.rules Tue Mar 04 20:32:45 2014 +0000
@@ -589,6 +589,8 @@
ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
ifneq ($(HOST_OS),Darwin)
LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
+else
+ LD.Flags += -Wl,-install_name -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
endif
endif
endif
diff -r ee115e7ef02c -r 99ccfbc14617 external/bsd/llvm/dist/llvm/configure
--- a/external/bsd/llvm/dist/llvm/configure Tue Mar 04 19:53:10 2014 +0000
+++ b/external/bsd/llvm/dist/llvm/configure Tue Mar 04 20:32:45 2014 +0000
@@ -723,9 +723,9 @@
BINUTILS_INCDIR
ENABLE_TERMINFO
INTERNAL_PREFIX
-NM
ifGNUmake
LN_S
+NM
CMP
CP
DATE
@@ -765,11 +765,6 @@
GAS
HAVE_LINK_VERSION_SCRIPT
EGREP
-INSTALL_LTDL_TRUE
-INSTALL_LTDL_FALSE
-CONVENIENCE_LTDL_TRUE
-CONVENIENCE_LTDL_FALSE
-LIBADD_DL
NO_VARIADIC_MACROS
NO_MISSING_FIELD_INITIALIZERS
COVERED_SWITCH_DEFAULT
@@ -790,7 +785,6 @@
HUGE_VAL_SANITY
MMAP_FILE
SHLIBEXT
-SHLIBPATH_VAR
LLVM_PREFIX
LLVM_BINDIR
LLVM_DATADIR
@@ -1408,7 +1402,7 @@
--enable-compiler-version-checks
Check the version of the host compiler (default is
YES)
- --enable-cxx11 Use c++11 if available (default is NO)
+ --enable-cxx11 Use c++11 if available (default is YES)
--enable-split-dwarf Use split-dwarf if available (default is NO)
--enable-clang-arcmt Enable building of clang ARCMT (default is YES)
--enable-clang-static-analyzer
@@ -1461,7 +1455,6 @@
YES)
--enable-libedit Use libedit if available (default is YES)
--enable-libffi Check for the presence of libffi (default is NO)
- --enable-ltdl-install install libltdl
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -4823,7 +4816,7 @@
;;
no) ENABLE_CXX11=0
;;
- default) ENABLE_CXX11=0
+ default) ENABLE_CXX11=1
;;
*) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-cxx11. Use \"yes\" or \"no\"" >&5
echo "$as_me: error: Invalid setting for --enable-cxx11. Use \"yes\" or \"no\"" >&2;}
@@ -5754,61 +5747,6 @@
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
- # nm: unknown option "B" ignored
- # Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
- break
- ;;
- *)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
- ;;
- esac
- ;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
- done
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-NM="$lt_cv_path_NM"
-
-
-
{ echo "$as_me:$LINENO: checking for GNU make" >&5
echo $ECHO_N "checking for GNU make... $ECHO_C" >&6; }
if test "${llvm_cv_gnu_make_command+set}" = set; then
@@ -5846,6 +5784,47 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
+# Extract the first word of "nm", so it can be a program name with args.
+set dummy nm; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $NM in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_NM="$NM" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm"
+ ;;
+esac
+fi
+NM=$ac_cv_path_NM
+if test -n "$NM"; then
+ { echo "$as_me:$LINENO: result: $NM" >&5
+echo "${ECHO_T}$NM" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
# Extract the first word of "cmp", so it can be a program name with args.
set dummy cmp; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -7920,131 +7899,6 @@
-
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
Home |
Main Index |
Thread Index |
Old Index