Fix for rsp files on Windows. File names starting with @ can not be e…

…scaped

bin/hipcc

@@ -33,9 +33,10 @@ $USE_PERL_SCRIPT //= 1;  # use defined-or assignment operator.  Use env var, but
 
 my $isWindows =  ($^O eq 'MSWin32' or $^O eq 'msys');
 # escapes args with quotes SWDEV-341955
+# do not escape @ for rsp files on windows
 foreach $arg (@ARGV) {
   if ($isWindows) {
-    $arg =~ s/[^-a-zA-Z0-9_=+,.:\/\\ ]/\\$&/g;
+    $arg =~ s/[^-a-zA-Z0-9_=+,.:@\/\\ ]/\\$&/g;
   }
 }
 

bin/hipcc.pl

@@ -371,6 +371,15 @@ BEGIN
         $hsacoVersion = $arg;
         $swallowArg = 1;
     }
+	if($arg =~ /\.rsp$/) {
+        $pre_rsp = " ";
+        if($isWindows) {
+            $pre_rsp = " --rsp-quoting=windows ";
+        }
+        $HIPLDFLAGS .= $pre_rsp.$arg;
+        $HIPCXXFLAGS .= $pre_rsp.$arg;
+		$swallowArg = 1;
+	}
 
     # nvcc does not handle standard compiler options properly
     # This can prevent hipcc being used as standard CXX/C Compiler
@@ -467,10 +476,10 @@ BEGIN
     # Do the quoting here because sometimes the $arg is changed in the loop
     # Important to have all of '-Xlinker' in the set of unquoted characters.
     if (not $isWindows and $escapeArg) {
-        $arg =~ s/[^-a-zA-Z0-9_=+,.\/]/\\$&/g;
+        $arg =~ s/[^-a-zA-Z0-9_=+,.@\/]/\\$&/g;
     }
     if ($isWindows and $escapeArg) {
-        $arg =~ s/[^-a-zA-Z0-9_=+,.:\/\\]/\\$&/g;
+        $arg =~ s/[^-a-zA-Z0-9_=+,.:@\/\\]/\\$&/g;
     }
     $toolArgs .= " $arg" unless $swallowArg;
     $prevArg = $arg;