[llvm-branch-commits] [compiler-rt-branch] r270668 - Merging r267674:

[Mohit K. Bhakkad via llvm-branch-commits]

Author: mohit.bhakkad
Date: Wed May 25 00:49:40 2016
New Revision: 270668

URL: http://llvm.org/viewvc/llvm-project?rev=270668&view=rev
Log:
Merging r267674:
------------------------------------------------------------------------
r267674 | mohit.bhakkad | 2016-04-27 11:19:42 +0530 (Wed, 27 Apr 2016) | 7 lines

[Compiler-rt][CFI] Enabling CFI for MIPS64

Reviewers: eugenis

Subscribers: jaydeep, sagar, Sanitizers

Differential Revision: http://reviews.llvm.org/D19531
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/cmake/config-ix.cmake

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 00:49:40 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837,261980,261982,262209,262302-262303,262690,263001,263218
+/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837,261980,261982,262209,262302-262303,262690,263001,263218,267674

Modified: compiler-rt/branches/release_38/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/cmake/config-ix.cmake?rev=270668&r1=270667&r2=270668&view=diff
==============================================================================
--- compiler-rt/branches/release_38/cmake/config-ix.cmake (original)
+++ compiler-rt/branches/release_38/cmake/config-ix.cmake Wed May 25 00:49:40 2016
@@ -294,7 +294,7 @@ set(ALL_TSAN_SUPPORTED_ARCH ${X86_64} ${
 set(ALL_UBSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}
     ${MIPS32} ${MIPS64} ${PPC64})
 set(ALL_SAFESTACK_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM64} ${MIPS32} ${MIPS64})
-set(ALL_CFI_SUPPORTED_ARCH ${X86} ${X86_64})
+set(ALL_CFI_SUPPORTED_ARCH ${X86} ${X86_64} ${MIPS64})
 
 if(APPLE)
   include(CompilerRTDarwinUtils)