diff --git a/projects/clr/hipamd/bin/hipcc b/projects/clr/hipamd/bin/hipcc
index d422174ad8..d173d761dd 100755
--- a/projects/clr/hipamd/bin/hipcc
+++ b/projects/clr/hipamd/bin/hipcc
@@ -300,6 +300,7 @@ my $runCmd = 1;
 my $buildDeps = 0;
 my $linkType = 1;
 my $setLinkType = 0;
+my $useCodeObjectV3 = 0;
 
 my @options = ();
 my @inputs  = ();
@@ -403,6 +404,10 @@ 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";
     }
@@ -736,6 +741,12 @@ 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";