Support ELF Tool Chain and LLVM objdump (#2538)

* Remove redundant implementations of objdump function

* Add support for ELF Tool Chain and LLVM objdump

Only binutils supports --insn-width and LLVM uses --x86-asm-syntax=intel
rather than -M intel. The default remains binutils.

1 files changed, 2 insertions, 15 deletions

diff --git a/lib/compilers/wine-vc.js b/lib/compilers/wine-vc.js
index d440f5780..c2e03888b 100644
--- a/lib/compilers/wine-vc.js
+++ b/lib/compilers/wine-vc.js
@@ -62,21 +62,8 @@ export class WineVcCompiler extends BaseCompiler {
         return this.getOutputFilename(dirPath, outputFilebase) + '.exe';
     }
 
-    async objdump(outputFilename, result, maxSize, intelAsm) {
-        const dirPath = path.dirname(outputFilename);
-        outputFilename = this.getExecutableFilename(dirPath, 'output');
-
-        let args = ['-d', outputFilename];
-        if (intelAsm) args = args.concat(['-M', 'intel']);
-        const objResult = await this.exec(this.compiler.objdumper, args, {maxOutput: 0, customCwd: dirPath});
-        if (objResult.code !== 0) {
-            result.asm = '<No output: objdump returned ' + objResult.code + '>';
-        } else {
-            result.objdumpTime = objResult.execTime;
-            result.asm = objResult.stdout;
-        }
-
-        return result;
+    getObjdumpOutputFilename(defaultOutputFilename) {
+        return this.getExecutableFilename(path.dirname(defaultOutputFilename), 'output');
     }
 
     getSharedLibraryPathsAsArguments() {