diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2017-03-23 09:31:35 -0700 |
|---|---|---|
| committer | Bruce Forstall <brucefo@microsoft.com> | 2017-03-23 16:29:07 -0700 |
| commit | e4849aae67375a2dfbe73bf2bf94e4abc17464d4 (patch) | |
| tree | c039a81992f2814107cc0fb43ba311a13eb7af84 | |
| parent | c6ce2171adf92137e7f256200a8a46dc2337de33 (diff) | |
| download | coreclr-e4849aae67375a2dfbe73bf2bf94e4abc17464d4.tar.gz coreclr-e4849aae67375a2dfbe73bf2bf94e4abc17464d4.tar.bz2 coreclr-e4849aae67375a2dfbe73bf2bf94e4abc17464d4.zip | |
Enable FEATURE_METADATA_EMIT_ALL for non-crossgen compiles
This allows ilasm roundtrip test to work with NetStandard 2.0
changes where C# compiler emits a ".permissionset" attribute
into the assembly that ildasm emits. This define enables the
APIs that ilasm uses to process this attribute.
Re-enable ilasm roundtrip test.
Fixes #8418
| -rw-r--r-- | src/md/compiler/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/md/compiler/wks/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/md/enc/wks/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/md/md_wks.cmake | 2 | ||||
| -rw-r--r-- | src/md/runtime/wks/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/md/winmd/wks/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/issues.targets | 3 | ||||
| -rw-r--r-- | tests/testsFailingOutsideWindows.txt | 1 |
8 files changed, 12 insertions, 7 deletions
diff --git a/src/md/compiler/CMakeLists.txt b/src/md/compiler/CMakeLists.txt index 4d99d11edc..6d46dc064a 100644 --- a/src/md/compiler/CMakeLists.txt +++ b/src/md/compiler/CMakeLists.txt @@ -11,6 +11,7 @@ set(MDCOMPILER_SOURCES import.cpp importhelper.cpp mdutil.cpp + newmerger.cpp regmeta.cpp regmeta_compilersupport.cpp regmeta_emit.cpp diff --git a/src/md/compiler/wks/CMakeLists.txt b/src/md/compiler/wks/CMakeLists.txt index 6bf6c80868..eb39ca7972 100644 --- a/src/md/compiler/wks/CMakeLists.txt +++ b/src/md/compiler/wks/CMakeLists.txt @@ -1,4 +1,6 @@ include(../../md_wks.cmake) +add_definitions(-DFEATURE_METADATA_EMIT_ALL) + add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) -add_library_clr(mdcompiler_wks ${MDCOMPILER_SOURCES})
\ No newline at end of file +add_library_clr(mdcompiler_wks ${MDCOMPILER_SOURCES}) diff --git a/src/md/enc/wks/CMakeLists.txt b/src/md/enc/wks/CMakeLists.txt index df7664187d..2c0a2b1af5 100644 --- a/src/md/enc/wks/CMakeLists.txt +++ b/src/md/enc/wks/CMakeLists.txt @@ -1,4 +1,6 @@ include(../../md_wks.cmake) +add_definitions(-DFEATURE_METADATA_EMIT_ALL) + add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) add_library_clr(mdruntimerw_wks ${MDRUNTIMERW_SOURCES}) diff --git a/src/md/md_wks.cmake b/src/md/md_wks.cmake index ab9df6c667..4d72c55a14 100644 --- a/src/md/md_wks.cmake +++ b/src/md/md_wks.cmake @@ -3,4 +3,4 @@ add_definitions(-DFEATURE_METADATA_INTERNAL_APIS) add_definitions(-DFEATURE_METADATA_IN_VM) if(WIN32) add_definitions(-DFEATURE_METADATA_VERIFY_LAYOUTS) -endif(WIN32)
\ No newline at end of file +endif(WIN32) diff --git a/src/md/runtime/wks/CMakeLists.txt b/src/md/runtime/wks/CMakeLists.txt index 9a1f72ed25..3e2a8cc6be 100644 --- a/src/md/runtime/wks/CMakeLists.txt +++ b/src/md/runtime/wks/CMakeLists.txt @@ -1,5 +1,7 @@ include(../../md_wks.cmake) +add_definitions(-DFEATURE_METADATA_EMIT_ALL) + add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) add_library_clr(mdruntime_wks ${MDRUNTIME_SOURCES}) diff --git a/src/md/winmd/wks/CMakeLists.txt b/src/md/winmd/wks/CMakeLists.txt index 139b68b28c..defcc1d51d 100644 --- a/src/md/winmd/wks/CMakeLists.txt +++ b/src/md/winmd/wks/CMakeLists.txt @@ -1,4 +1,6 @@ include(../../md_wks.cmake) +add_definitions(-DFEATURE_METADATA_EMIT_ALL) + add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) -add_library_clr(mdwinmd_wks ${MDWINMD_SOURCES})
\ No newline at end of file +add_library_clr(mdwinmd_wks ${MDWINMD_SOURCES}) diff --git a/tests/issues.targets b/tests/issues.targets index db0577dd06..05a66d62c8 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -184,9 +184,6 @@ <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\*"> <Issue>6707</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\perf\doublealign\Locals\*"> - <Issue>8418</Issue> - </ExcludeList> </ItemGroup> <!-- The following are x86 failures --> diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt index de94b2802e..809433c0ac 100644 --- a/tests/testsFailingOutsideWindows.txt +++ b/tests/testsFailingOutsideWindows.txt @@ -78,4 +78,3 @@ Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/Generate Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681/Generated681.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682/Generated682.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683/Generated683.sh -JIT/opt/perf/doublealign/Locals/Locals.sh |