diff options
| author | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 23:45:50 +0000 |
|---|---|---|
| committer | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 23:45:50 +0000 |
| commit | 81979b038f540eed8766ddfc42dd15cdb8b6a72b (patch) | |
| tree | dfc931282824e3241b86595fff6b3ad269fa28f1 /llvm/unittests | |
| parent | 2126334e08bc0f0ec3b99147067d4d110be688d6 (diff) | |
| download | bcm5719-llvm-81979b038f540eed8766ddfc42dd15cdb8b6a72b.tar.gz bcm5719-llvm-81979b038f540eed8766ddfc42dd15cdb8b6a72b.zip | |
Revert "Revert "Revert "Replace trivial use of external rc.exe by writing our own .res file."""
This reverts commit 5fecbbbe5049665d86834cf69d8f75db4f392308.
The initial revert was done in order to prevent ongoing errors on
chromium bots such as CrWinClangLLD. However, this was done haphazardly
and I didn't realize there were test and compilation failures, so this
revert was reverted. Now that those have been fixed, we can revert the
revert of the revert.
llvm-svn: 307226
Diffstat (limited to 'llvm/unittests')
| -rw-r--r-- | llvm/unittests/BinaryFormat/TestFileMagic.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/unittests/BinaryFormat/TestFileMagic.cpp b/llvm/unittests/BinaryFormat/TestFileMagic.cpp index 68b3ade0095..fc2c1eef9fb 100644 --- a/llvm/unittests/BinaryFormat/TestFileMagic.cpp +++ b/llvm/unittests/BinaryFormat/TestFileMagic.cpp @@ -76,8 +76,7 @@ const char macho_dsym_companion[] = "\xfe\xed\xfa\xce........\x00\x00\x00\x0a............"; const char macho_kext_bundle[] = "\xfe\xed\xfa\xce........\x00\x00\x00\x0b............"; -const char windows_resource[] = - "\x00\x00\x00\x00\x020\x00\x00\x00\xff\xff\x00\x00\xff\xff\x00\x00"; +const char windows_resource[] = "\x00\x00\x00\x00\x020\x00\x00\x00\xff"; const char macho_dynamically_linked_shared_lib_stub[] = "\xfe\xed\xfa\xce........\x00\x00\x00\x09............"; |
