diff options
| author | Rui Ueyama <ruiu@google.com> | 2015-09-01 06:01:53 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2015-09-01 06:01:53 +0000 |
| commit | b355fd030890020e1fa70f66e0c9e45146bcb125 (patch) | |
| tree | 688ce1d45701d32b7e618c67c78e8ccedbb00742 | |
| parent | 1ded69870e144e75b7a812411e67cace4174695e (diff) | |
| download | bcm5719-llvm-b355fd030890020e1fa70f66e0c9e45146bcb125.tar.gz bcm5719-llvm-b355fd030890020e1fa70f66e0c9e45146bcb125.zip | |
Object: Fix COFF import file's symbols.
If a symbol is marked as "data", the symbol should be exported
with __imp_ prefix. Previously, the symbol was exported as-is.
llvm-svn: 246532
| -rw-r--r-- | llvm/include/llvm/Object/COFFImportFile.h | 2 | ||||
| -rw-r--r-- | llvm/test/Object/archive-symtab.test | 6 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-readobj/file-headers.test | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/llvm/include/llvm/Object/COFFImportFile.h b/llvm/include/llvm/Object/COFFImportFile.h index 07e98f5cf12..b04a44ea60d 100644 --- a/llvm/include/llvm/Object/COFFImportFile.h +++ b/llvm/include/llvm/Object/COFFImportFile.h @@ -37,7 +37,7 @@ public: std::error_code printSymbolName(raw_ostream &OS, DataRefImpl Symb) const override { - if (Symb.p == 1) + if (Symb.p == 0) OS << "__imp_"; OS << StringRef(Data.getBufferStart() + sizeof(coff_import_header)); return std::error_code(); diff --git a/llvm/test/Object/archive-symtab.test b/llvm/test/Object/archive-symtab.test index 120401bad36..c9e89005d6c 100644 --- a/llvm/test/Object/archive-symtab.test +++ b/llvm/test/Object/archive-symtab.test @@ -104,10 +104,10 @@ RUN: llvm-ar --format=gnu rcsU %t.a %p/Inputs/coff-short-import-code %p/Inputs/c RUN: llvm-nm -M %t.a | FileCheck --check-prefix=COFF-SHORT-IMPORT %s COFF-SHORT-IMPORT: Archive map -COFF-SHORT-IMPORT-NEXT: _foo in coff-short-import-code COFF-SHORT-IMPORT-NEXT: __imp__foo in coff-short-import-code -COFF-SHORT-IMPORT-NEXT: _bar in coff-short-import-data -COFF-SHORT-IMPORT-NOT: __imp__bar in coff-short-import-data +COFF-SHORT-IMPORT-NEXT: _foo in coff-short-import-code +COFF-SHORT-IMPORT-NEXT: __imp__bar in coff-short-import-data +COFF-SHORT-IMPORT-NOT: _bar in coff-short-import-data Test that we pad the symbol table so that it ends in a multiple of 4 bytes: 8 + 60 + 36 == 104 diff --git a/llvm/test/tools/llvm-readobj/file-headers.test b/llvm/test/tools/llvm-readobj/file-headers.test index 10fbcbcc153..2d67089d611 100644 --- a/llvm/test/tools/llvm-readobj/file-headers.test +++ b/llvm/test/tools/llvm-readobj/file-headers.test @@ -333,5 +333,5 @@ COFF-UNKNOWN-NEXT: } COFF-IMPORTLIB: Format: COFF-import-file COFF-IMPORTLIB-NEXT: Type: code COFF-IMPORTLIB-NEXT: Name type: noprefix -COFF-IMPORTLIB-NEXT: Symbol: _func COFF-IMPORTLIB-NEXT: Symbol: __imp__func +COFF-IMPORTLIB-NEXT: Symbol: _func |
