diff options
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/profile/InstrProfilingPlatformWindows.c | 6 | ||||
| -rw-r--r-- | compiler-rt/test/profile/instrprof-merging.cpp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/compiler-rt/lib/profile/InstrProfilingPlatformWindows.c b/compiler-rt/lib/profile/InstrProfilingPlatformWindows.c index a94b9659fba..594e3945706 100644 --- a/compiler-rt/lib/profile/InstrProfilingPlatformWindows.c +++ b/compiler-rt/lib/profile/InstrProfilingPlatformWindows.c @@ -16,9 +16,9 @@ #pragma comment(linker, "/MERGE:.lprfd=.data") #pragma comment(linker, "/MERGE:.lprfv=.data") #pragma comment(linker, "/MERGE:.lprfnd=.data") -/* Merge read-only sections into .rdata. */ -#pragma comment(linker, "/MERGE:.lprfn=.rdata") -#pragma comment(linker, "/MERGE:.lcovmap=.rdata") +/* Do *NOT* merge .lprfn and .lcovmap into .rdata. llvm-cov must be able to find + * after the fact. + */ /* Allocate read-only section bounds. */ #pragma section(".lprfn$A", read) diff --git a/compiler-rt/test/profile/instrprof-merging.cpp b/compiler-rt/test/profile/instrprof-merging.cpp index 75b818d1b10..06f05ce612a 100644 --- a/compiler-rt/test/profile/instrprof-merging.cpp +++ b/compiler-rt/test/profile/instrprof-merging.cpp @@ -21,9 +21,6 @@ // and prefer it over others.) When only limited coverage information is // available (just from one binary), don't try to guess any region counts. -// FIXME: Fails with: "Failed to load coverage: No coverage data found" -// XFAIL: windows - struct A { A() {} // V1: [[@LINE]]{{ *}}|{{ *}}1 // V1-ONLY: [[@LINE+1]]{{ *}}|{{ *}}| |
