aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Stotzer2016-09-19 14:29:06 -0500
committerEric Stotzer2016-09-19 14:29:06 -0500
commit3c07b63df249d985dd4de4b676f2fd6a78a70548 (patch)
tree2f3402698a3d4df7bc9d2119432743dd8bff6ae3
parentaf81476c403758bba065b056c63bb7dd4dd92704 (diff)
parent52388d065d1d469533e30f5fd16c16a0a74fd012 (diff)
downloadti-openmpacc-3c07b63df249d985dd4de4b676f2fd6a78a70548.tar.gz
ti-openmpacc-3c07b63df249d985dd4de4b676f2fd6a78a70548.tar.xz
ti-openmpacc-3c07b63df249d985dd4de4b676f2fd6a78a70548.zip
Merge branch 'hotfix/v01.04.00.01'v01.04.00.01
-rw-r--r--host/clacc/clacc.cc7
-rw-r--r--host/clacc/clacc.h2
-rw-r--r--host/version.txt2
3 files changed, 9 insertions, 2 deletions
diff --git a/host/clacc/clacc.cc b/host/clacc/clacc.cc
index a3765c0..4152000 100644
--- a/host/clacc/clacc.cc
+++ b/host/clacc/clacc.cc
@@ -240,6 +240,13 @@ void InitCompilerOpts()
240 * libs such as cmem, hyplink, bfd, sqlite3 etc*/ 240 * libs such as cmem, hyplink, bfd, sqlite3 etc*/
241 std::string ti_rootdir_rpath_prefix = "-Wl,-rpath-link,"; 241 std::string ti_rootdir_rpath_prefix = "-Wl,-rpath-link,";
242 242
243 /* Generate the name of a temp file to hold the host compiler (gcc)
244 * predefined symbols */
245 char name_out[] = "/tmp/gcc_predefXXXXXX";
246 int fd = mkstemp(name_out);
247 close(fd);
248 gcc_predef_file_name = std::string(name_out);
249
243 clocl_opts = {"-t"}; 250 clocl_opts = {"-t"};
244 251
245 hl = {"--sysroot=" + ti_rootdir_path, 252 hl = {"--sysroot=" + ti_rootdir_path,
diff --git a/host/clacc/clacc.h b/host/clacc/clacc.h
index 063a972..a23a5ad 100644
--- a/host/clacc/clacc.h
+++ b/host/clacc/clacc.h
@@ -68,7 +68,7 @@ std::string host_link_cc = "arm-linux-gnueabihf-g++";
68std::string target_cc = "cl6x"; 68std::string target_cc = "cl6x";
69std::string cl_link_cc = "clocl"; 69std::string cl_link_cc = "clocl";
70std::string exe_name = "fat_binary"; 70std::string exe_name = "fat_binary";
71std::string gcc_predef_file_name = "__s2s_predef.gcc_h"; 71std::string gcc_predef_file_name;
72std::string chained_cl_file_name = "__TI_CLACC_KERNEL.cl"; 72std::string chained_cl_file_name = "__TI_CLACC_KERNEL.cl";
73std::string ti_ocl_cgt_env_var = "TI_OCL_CGT_INSTALL"; 73std::string ti_ocl_cgt_env_var = "TI_OCL_CGT_INSTALL";
74std::string ti_rootdir_env_var = "TARGET_ROOTDIR"; 74std::string ti_rootdir_env_var = "TARGET_ROOTDIR";
diff --git a/host/version.txt b/host/version.txt
index e97685d..ccca49b 100644
--- a/host/version.txt
+++ b/host/version.txt
@@ -1 +1 @@
01.04.00.00 01.04.00.01