Merge pull request #2 from RadeonOpenCompute/clang_tot_upgrade

Merge to fb80207
ROCm · Jun 15, 2017 · 5e9b74d · 5e9b74d
2 parents 3c86177 + fb80207
commit 5e9b74d
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -498,12 +498,6 @@ add_subdirectory(amp-conformance)
 add_subdirectory(stl-test)
 add_subdirectory(cmake-tests)
 
-# create a "hcc" symlink in the include directory
-# that points to itself so we could support
-# include <hcc.hpp> and include<hcc/hcc.hpp>
-execute_process(COMMAND ln -sf ../include hcc
-                WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/include)
-
 # create documentation
 configure_file(
   ${PROJECT_SOURCE_DIR}/lib/doxygen_config.in

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,14 +25,13 @@ node ('rocmtest')
   // The client workspace is shared with the docker container
   stage('HCC Checkout')
   {
-    deleteDir( )
-    checkout scm
-
-    // list the commit hash of the submodules
-    sh 'git ls-tree HEAD | grep commit'
-
-    // clone the submodules
-    sh 'git submodule update --init'
+    checkout([
+      $class: 'GitSCM',
+      branches: scm.branches,
+      doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
+      extensions: scm.extensions + [[$class: 'CleanCheckout'], [$class: 'SubmoduleOption', disableSubmodules: false, parentCredentials: false, recursiveSubmodules: true, reference: '', trackingSubmodules: false]],
+      userRemoteConfigs: scm.userRemoteConfigs
+    ])
   }
 
   def hcc_build_image = null

diff --git a/clang b/clang
diff --git a/compiler b/compiler
diff --git a/compiler-rt b/compiler-rt
diff --git a/hcc_config/hcc_config.cpp b/hcc_config/hcc_config.cpp
@@ -114,6 +114,7 @@ void cxxflags(void) {
             std::cout << " -I" << p << "/include";
         } else {
             std::cout << " -I" << get_path(path_hcc_include);
+            std::cout << " -I" << CMAKE_ROCM_ROOT << "/include";
         }
     } else {
         assert(0 && "Unreacheable!");

diff --git a/hcc_config/hcc_config.hxx.in b/hcc_config/hcc_config.hxx.in
@@ -5,4 +5,6 @@
 
 #define CMAKE_INSTALL_LIB       "@CMAKE_INSTALL_LIBDIR@"
 
+#define CMAKE_ROCM_ROOT     "@ROCM_ROOT@"
+
 #define CMAKE_GTEST_INC_DIR "@PROJECT_SOURCE_DIR@/utils"
diff --git a/lib/hsa/mcwamp_hsa.cpp b/lib/hsa/mcwamp_hsa.cpp
@@ -30,8 +30,8 @@
 #include <hsa/amd_hsa_kernel_code.h>
 #include <hsa/hsa_ven_amd_loader.h>
 
-#include <hcc/kalmar_runtime.h>
-#include <hcc/kalmar_aligned_alloc.h>
+#include "kalmar_runtime.h"
+#include "kalmar_aligned_alloc.h"
 
 #include <hc_am.hpp>
 

diff --git a/lld b/lld
diff --git a/packaging/debian/postinst.in b/packaging/debian/postinst.in
@@ -25,10 +25,6 @@ SOFTLINKS=(
 
 do_softlinks() {
 
-  if [ ! -e $INSTALL_PATH/include/hcc ] ; then
-    ln -sf $INSTALL_PATH/include $INSTALL_PATH/include/hcc
-  fi
-
   if [ $PACKAGE_NAME == "hcc_hsail" ] && [ -L "$ROCM_PATH/hcc" ] && [ $(readlink -f $ROCM_PATH/hcc) == "$ROCM_PATH/hcc-lc" ] ; then
       return
   fi