From bdae07eceb51a038115f45a3aee2dd27323dd7b4 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Thu, 8 Apr 2021 11:02:31 +0800
Subject: llvm-project-source: backport OpenCL recommended patches

Updating SPIRV-LLVM-Translator srcrev to latest commits for
* llvm_releae_100
* llvm_release_110

Backport opencl-clang recommended llvm/clang patches.

llvm-10:
https://github.com/intel/opencl-clang/tree/ocl-open-100/patches

llvm-11:
https://github.com/intel/opencl-clang/tree/ocl-open-110/patches

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../files/llvm11-Remove-repo-name-in-LLVM-IR.patch | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm11-Remove-repo-name-in-LLVM-IR.patch

(limited to 'dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm11-Remove-repo-name-in-LLVM-IR.patch')

diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm11-Remove-repo-name-in-LLVM-IR.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm11-Remove-repo-name-in-LLVM-IR.patch
new file mode 100644
index 00000000..09089432
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm11-Remove-repo-name-in-LLVM-IR.patch
@@ -0,0 +1,50 @@
+From ff0a6da84b94c16c4519c649f1f7bed3cdf89bbb Mon Sep 17 00:00:00 2001
+From: Feng Zou <feng.zou@intel.com>
+Date: Tue, 20 Oct 2020 11:29:04 +0800
+Subject: [PATCH] Remove repo name in LLVM IR
+
+Upstream-Status: Backport [Taken from opencl-clang patches, https://github.com/intel/opencl-clang/blob/ocl-open-110/patches/llvm/0002-Remove-repo-name-in-LLVM-IR.patch]
+Signed-off-by: Feng Zou <feng.zou@intel.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+
+---
+ llvm/cmake/modules/VersionFromVCS.cmake | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/llvm/cmake/modules/VersionFromVCS.cmake b/llvm/cmake/modules/VersionFromVCS.cmake
+index 18edbeabe3e..2d965263478 100644
+--- a/llvm/cmake/modules/VersionFromVCS.cmake
++++ b/llvm/cmake/modules/VersionFromVCS.cmake
+@@ -33,17 +33,18 @@ function(get_source_info path revision repository)
+       else()
+         set(remote "origin")
+       endif()
+-      execute_process(COMMAND ${GIT_EXECUTABLE} remote get-url ${remote}
+-        WORKING_DIRECTORY ${path}
+-        RESULT_VARIABLE git_result
+-        OUTPUT_VARIABLE git_output
+-        ERROR_QUIET)
+-      if(git_result EQUAL 0)
+-        string(STRIP "${git_output}" git_output)
+-        set(${repository} ${git_output} PARENT_SCOPE)
+-      else()
+-        set(${repository} ${path} PARENT_SCOPE)
+-      endif()
++      # Do not show repo name in IR
++      # execute_process(COMMAND ${GIT_EXECUTABLE} remote get-url ${remote}
++      #   WORKING_DIRECTORY ${path}
++      #   RESULT_VARIABLE git_result
++      #   OUTPUT_VARIABLE git_output
++      #   ERROR_QUIET)
++      # if(git_result EQUAL 0)
++      #   string(STRIP "${git_output}" git_output)
++      #   set(${repository} ${git_output} PARENT_SCOPE)
++      # else()
++      #   set(${repository} ${path} PARENT_SCOPE)
++      # endif()
+     endif()
+   else()
+     message(WARNING "Git not found. Version cannot be determined.")
+-- 
+2.18.1
+
-- 
cgit v1.2.3-54-g00ecf