From d3a40b7b2ef7532dff9131970c3c05641c22f79b Mon Sep 17 00:00:00 2001
From: Rahul Garg <garg.rahul@gmail.com>
Date: Thu, 17 Oct 2019 09:11:32 -0700
Subject: [PATCH] Revert "hipcc defaults to code object v3 (#1298)"

This reverts commit 7dbc574a4b9336afefe019aa976a7c4edad698bc.


[ROCm/hip commit: 5f37f3174a3b17875405d6eefd6ad00b77adf91a]
---
 projects/hip/bin/hipcc | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/projects/hip/bin/hipcc b/projects/hip/bin/hipcc
index 0f97bf0e21..3686d51abe 100755
--- a/projects/hip/bin/hipcc
+++ b/projects/hip/bin/hipcc
@@ -352,7 +352,6 @@ my $runCmd = 1;
 my $buildDeps = 0;
 my $linkType = 1;
 my $setLinkType = 0;
-my $coFormatv3 = 1;
 
 my @options = ();
 my @inputs  = ();
@@ -472,22 +471,6 @@ foreach $arg (@ARGV)
         $swallowArg = 1;
     }
 
-    # code object format parsing
-    if ($trimarg eq '-mcode-object-v3') {
-        $coFormatv3 = 1;
-        # hip-clang already recognizes -mcode-object-v3, so we just pass it on
-        if ($HIP_PLATFORM eq 'hcc') {
-            $swallowArg = 1;
-        }
-    }
-    if ($trimarg eq '-mno-code-object-v3') {
-        $coFormatv3 = 0;
-        # hip-clang already recognizes -mno-code-object-v3, so we just pass it on
-        if ($HIP_PLATFORM eq 'hcc') {
-            $swallowArg = 1;
-        }
-    }
-
     if (($arg =~ /--genco/) and $HIP_PLATFORM eq 'clang' ) {
         $arg = "--cuda-device-only";
     }
@@ -870,12 +853,6 @@ if($HIP_PLATFORM eq "hcc" or $HIP_PLATFORM eq "clang"){
     }
 }
 
-# hcc defaults to v2, so we need to convert to the appropriate flag
-# hip-clang defaults to v3, so we don't need to do anything
-if ($coFormatv3 and $HIP_PLATFORM eq 'hcc') {
-    $HIPLDFLAGS .= " -Wl,-hcc-cov3 ";
-}
-
 if ($hasC and $HIP_PLATFORM eq 'nvcc') {
     $HIPCXXFLAGS .= " -x cu";
 }