From 510590ac1d3551d3a9657fc11216f796879e2cea 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 3a57510fbbf68f3cfd970c4b849445bf14438f07.
---
 hipamd/bin/hipcc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index 4c6a5ded07..b649bb6e7f 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/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 9002c7d09d2deecf0ad0caf4dd19274750cd6245 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 2a956540ee299a169114a293b7d2d950b5d9e9e6.
---
 hipamd/bin/hipcc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index b649bb6e7f..d6eea8457b 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/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 b40d9c7849cee4f21d9d7249629e216bbc384300 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 8062305f0b86dee730848b8bf10c14bfb7863157.
---
 hipamd/bin/hipcc | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index d6eea8457b..d227eea267 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/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";