From b9efee6df87e5771d89aec869a9d062bdd7a50b1 Mon Sep 17 00:00:00 2001 From: Vlad Sytchenko Date: Thu, 11 Jun 2020 12:07:43 -0400 Subject: [PATCH] Revert "Let hipcc not pass -mllvm option to HIP-Clang on Windows" This reverts commit 23a8dfc8f3128af27dd16f91e0ddc8a6a4e0182f. Change-Id: If29906b9c63f03d6e51144f510d3a956d90935e8 [ROCm/clr commit: e82e9355f209d6a648b81560b0cae85d114941ea] --- projects/clr/hipamd/bin/hipcc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/clr/hipamd/bin/hipcc b/projects/clr/hipamd/bin/hipcc index 91d9a197da..f61dead191 100755 --- a/projects/clr/hipamd/bin/hipcc +++ b/projects/clr/hipamd/bin/hipcc @@ -816,9 +816,7 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { $HIPCFLAGS .= " -O3"; $HIPLDFLAGS .= " -O3"; } - # Do not pass -mllvm on Windows since there is a clang bug causing duplicate -mllvm options in clang -cc1 on Windows. - # ToDo : remove restriction for Windows after clang bug is fixed. - if (!$funcSupp and $optArg ne "-O0" and not $isWindows and $hasHIP) { + if (!$funcSupp and $optArg ne "-O0" and $hasHIP) { $HIPCXXFLAGS .= " -mllvm -amdgpu-early-inline-all=true -mllvm -amdgpu-function-calls=false"; if ($needLDFLAGS and not $needCXXFLAGS) { $HIPLDFLAGS .= " -mllvm -amdgpu-early-inline-all=true -mllvm -amdgpu-function-calls=false";