[llvm-branch-commits] [openmp] r323037 - Merging r322869:

[Dimitry Andric via llvm-branch-commits]

Author: dim
Date: Sat Jan 20 04:17:51 2018
New Revision: 323037

URL: http://llvm.org/viewvc/llvm-project?rev=323037&view=rev
Log:
Merging r322869:
------------------------------------------------------------------------
r322869 | dim | 2018-01-18 19:24:22 +0100 (Thu, 18 Jan 2018) | 3 lines

Sprinkle a few <cstdlib> includes, for libomptarget sources using
malloc, free, alloca and getenv.  NFCI.

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

Modified:
    openmp/branches/release_60/   (props changed)
    openmp/branches/release_60/libomptarget/src/api.cpp
    openmp/branches/release_60/libomptarget/src/interface.cpp
    openmp/branches/release_60/libomptarget/src/rtl.cpp

Propchange: openmp/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 20 04:17:51 2018
@@ -1 +1 @@
-/openmp/trunk:321964,322068,322160,322830
+/openmp/trunk:321964,322068,322160,322830,322869

Modified: openmp/branches/release_60/libomptarget/src/api.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_60/libomptarget/src/api.cpp?rev=323037&r1=323036&r2=323037&view=diff
==============================================================================
--- openmp/branches/release_60/libomptarget/src/api.cpp (original)
+++ openmp/branches/release_60/libomptarget/src/api.cpp Sat Jan 20 04:17:51 2018
@@ -19,6 +19,7 @@
 
 #include <climits>
 #include <cstring>
+#include <cstdlib>
 
 EXTERN int omp_get_num_devices(void) {
   RTLsMtx.lock();

Modified: openmp/branches/release_60/libomptarget/src/interface.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_60/libomptarget/src/interface.cpp?rev=323037&r1=323036&r2=323037&view=diff
==============================================================================
--- openmp/branches/release_60/libomptarget/src/interface.cpp (original)
+++ openmp/branches/release_60/libomptarget/src/interface.cpp Sat Jan 20 04:17:51 2018
@@ -19,6 +19,7 @@
 #include "rtl.h"
 
 #include <cassert>
+#include <cstdlib>
 
 ////////////////////////////////////////////////////////////////////////////////
 /// adds a target shared library to the target execution image

Modified: openmp/branches/release_60/libomptarget/src/rtl.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_60/libomptarget/src/rtl.cpp?rev=323037&r1=323036&r2=323037&view=diff
==============================================================================
--- openmp/branches/release_60/libomptarget/src/rtl.cpp (original)
+++ openmp/branches/release_60/libomptarget/src/rtl.cpp Sat Jan 20 04:17:51 2018
@@ -16,6 +16,7 @@
 #include "rtl.h"
 
 #include <cassert>
+#include <cstdlib>
 #include <cstring>
 #include <dlfcn.h>
 #include <mutex>