[llvm-branch-commits] [compiler-rt-branch] r323850 - Merging r322588:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 31 00:51:14 2018
New Revision: 323850

URL: http://llvm.org/viewvc/llvm-project?rev=323850&view=rev
Log:
Merging r322588:
------------------------------------------------------------------------
r322588 | eugenis | 2018-01-16 20:21:45 +0100 (Tue, 16 Jan 2018) | 9 lines

[hwasan] Build runtime library with -fPIC, not -fPIE.

Summary: -fPIE can not be used when building a shared library.

Reviewers: alekseyshl, peter.smith

Subscribers: kubamracek, llvm-commits, mgorny

Differential Revision: https://reviews.llvm.org/D42121
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_60/   (props changed)
    compiler-rt/branches/release_60/lib/hwasan/CMakeLists.txt

Propchange: compiler-rt/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 31 00:51:14 2018
@@ -1 +1 @@
-/compiler-rt/trunk:323013,323039,323315
+/compiler-rt/trunk:322588,323013,323039,323315

Modified: compiler-rt/branches/release_60/lib/hwasan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_60/lib/hwasan/CMakeLists.txt?rev=323850&r1=323849&r2=323850&view=diff
==============================================================================
--- compiler-rt/branches/release_60/lib/hwasan/CMakeLists.txt (original)
+++ compiler-rt/branches/release_60/lib/hwasan/CMakeLists.txt Wed Jan 31 00:51:14 2018
@@ -17,7 +17,7 @@ set(HWASAN_RTL_CXX_SOURCES
 
 set(HWASAN_RTL_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 append_rtti_flag(OFF HWASAN_RTL_CFLAGS)
-append_list_if(COMPILER_RT_HAS_FPIE_FLAG -fPIE HWASAN_RTL_CFLAGS)
+append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC HWASAN_RTL_CFLAGS)
 # Prevent clang from generating libc calls.
 append_list_if(COMPILER_RT_HAS_FFREESTANDING_FLAG -ffreestanding HWASAN_RTL_CFLAGS)