* gnu/packages/rocm.scm (llvm-for-rocm): New variable. * gnu/packages/patches/llvm-roc-3.0.0-add_libraries.patch, gnu/packages/patches/llvm-roc-4.0.0-remove-isystem-usr-include.patch, gnu/packages/patches/llvm-roc-4.2.0-add_Object.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them.
		
			
				
	
	
		
			29 lines
		
	
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			29 lines
		
	
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
Author: Wilfried (justxi) Holzke
 | 
						|
 | 
						|
Adopted from https://github.com/justxi/rocm/blob/master/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
 | 
						|
 | 
						|
Index: llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
 | 
						|
===================================================================
 | 
						|
--- llvm-project-rocm-4.0.0.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
 | 
						|
+++ llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
 | 
						|
@@ -326,11 +326,6 @@ void RocmInstallationDetector::AddHIPInc
 | 
						|
     //
 | 
						|
     // ROCm 3.5 does not fully support the wrapper headers. Therefore it needs
 | 
						|
     // a workaround.
 | 
						|
-    SmallString<128> P(D.ResourceDir);
 | 
						|
-    if (UsesRuntimeWrapper)
 | 
						|
-      llvm::sys::path::append(P, "include", "cuda_wrappers");
 | 
						|
-    CC1Args.push_back("-internal-isystem");
 | 
						|
-    CC1Args.push_back(DriverArgs.MakeArgString(P));
 | 
						|
   }
 | 
						|
 
 | 
						|
   if (DriverArgs.hasArg(options::OPT_nogpuinc))
 | 
						|
@@ -341,8 +336,6 @@ void RocmInstallationDetector::AddHIPInc
 | 
						|
     return;
 | 
						|
   }
 | 
						|
 
 | 
						|
-  CC1Args.push_back("-internal-isystem");
 | 
						|
-  CC1Args.push_back(DriverArgs.MakeArgString(getIncludePath()));
 | 
						|
   if (UsesRuntimeWrapper)
 | 
						|
     CC1Args.append({"-include", "__clang_hip_runtime_wrapper.h"});
 | 
						|
 }
 |