Skip to content

Commit 918c388

Browse files
committed
---
yaml --- r: 345967 b: refs/heads/master c: 632de50 h: refs/heads/master i: 345965: 43c9f73 345963: 30832ae 345959: db965d9 345951: 5c90132
1 parent c066bfb commit 918c388

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: b7c10624214e368e967a3c30bdd888099276f15c
2+
refs/heads/master: 632de50b33326f7287f5e372a9b6b7a0a9561ec4
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/stdlib/public/runtime/LLVMSupport.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,18 @@
1616
// to link.
1717
#if defined(swiftCore_EXPORTS)
1818
namespace llvm {
19+
#if defined(_WIN32)
20+
extern void report_bad_alloc_error(const char *Reason, bool GenCrashDiag);
21+
void _report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {}
22+
#if defined(_WIN64)
23+
#pragma comment(linker, "/alternatename:?report_bad_alloc_error@llvm@@YAXPEBD_N@Z=?_report_bad_alloc_error@llvm@@YAXPEBD_N@Z")
24+
#else
25+
#pragma comment(linker, "/alternatename:?report_bad_alloc_error@llvm@@YAXPBD_N@Z=?_report_bad_alloc_error@llvm@@YAXPBD_N@Z")
26+
#endif
27+
#else
1928
void __attribute__((__weak__, __visibility__("hidden")))
2029
report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {}
30+
#endif
2131
} // end namespace llvm
2232
#endif
2333

0 commit comments

Comments
 (0)