Skip to content

Commit

Permalink
Merge branch 'upstream'
Browse files Browse the repository at this point in the history 
Conflicts:
	CMakeLists.txt
	bindings/ocaml/backends/META.llvm_backend.in
	configure
	include/llvm/Object/RelocVisitor.h
	test/CodeGen/AArch64/arm64-aapcs-be.ll
	test/CodeGen/AArch64/trunc-v1i64.ll
	test/CodeGen/X86/avx512-intrinsics.ll
	tools/LLVMBuild.txt
	tools/Makefile
	tools/clang/lib/Driver/ToolChains.h
	tools/clang/lib/Driver/Tools.cpp
	tools/clang/lib/Driver/Tools.h
	tools/clang/test/Sema/attr-bounded.c
	tools/lldb/source/CMakeLists.txt
	tools/lldb/source/lldb.cpp
  • Loading branch information
@jbush001
jbush001 committed Dec 13, 2014
2 parents 261a2ee + 1bf7639 commit 2b2e242
Show file tree
Hide file tree
Showing 5,872 changed files with 282,150 additions and 130,344 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
42 changes: 42 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ else()
endif()
endif()

if(CMAKE_VERSION VERSION_LESS 3.1.20141117)
set(cmake_3_2_USES_TERMINAL)
else()
set(cmake_3_2_USES_TERMINAL USES_TERMINAL)
endif()

project(LLVM)

# Set install path
Expand All @@ -32,6 +38,20 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++" )
endif()

# The following only works with the Ninja generator in CMake >= 3.0.
set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING
"Define the maximum number of concurrent compilation jobs.")
if(LLVM_PARALLEL_COMPILE_JOBS)
set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${LLVM_PARALLEL_COMPILE_JOBS})
set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
endif()

set(LLVM_PARALLEL_LINK_JOBS "" CACHE STRING
"Define the maximum number of concurrent link jobs.")
if(LLVM_PARALLEL_LINK_JOBS)
set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${LLVM_PARALLEL_LINK_JOBS})
set(CMAKE_JOB_POOL_LINK link_job_pool)
endif()

# Add path for custom modules
set(CMAKE_MODULE_PATH
Expand Down Expand Up @@ -318,6 +338,12 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF)
option (LLVM_BUILD_EXTERNAL_COMPILER_RT
"Build compiler-rt as an external project." OFF)

option(LLVM_BUILD_LLVM_DYLIB "Build libllvm dynamic library" OFF)
option(LLVM_DISABLE_LLVM_DYLIB_ATEXIT "Disable llvm-shlib's atexit destructors." ON)
if(LLVM_DISABLE_LLVM_DYLIB_ATEXIT)
set(DISABLE_LLVM_DYLIB_ATEXIT 1)
endif()

# All options referred to from HandleLLVMOptions have to be specified
# BEFORE this include, otherwise options will not be correctly set on
# first cmake run
Expand Down Expand Up @@ -482,6 +508,16 @@ else(UNIX)
endif(NOT DEFINED CMAKE_INSTALL_RPATH)
endif()

# Work around a broken bfd ld behavior. When linking a binary with a
# foo.so library, it will try to find any library that foo.so uses and
# check its symbols. This is wasteful (the check was done when foo.so
# was created) and can fail since it is not the dynamic linker and
# doesn't know how to handle search paths correctly.
if (UNIX AND NOT APPLE)
set(CMAKE_EXE_LINKER_FLAGS
"${CMAKE_EXE_LINKER_FLAGS} -Wl,-allow-shlib-undefined")
endif()

set(CMAKE_INCLUDE_CURRENT_DIR ON)

include_directories( ${LLVM_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR})
Expand Down Expand Up @@ -543,6 +579,12 @@ if(LLVM_INCLUDE_TESTS)
add_subdirectory(utils/unittest)
endif()

foreach( binding ${LLVM_BINDINGS_LIST} )
if( EXISTS "${LLVM_MAIN_SRC_DIR}/bindings/${binding}/CMakeLists.txt" )
add_subdirectory(bindings/${binding})
endif()
endforeach()

add_subdirectory(projects)

if(WITH_POLLY)
Expand Down
32 changes: 22 additions & 10 deletions CODE_OWNERS.TXT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ N: Rafael Avila de Espindola
E: rafael.espindola@gmail.com
D: Gold plugin (tools/gold/*)

N: Justin Bogner
E: mail@justinbogner.com
D: InstrProfiling and related parts of ProfileData

N: Chandler Carruth
E: chandlerc@gmail.com
E: chandlerc@google.com
Expand All @@ -29,10 +33,6 @@ N: Evan Cheng
E: evan.cheng@apple.com
D: ARM target, parts of code generator not covered by someone else

N: Renato Golin
E: renato.golin@linaro.org
D: ARM Linux support

N: Eric Christopher
E: echristo@gmail.com
D: Debug Information, autotools/configure/make build, inline assembly
Expand All @@ -41,18 +41,30 @@ N: Greg Clayton
E: gclayton@apple.com
D: LLDB

N: Marshall Clow
E: mclow.lists@gmail.com
D: libc++

N: Peter Collingbourne
E: peter@pcc.me.uk
D: libclc
D: llgo

N: Anshuman Dasgupta
E: adasgupt@codeaurora.org
D: Hexagon Backend

N: Duncan P. N. Exon Smith
E: dexonsmith@apple.com
D: Branch weights and BlockFrequencyInfo

N: Hal Finkel
E: hfinkel@anl.gov
D: BBVectorize, the loop reroller, alias analysis and the PowerPC target

N: Renato Golin
E: renato.golin@linaro.org
D: ARM Linux support

N: Venkatraman Govindaraju
E: venkatra@cs.wisc.edu
D: Sparc Backend (lib/Target/Sparc/*)
Expand All @@ -65,10 +77,6 @@ N: James Grosbach
E: grosbach@apple.com
D: MC layer

N: Marshall Clow
E: mclow.lists@gmail.com
D: libc++

N: Justin Holewinski
E: jholewinski@nvidia.com
D: NVPTX Target (lib/Target/NVPTX/*)
Expand Down Expand Up @@ -102,6 +110,10 @@ N: Tim Northover
E: t.p.northover@gmail.com
D: AArch64 backend

N: Diego Novillo
E: dnovillo@google.com
D: SampleProfile and related parts of ProfileData

N: Jakob Olesen
E: stoklund@2pi.dk
D: Register allocators and TableGen
Expand Down Expand Up @@ -141,7 +153,7 @@ D: Windows parts of Support, Object, ar, nm, objdump, ranlib, size
N: Tom Stellard
E: thomas.stellard@amd.com
E: mesa-dev@lists.freedesktop.org
D: Release manager for the 3.5 branch, R600 Backend
D: Release manager for the 3.5 branch, R600 Backend, libclc

N: Evgeniy Stepanov
E: eugenis@google.com
Expand Down
12 changes: 7 additions & 5 deletions Makefile.config.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,8 @@ DOT := @DOT@
DOXYGEN := @DOXYGEN@
GROFF := @GROFF@
GZIPBIN := @GZIPBIN@
OCAMLC := @OCAMLC@
OCAMLOPT := @OCAMLOPT@
OCAMLDEP := @OCAMLDEP@
OCAMLDOC := @OCAMLDOC@
GO := @GO@
OCAMLFIND := @OCAMLFIND@
GAS := @GAS@
POD2HTML := @POD2HTML@
POD2MAN := @POD2MAN@
Expand All @@ -217,6 +215,9 @@ HAVE_DLOPEN := @HAVE_DLOPEN@
HAVE_PTHREAD := @HAVE_PTHREAD@
HAVE_TERMINFO := @HAVE_TERMINFO@

HAVE_OCAMLOPT := @HAVE_OCAMLOPT@
HAVE_OCAML_OUNIT := @HAVE_OCAML_OUNIT@

LIBS := @LIBS@

# Targets that are possible to build
Expand Down Expand Up @@ -370,7 +371,6 @@ HUGE_VAL_SANITY = @HUGE_VAL_SANITY@

# Bindings that we should build
BINDINGS_TO_BUILD := @BINDINGS_TO_BUILD@
ALL_BINDINGS := @ALL_BINDINGS@
OCAML_LIBDIR := @OCAML_LIBDIR@

# When compiling under Mingw/Cygwin, executables such as tblgen
Expand All @@ -396,6 +396,8 @@ COVERED_SWITCH_DEFAULT = @COVERED_SWITCH_DEFAULT@
NO_UNINITIALIZED = @NO_UNINITIALIZED@
# -Wno-maybe-uninitialized
NO_MAYBE_UNINITIALIZED = @NO_MAYBE_UNINITIALIZED@
# -Wno-comment
NO_COMMENT = @NO_COMMENT@

# Was polly found in tools/polly?
LLVM_HAS_POLLY = @LLVM_HAS_POLLY@
Expand Down
2 changes: 1 addition & 1 deletion Makefile.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ endif
CompileCommonOpts += -Wall -W -Wno-unused-parameter -Wwrite-strings \
$(EXTRA_OPTIONS) $(COVERED_SWITCH_DEFAULT) \
$(NO_UNINITIALIZED) $(NO_MAYBE_UNINITIALIZED) \
$(NO_MISSING_FIELD_INITIALIZERS)
$(NO_MISSING_FIELD_INITIALIZERS) $(NO_COMMENT)
# Enable cast-qual for C++; the workaround is to use const_cast.
CXX.Flags += -Wcast-qual

Expand Down
1 change: 1 addition & 0 deletions README.llvm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ documentation setup.

If you're writing a package for LLVM, see docs/Packaging.rst for our
suggestions.

4 changes: 2 additions & 2 deletions autoconf/config.sub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ case $basic_machine in
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| aarch64 \
| aarch64 | aarch64_be \
| be32 | be64 \
| bfin \
| c4x | clipper \
Expand Down Expand Up @@ -360,7 +360,7 @@ case $basic_machine in
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| aarch64-* \
| aarch64-* | aarch64_be-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
Expand Down
Loading

0 comments on commit 2b2e242

Please sign in to comment.