From f46d2a301024cadaab4d4fb77b6eab74121c645e Mon Sep 17 00:00:00 2001
From: Yaxun Sam Liu <yaxun.liu@amd.com>
Date: Thu, 28 Feb 2019 11:19:35 -0500
Subject: [PATCH 1/3] Revert "Consume the code obj args to prevent duplicates"

This reverts commit b19e4b5b63efeaaf70f0a602fc2a8a57136f3bd3.


[ROCm/hip commit: 737972d31c92bedb590376f639532134bcf56a92]
---
 projects/hip/bin/hipcc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/projects/hip/bin/hipcc b/projects/hip/bin/hipcc
index 4c6a5ded07..b649bb6e7f 100755
--- a/projects/hip/bin/hipcc
+++ b/projects/hip/bin/hipcc
@@ -424,14 +424,8 @@ foreach $arg (@ARGV)
         $swallowArg = 1;
     }
 
-    if (($trimarg eq '-mno-code-object-v3') and ($HIP_PLATFORM eq 'clang') ) {
-        $useCodeObjectV3 = 0;
-        $swallowArg = 1;
-    }
-
     if (($trimarg eq '-mcode-object-v3') and ($HIP_PLATFORM eq 'clang') ) {
         $useCodeObjectV3 = 1;
-        $swallowArg = 1;
     }
 
     if (($arg =~ /--genco/) and $HIP_PLATFORM eq 'clang' ) {

From e748fd2ae02071e89678b31266b9b7c955f3fb41 Mon Sep 17 00:00:00 2001
From: Yaxun Sam Liu <yaxun.liu@amd.com>
Date: Thu, 28 Feb 2019 11:20:04 -0500
Subject: [PATCH 2/3] Revert "Change code-object flag to only HIP-Clang"

This reverts commit 17a853c277c0c29a9bf41afad0f27e1b59ecdfd8.


[ROCm/hip commit: 1bd8d24278033a3ad8f1bf189c7ffca280c85598]
---
 projects/hip/bin/hipcc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/hip/bin/hipcc b/projects/hip/bin/hipcc
index b649bb6e7f..d6eea8457b 100755
--- a/projects/hip/bin/hipcc
+++ b/projects/hip/bin/hipcc
@@ -763,7 +763,7 @@ if ($buildDeps and $HIP_PLATFORM eq 'clang') {
 
 if ($useCodeObjectV3 and $HIP_PLATFORM eq 'clang') {
     $HIPCXXFLAGS .= " -mcode-object-v3";
-} elsif ($HIP_PLATFORM eq 'clang') {
+} else {
     $HIPCXXFLAGS .= " -mno-code-object-v3";
 }
 

From d9f59b18f82f1570d5ee4d650c7d95ccbab4d5bd Mon Sep 17 00:00:00 2001
From: Yaxun Sam Liu <yaxun.liu@amd.com>
Date: Thu, 28 Feb 2019 11:21:47 -0500
Subject: [PATCH 3/3] Revert "hipcc should consume -mcode-object-v3 flag"

This reverts commit 1a8b50e63c8aadd2293a931c7071d983881b854c.


[ROCm/hip commit: e8556388f9acfe8103576e8e120cac45315ef005]
---
 projects/hip/bin/hipcc | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/projects/hip/bin/hipcc b/projects/hip/bin/hipcc
index d6eea8457b..d227eea267 100755
--- a/projects/hip/bin/hipcc
+++ b/projects/hip/bin/hipcc
@@ -320,7 +320,6 @@ my $runCmd = 1;
 my $buildDeps = 0;
 my $linkType = 1;
 my $setLinkType = 0;
-my $useCodeObjectV3 = 0;
 
 my @options = ();
 my @inputs  = ();
@@ -424,10 +423,6 @@ foreach $arg (@ARGV)
         $swallowArg = 1;
     }
 
-    if (($trimarg eq '-mcode-object-v3') and ($HIP_PLATFORM eq 'clang') ) {
-        $useCodeObjectV3 = 1;
-    }
-
     if (($arg =~ /--genco/) and $HIP_PLATFORM eq 'clang' ) {
         $arg = "--cuda-device-only";
     }
@@ -761,12 +756,6 @@ if ($buildDeps and $HIP_PLATFORM eq 'clang') {
     $HIPCXXFLAGS .= " --cuda-host-only";
 }
 
-if ($useCodeObjectV3 and $HIP_PLATFORM eq 'clang') {
-    $HIPCXXFLAGS .= " -mcode-object-v3";
-} else {
-    $HIPCXXFLAGS .= " -mno-code-object-v3";
-}
-
 # Add --hip-link only if there are no source files.
 if (!$needCXXFLAGS and $HIP_PLATFORM eq 'clang') {
     $HIPLDFLAGS .= " --hip-link";