diff options
| author | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 18:59:01 +0000 |
|---|---|---|
| committer | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 18:59:01 +0000 |
| commit | 8cc9fd31e64981d2c1aaf71d7b05ea928ef499f6 (patch) | |
| tree | a9d93e77c93db71722fed0ba09b1bd745e1fa702 /llvm/lib/BinaryFormat/Magic.cpp | |
| parent | eae44dfee97ef224da14ec77527f3a102d31d654 (diff) | |
| download | bcm5719-llvm-8cc9fd31e64981d2c1aaf71d7b05ea928ef499f6.tar.gz bcm5719-llvm-8cc9fd31e64981d2c1aaf71d7b05ea928ef499f6.zip | |
Revert "Replace trivial use of external rc.exe by writing our own .res file."
This patch still seems to break CrWinClangLLD, reverting this once more
until I can discover root problem.
This reverts commit 3dbbc8ce43be50ffde2b1c655c6d3a25796fe78b.
llvm-svn: 307188
Diffstat (limited to 'llvm/lib/BinaryFormat/Magic.cpp')
| -rw-r--r-- | llvm/lib/BinaryFormat/Magic.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/BinaryFormat/Magic.cpp b/llvm/lib/BinaryFormat/Magic.cpp index b19a07a9066..5d0a71fc780 100644 --- a/llvm/lib/BinaryFormat/Magic.cpp +++ b/llvm/lib/BinaryFormat/Magic.cpp @@ -51,8 +51,7 @@ file_magic llvm::identify_magic(StringRef Magic) { return file_magic::coff_import_library; } // Windows resource file - if (Magic.size() >= sizeof(COFF::WinResMagic) && - memcmp(Magic.data(), COFF::WinResMagic, sizeof(COFF::WinResMagic)) == 0) + if (startswith(Magic, "\0\0\0\0\x20\0\0\0\xFF")) return file_magic::windows_resource; // 0x0000 = COFF unknown machine type if (Magic[1] == 0) |
