Merge branch 'master' into getsymboladdress

[ROCm/hip commit: 8610128c3e]
2018-11-20 12:03:22 +01:00
parent 2e8a94e90b 20fff19daa
commit c35dfb71d5
31 changed files with 1349 additions and 580 deletions
@@ -498,6 +498,10 @@ foreach $arg (@ARGV)
            $obj = "$tmpdir/$obj";
            my $fileType = `file $obj`;
            my $isObj = ($fileType =~ m/ELF/ or $fileType =~ m/COFF/);
+            if ($fileType =~ m/ELF/) {
+                my $sections = `readelf -e -W $obj`;
+                $isObj = !($sections =~ m/__CLANG_OFFLOAD_BUNDLE__/);
+            }
            $allIsObj = ($allIsObj and $isObj);
            if ($isObj) {
                $realObjs = ($realObjs . " " . $obj);