[PATCH] D41089: [COFF] Don't error out on undefined references to __enclave_config

[Martin Storsjö via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL320462: [COFF] Don't error out on undefined references to __enclave_config (authored by mstorsjo).

Changed prior to commit:
  https://reviews.llvm.org/D41089?vs=126427&id=126506#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D41089

Files:
  lld/trunk/COFF/Driver.cpp
  lld/trunk/test/COFF/guardcf.test


Index: lld/trunk/test/COFF/guardcf.test
===================================================================
--- lld/trunk/test/COFF/guardcf.test
+++ lld/trunk/test/COFF/guardcf.test
@@ -71,4 +71,10 @@
     SimpleType:      IMAGE_SYM_TYPE_NULL
     ComplexType:     IMAGE_SYM_DTYPE_NULL
     StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            __enclave_config
+    Value:           0
+    SectionNumber:   0
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
 ...
Index: lld/trunk/COFF/Driver.cpp
===================================================================
--- lld/trunk/COFF/Driver.cpp
+++ lld/trunk/COFF/Driver.cpp
@@ -1167,6 +1167,8 @@
   Symtab->addAbsolute(mangle("__guard_iat_table"), 0);
   Symtab->addAbsolute(mangle("__guard_longjmp_count"), 0);
   Symtab->addAbsolute(mangle("__guard_longjmp_table"), 0);
+  // Needed for MSVC 2017 15.5 CRT.
+  Symtab->addAbsolute(mangle("__enclave_config"), 0);
 
   // This code may add new undefined symbols to the link, which may enqueue more
   // symbol resolution tasks, so we need to continue executing tasks until we


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41089.126506.patch
Type: text/x-patch
Size: 1171 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171212/8e363c9c/attachment.bin>