summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike McLaughlin <mikem@microsoft.com>2015-02-13 14:35:15 -0800
committerMike McLaughlin <mikem@microsoft.com>2015-02-13 14:35:15 -0800
commit5929b9a5fbf20d6afc05cc5dc16f83b933258efc (patch)
tree86a5cc79b984ae3d8ee05cc6e617ef3b24f6ec3a
parentbb9895320612048c1e314dbb87b443420afc2cc3 (diff)
downloadcoreclr-5929b9a5fbf20d6afc05cc5dc16f83b933258efc.tar.gz
coreclr-5929b9a5fbf20d6afc05cc5dc16f83b933258efc.tar.bz2
coreclr-5929b9a5fbf20d6afc05cc5dc16f83b933258efc.zip
Fix building under linux on a linux file system (instead of mounted windows ntfs)
-rw-r--r--src/ToolBox/SOS/CMakeLists.txt2
-rw-r--r--src/ToolBox/SOS/Strike/PlatformSpecific.h192
-rw-r--r--src/ToolBox/SOS/Strike/util.h2
3 files changed, 2 insertions, 194 deletions
diff --git a/src/ToolBox/SOS/CMakeLists.txt b/src/ToolBox/SOS/CMakeLists.txt
index cd7f621ff4..6eb50fdd90 100644
--- a/src/ToolBox/SOS/CMakeLists.txt
+++ b/src/ToolBox/SOS/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(strike)
+add_subdirectory(Strike)
if(WIN32)
add_subdirectory(DacTableGen)
add_subdirectory(diasdk)
diff --git a/src/ToolBox/SOS/Strike/PlatformSpecific.h b/src/ToolBox/SOS/Strike/PlatformSpecific.h
deleted file mode 100644
index 5769315a74..0000000000
--- a/src/ToolBox/SOS/Strike/PlatformSpecific.h
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-// ==++==
-//
-
-//
-// ==--==
-
-// Include platform specific declarations based on the target platform rather than the host platform.
-
-#ifndef __PLATFORM_SPECIFIC_INCLUDED
-#define __PLATFORM_SPECIFIC_INCLUDED
-
-// The main debugger code already has target platform definitions for CONTEXT.
-#include "../../../../Debug/inc/dbgtargetcontext.h"
-
-#ifndef FEATURE_PAL
-
-// The various OS structure definitions below tend to differ based soley on the size of pointers. DT_POINTER
-// is a type whose size matches that of the target platform. It's integral rather than point since it is never
-// legal to dereference one of these on the host.
-#ifdef _TARGET_WIN64_
-typedef ULONG64 DT_POINTER;
-#else
-typedef ULONG32 DT_POINTER;
-#endif
-
-struct DT_LIST_ENTRY
-{
- DT_POINTER Flink;
- DT_POINTER Blink;
-};
-
-struct DT_UNICODE_STRING
-{
- USHORT Length;
- USHORT MaximumLength;
- DT_POINTER Buffer;
-};
-
-#define DT_GDI_HANDLE_BUFFER_SIZE32 34
-#define DT_GDI_HANDLE_BUFFER_SIZE64 60
-
-#ifndef IMAGE_FILE_MACHINE_ARMNT
-#define IMAGE_FILE_MACHINE_ARMNT 0x01c4 // ARM Thumb-2 Little-Endian
-#endif
-
-#ifdef _TARGET_WIN64_
-typedef ULONG DT_GDI_HANDLE_BUFFER[DT_GDI_HANDLE_BUFFER_SIZE64];
-#else
-typedef ULONG DT_GDI_HANDLE_BUFFER[DT_GDI_HANDLE_BUFFER_SIZE32];
-#endif
-
-struct DT_PEB
-{
- BOOLEAN InheritedAddressSpace;
- BOOLEAN ReadImageFileExecOptions;
- BOOLEAN BeingDebugged;
- BOOLEAN SpareBool;
- DT_POINTER Mutant;
- DT_POINTER ImageBaseAddress;
- DT_POINTER Ldr;
- DT_POINTER ProcessParameters;
- DT_POINTER SubSystemData;
- DT_POINTER ProcessHeap;
- DT_POINTER FastPebLock;
- DT_POINTER SparePtr1;
- DT_POINTER SparePtr2;
- ULONG EnvironmentUpdateCount;
- DT_POINTER KernelCallbackTable;
- ULONG SystemReserved[1];
- struct _dummy {
- ULONG ExecuteOptions : 2;
- ULONG SpareBits : 30;
- };
- DT_POINTER FreeList;
- ULONG TlsExpansionCounter;
- DT_POINTER TlsBitmap;
- ULONG TlsBitmapBits[2];
- DT_POINTER ReadOnlySharedMemoryBase;
- DT_POINTER ReadOnlySharedMemoryHeap;
- DT_POINTER ReadOnlyStaticServerData;
- DT_POINTER AnsiCodePageData;
- DT_POINTER OemCodePageData;
- DT_POINTER UnicodeCaseTableData;
- ULONG NumberOfProcessors;
- ULONG NtGlobalFlag;
- LARGE_INTEGER CriticalSectionTimeout;
- DT_POINTER HeapSegmentReserve;
- DT_POINTER HeapSegmentCommit;
- DT_POINTER HeapDeCommitTotalFreeThreshold;
- DT_POINTER HeapDeCommitFreeBlockThreshold;
- ULONG NumberOfHeaps;
- ULONG MaximumNumberOfHeaps;
- DT_POINTER ProcessHeaps;
- DT_POINTER GdiSharedHandleTable;
- DT_POINTER ProcessStarterHelper;
- ULONG GdiDCAttributeList;
- DT_POINTER LoaderLock;
- ULONG OSMajorVersion;
- ULONG OSMinorVersion;
- USHORT OSBuildNumber;
- USHORT OSCSDVersion;
- ULONG OSPlatformId;
- ULONG ImageSubsystem;
- ULONG ImageSubsystemMajorVersion;
- ULONG ImageSubsystemMinorVersion;
- DT_POINTER ImageProcessAffinityMask;
- DT_GDI_HANDLE_BUFFER GdiHandleBuffer;
- DT_POINTER PostProcessInitRoutine;
- DT_POINTER TlsExpansionBitmap;
- ULONG TlsExpansionBitmapBits[32];
- ULONG SessionId;
- ULARGE_INTEGER AppCompatFlags;
- ULARGE_INTEGER AppCompatFlagsUser;
- DT_POINTER pShimData;
- DT_POINTER AppCompatInfo;
- DT_UNICODE_STRING CSDVersion;
- DT_POINTER ActivationContextData;
- DT_POINTER ProcessAssemblyStorageMap;
- DT_POINTER SystemDefaultActivationContextData;
- DT_POINTER SystemAssemblyStorageMap;
- DT_POINTER MinimumStackCommit;
- DT_POINTER FlsCallback;
- DT_LIST_ENTRY FlsListHead;
- DT_POINTER FlsBitmap;
- ULONG FlsBitmapBits[FLS_MAXIMUM_AVAILABLE / (sizeof(ULONG) * 8)];
- ULONG FlsHighIndex;
-};
-
-struct DT_PEB_LDR_DATA
-{
- BYTE Reserved1[8];
- DT_POINTER Reserved2[3];
- DT_LIST_ENTRY InMemoryOrderModuleList;
-};
-
-struct DT_CURDIR
-{
- DT_UNICODE_STRING DosPath;
- DT_POINTER Handle;
-};
-
-struct DT_RTL_DRIVE_LETTER_CURDIR {
- USHORT Flags;
- USHORT Length;
- ULONG TimeStamp;
- STRING DosPath;
-};
-
-#define DT_RTL_MAX_DRIVE_LETTERS 32
-
-struct DT_RTL_USER_PROCESS_PARAMETERS
-{
- ULONG MaximumLength;
- ULONG Length;
- ULONG Flags;
- ULONG DebugFlags;
- DT_POINTER ConsoleHandle;
- ULONG ConsoleFlags;
- DT_POINTER StandardInput;
- DT_POINTER StandardOutput;
- DT_POINTER StandardError;
- DT_CURDIR CurrentDirectory;
- DT_UNICODE_STRING DllPath;
- DT_UNICODE_STRING ImagePathName;
- DT_UNICODE_STRING CommandLine;
- DT_POINTER Environment;
- ULONG StartingX;
- ULONG StartingY;
- ULONG CountX;
- ULONG CountY;
- ULONG CountCharsX;
- ULONG CountCharsY;
- ULONG FillAttribute;
- ULONG WindowFlags;
- ULONG ShowWindowFlags;
- DT_UNICODE_STRING WindowTitle;
- DT_UNICODE_STRING DesktopInfo;
- DT_UNICODE_STRING ShellInfo;
- DT_UNICODE_STRING RuntimeData;
- DT_RTL_DRIVE_LETTER_CURDIR CurrentDirectores[ DT_RTL_MAX_DRIVE_LETTERS ];
-};
-
-#endif // !FEATURE_PAL
-
-#define DT_OS_PAGE_SIZE 4096
-
-#endif // !__PLATFORM_SPECIFIC_INCLUDED
diff --git a/src/ToolBox/SOS/Strike/util.h b/src/ToolBox/SOS/Strike/util.h
index ad9e8a628d..cb1dbe2f38 100644
--- a/src/ToolBox/SOS/Strike/util.h
+++ b/src/ToolBox/SOS/Strike/util.h
@@ -17,7 +17,7 @@
inline void RestoreSOToleranceState() {}
#include <cor.h>
-#include <CorSym.h>
+#include <corsym.h>
#include <clrdata.h>
#include <palclr.h>