[llvm-branch-commits] [compiler-rt-branch] r277424 - Merging r277300:

[Dimitry Andric via llvm-branch-commits]

Author: dim
Date: Tue Aug  2 01:44:37 2016
New Revision: 277424

URL: http://llvm.org/viewvc/llvm-project?rev=277424&view=rev
Log:
Merging r277300:

------------------------------------------------------------------------
r277300 | dim | 2016-07-31 22:16:59 +0200 (Sun, 31 Jul 2016) | 5 lines

Fix ASan alloca_constant_size.cc test on FreeBSD.

On FreeBSD <alloca.h> does not exist: alloca(3) is defined in <stdlib.h>
instead.

------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_39/   (props changed)
    compiler-rt/branches/release_39/test/asan/TestCases/alloca_constant_size.cc

Propchange: compiler-rt/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  2 01:44:37 2016
@@ -1 +1 @@
-/compiler-rt/trunk:275946,275948,277297
+/compiler-rt/trunk:275946,275948,277297,277300

Modified: compiler-rt/branches/release_39/test/asan/TestCases/alloca_constant_size.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_39/test/asan/TestCases/alloca_constant_size.cc?rev=277424&r1=277423&r2=277424&view=diff
==============================================================================
--- compiler-rt/branches/release_39/test/asan/TestCases/alloca_constant_size.cc (original)
+++ compiler-rt/branches/release_39/test/asan/TestCases/alloca_constant_size.cc Tue Aug  2 01:44:37 2016
@@ -10,6 +10,8 @@
 // MSVC provides _alloca instead of alloca.
 #if defined(_MSC_VER) && !defined(alloca)
 # define alloca _alloca
+#elif defined(__FreeBSD__)
+#include <stdlib.h>
 #else
 #include <alloca.h>
 #endif