summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2016-03-08 00:41:21 -0800
committerJan Kotas <jkotas@microsoft.com>2016-03-09 08:46:07 -0800
commit618e798e3ba00e8b95158fd1d7081ca91cc43bf5 (patch)
tree091b7e7719d83d7408d623c82a3deaeca96e67ed /src/tools
parentb219fbbe1fe72b4a44b5247c9a77f9447d34b028 (diff)
downloadcoreclr-618e798e3ba00e8b95158fd1d7081ca91cc43bf5.tar.gz
coreclr-618e798e3ba00e8b95158fd1d7081ca91cc43bf5.tar.bz2
coreclr-618e798e3ba00e8b95158fd1d7081ca91cc43bf5.zip
Delete dead code
- Delete BINDER, STANDALONE_BINDER and MDIL ifdefs
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/crossgen/crossgen.cpp89
1 files changed, 0 insertions, 89 deletions
diff --git a/src/tools/crossgen/crossgen.cpp b/src/tools/crossgen/crossgen.cpp
index 16a2819511..2e8e3334fe 100644
--- a/src/tools/crossgen/crossgen.cpp
+++ b/src/tools/crossgen/crossgen.cpp
@@ -99,9 +99,6 @@ void PrintLogoHelper()
#else
Output(W("Microsoft (R) CLR Native Image "));
#endif
-#ifdef MDIL
- Output(W("/ MDIL "));
-#endif
Outputf(W("Generator - Version %S\n"), VER_FILEVERSION_STR);
Outputf(W("%S\n"), VER_LEGALCOPYRIGHT_LOGO_STR);
Output(W("\n"));
@@ -123,12 +120,7 @@ void PrintUsageHelper()
W(" /partialtrust - Assembly will be run in a partial trust domain.\n")
#endif
W(" /in <file> - Specifies input filename (optional)\n")
-#ifdef MDIL
- W(" /out <file> - Specifies output filename (optional with native images,\n")
- W(" required with MDIL)\n")
-#else
W(" /out <file> - Specifies output filename (optional)\n")
-#endif
#ifdef FEATURE_CORECLR
W(" /Trusted_Platform_Assemblies <path[;path]>\n")
W(" - List of assemblies treated as trusted platform\n")
@@ -172,14 +164,6 @@ void PrintUsageHelper()
W(" /PreWP8App - Set the Windows Phone 8 \"Quirks\" mode, namely AppDomainCompatSwitch=\n")
W(" WindowsPhone_3.7.0.0 or WindowsPhone_3.8.0.0.\n")
#endif
-#ifdef MDIL
- W(" MDIL Generation Parameters\n")
- W(" /mdil - Generate MDIL rather than native code. Requires presence of /out switch.\n")
- W(" /nomdil - create MDIL image with no MDIL code or CTL data structures, use to force\n")
- W(" fall back to JIT\n")
- W(" /EmbedMDIL - Embed a previously created mdil data in IL image into native image.\n")
- W(" /fxmdil - Generate framework assembly MDIL images containing minimal MDIL\n")
-#endif // MDIL
#ifdef FEATURE_WINMD_RESILIENT
W(" WinMD Parameters\n")
W(" /WinMDResilient - Generate images resilient to WinMD dependency changes.\n")
@@ -504,8 +488,6 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
argc = argc2;
argv = argv2;
- bool fCopySourceToOut = false;
-
// By default, Crossgen will assume code-generation for fulltrust domains unless /PartialTrust switch is specified
dwFlags |= NGENWORKER_FLAGS_FULLTRUSTDOMAIN;
@@ -556,34 +538,6 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
dwFlags |= NGENWORKER_FLAGS_APPCOMPATWP8;
}
#endif
-#ifdef MDIL
- else if (MatchParameter(*argv, W("mdil")))
- {
- dwFlags |= NGENWORKER_FLAGS_CREATEMDIL;
- }
- else if (MatchParameter(*argv, W("fxmdil")))
- {
- dwFlags |= NGENWORKER_FLAGS_MINIMAL_MDIL | NGENWORKER_FLAGS_CREATEMDIL;
- }
- else if (MatchParameter(*argv, W("EmbedMDIL")))
- {
- dwFlags |= NGENWORKER_FLAGS_EMBEDMDIL;
- }
- else if (MatchParameter(*argv, W("NoMDIL")))
- {
- dwFlags |= NGENWORKER_FLAGS_NOMDIL;
- }
-#else // !MDIL
- else if (MatchParameter(*argv, W("mdil")) || MatchParameter(*argv, W("fxmdil")) || MatchParameter(*argv, W("NoMDIL")))
- {
- // Copy the "in" file as the "out" file
- fCopySourceToOut = true;
- }
- else if (MatchParameter(*argv, W("EmbedMDIL")))
- {
- // Dont do anything - simply generate the NI
- }
-#endif
#ifdef FEATURE_WINMD_RESILIENT
else if (MatchParameter(*argv, W("WinMDResilient")))
{
@@ -826,49 +780,6 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
exit(INVALID_ARGUMENTS);
}
-#ifdef MDIL
- if (pwzOutputFilename == NULL)
- {
- if (dwFlags & NGENWORKER_FLAGS_CREATEMDIL)
- {
- Output(W("You must specify an output filename (/out <file>)\n"));
- exit(INVALID_ARGUMENTS);
- }
- }
-
- if ((dwFlags & NGENWORKER_FLAGS_EMBEDMDIL) && (dwFlags & NGENWORKER_FLAGS_CREATEMDIL))
- {
- Output(W("The /EmbedMDIL switch cannot be used with the /mdil or /createmdil switch.\n"));
- exit(INVALID_ARGUMENTS);
- }
-
- if ((dwFlags & NGENWORKER_FLAGS_NOMDIL) && !(dwFlags & NGENWORKER_FLAGS_CREATEMDIL))
- {
- Output(W("The /NoMDIL switch must be used with the /mdil or /createmdil switch.\n"));
- exit(INVALID_ARGUMENTS);
- }
-#else // !MDIL
- if (fCopySourceToOut == true)
- {
- if (pwzOutputFilename == NULL)
- {
- Output(W("You must specify an output filename (/out <file>)\n"));
- exit(INVALID_ARGUMENTS);
- }
- if (CopyFileW(pwzFilename, pwzOutputFilename, FALSE) == 0)
- {
- DWORD dwLastError = GetLastError();
- OutputErrf(W("Error: x86 copy failed for \"%s\" (0x%08x)\n"), pwzFilename, HRESULT_FROM_WIN32(dwLastError));
- }
- else
- {
- Outputf(W("[x86] %s generated successfully\n"),pwzOutputFilename);
- }
-
- return 0;
- }
-#endif //MDIL
-
if (fCreatePDB && (dwFlags != 0))
{
Output(W("The /CreatePDB switch cannot be used with other switches, except /lines and the various path switches.\n"));