summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2017-03-02 21:55:17 +0000
committerEric Fiselier <eric@efcs.ca>2017-03-02 21:55:17 +0000
commit38643b9d8a227aa5aefdce46081178d3176fe156 (patch)
tree702ffba5c126e9fdaef896d817db8d2dcbb62c38
parentc7051e706ff3014defb8df9a70fefd4b536f5830 (diff)
downloadbcm5719-llvm-38643b9d8a227aa5aefdce46081178d3176fe156.tar.gz
bcm5719-llvm-38643b9d8a227aa5aefdce46081178d3176fe156.zip
Work around GCC linking errors within libc++abi due to missing new/delete definitions
llvm-svn: 296823
-rw-r--r--libcxxabi/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
index 6f54b915c03..249494dcf83 100644
--- a/libcxxabi/CMakeLists.txt
+++ b/libcxxabi/CMakeLists.txt
@@ -141,9 +141,13 @@ option(LIBCXXABI_HAS_EXTERNAL_THREAD_API
option(LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY
"Build libc++abi with an externalized threading library.
This option may only be set to ON when LIBCXXABI_ENABLE_THREADS=ON" OFF)
+
+# FIXME: This option should default to off. Unfortunatly GCC 4.9 fails to link
+# programs to due undefined references to new/delete in libc++abi. Once this
+# has been fixed or worked around the default value should be changed.
option(LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS
"Build libc++abi with definitions for operator new/delete. Normally libc++
- provides these definitions" OFF)
+ provides these definitions" ON)
option(LIBCXXABI_BUILD_32_BITS "Build 32 bit libc++abi." ${LLVM_BUILD_32_BITS})
option(LIBCXXABI_INCLUDE_TESTS "Generate build targets for the libc++abi unit tests." ${LLVM_INCLUDE_TESTS})
set(LIBCXXABI_TARGET_TRIPLE "" CACHE STRING "Target triple for cross compiling.")
OpenPOWER on IntegriCloud