pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

coreclr-git: Fix SOS build



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Feb 16 01:58:32 2016 +0100
Changeset:	a929041db50ce9c47f505c1b18341af8eb009738

Modified Files:
	coreclr-git/distinfo
Removed Files:
	coreclr-git/patches/patch-src_ToolBox_SOS_Strike_gcroot.cpp
	coreclr-git/patches/patch-src_ToolBox_SOS_Strike_sos.cpp
	coreclr-git/patches/patch-src_ToolBox_SOS_Strike_util.h

Log Message:
coreclr-git: Fix SOS build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a929041db50ce9c47f505c1b18341af8eb009738

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 coreclr-git/distinfo                               |  3 --
 .../patch-src_ToolBox_SOS_Strike_gcroot.cpp        | 22 ------------
 .../patches/patch-src_ToolBox_SOS_Strike_sos.cpp   | 13 -------
 .../patches/patch-src_ToolBox_SOS_Strike_util.h    | 40 ----------------------
 4 files changed, 78 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 24df54c..eb3b8d7 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -5,13 +5,10 @@ SHA1 (patch-build.sh) = 38c35ab6d42f4147ad7b20df06f8ca438daf8070
 SHA1 (patch-src_ToolBox_PdbTypeMatch_PrintSymbol.cpp) = 266d174e5007a4706f0af1f74c2204e50406a7d0
 SHA1 (patch-src_ToolBox_SOS_Strike_CMakeLists.txt) = 6344da328f268a130081a5b6f7a2f736d098612d
 SHA1 (patch-src_ToolBox_SOS_Strike_eeheap.cpp) = a96f30dd3c060dfedf350f712043dd715b58d9d2
-SHA1 (patch-src_ToolBox_SOS_Strike_gcroot.cpp) = 417f0e23a7e6a8b8e88dbaafac463dd14141af25
 SHA1 (patch-src_ToolBox_SOS_Strike_metadata.cpp) = 595d08004892093e588e27a96a5a43b0c1f90258
 SHA1 (patch-src_ToolBox_SOS_Strike_sildasm.cpp) = 56486001066fc86096970e0f314c085f34bc4607
-SHA1 (patch-src_ToolBox_SOS_Strike_sos.cpp) = 7cd78cc84569e4419af54c79da098d5f8c5b0398
 SHA1 (patch-src_ToolBox_SOS_Strike_stressLogDump.cpp) = 67e37480cd2f4524c5c21d8bc4b57eb85825c025
 SHA1 (patch-src_ToolBox_SOS_Strike_strike.cpp) = 081f8ec2020848f988eab5ccf23e4c1dc07a33a3
-SHA1 (patch-src_ToolBox_SOS_Strike_util.h) = 7b62dfda1717d85ce22fa1f01fb6dea2cdccd88d
 SHA1 (patch-src_classlibnative_bcltype_arraynative.cpp) = 9ff26fd95b8ad3e5d8abee46936e98f5e184a960
 SHA1 (patch-src_debug_daccess_nidump.cpp) = 9fbb860b9555276addf6e9771e72e2b373cea7e4
 SHA1 (patch-src_debug_di_breakpoint.cpp) = 0f1a784326439152f685ef44c662b1d784e6ec68
diff --git a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_gcroot.cpp b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_gcroot.cpp
deleted file mode 100644
index 681ee3d..0000000
--- a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_gcroot.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/ToolBox/SOS/Strike/gcroot.cpp.orig	2016-01-28 19:04:13.000000000 +0000
-+++ src/ToolBox/SOS/Strike/gcroot.cpp
-@@ -544,7 +544,7 @@ int GCRootImpl::PrintRootsInOlderGen()
-             return 0;
-         }
- 
--        CLRDATA_ADDRESS *heapAddrs = (CLRDATA_ADDRESS*)alloca(dwAllocSize);
-+        CLRDATA_ADDRESS *heapAddrs = (CLRDATA_ADDRESS*)Alloca(dwAllocSize);
-         if (g_sos->GetGCHeapList(dwNHeaps, heapAddrs, NULL) != S_OK)
-         {
-             ExtErr("Failed to get GCHeaps\n");
-@@ -625,7 +625,7 @@ int GCRootImpl::PrintRootsOnFQ(bool notR
-             return 0;
-         }
- 
--        CLRDATA_ADDRESS *heapAddrs = (CLRDATA_ADDRESS*)alloca(dwAllocSize);
-+        CLRDATA_ADDRESS *heapAddrs = (CLRDATA_ADDRESS*)Alloca(dwAllocSize);
-         if (g_sos->GetGCHeapList(dwNHeaps, heapAddrs, NULL) != S_OK)
-         {
-             ExtErr("Error requesting heap data.\n");
diff --git a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_sos.cpp b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_sos.cpp
deleted file mode 100644
index 559f293..0000000
--- a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_sos.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/ToolBox/SOS/Strike/sos.cpp.orig	2016-01-28 19:04:13.000000000 +0000
-+++ src/ToolBox/SOS/Strike/sos.cpp
-@@ -729,7 +729,7 @@ namespace sos
-             if (!ClrSafeInt<DWORD>::multiply(sizeof(CLRDATA_ADDRESS), mNumHeaps, dwAllocSize))
-                 sos::Throw<Exception>("Failed to get GCHeaps: Integer overflow.");
- 
--            CLRDATA_ADDRESS *heapAddrs = (CLRDATA_ADDRESS*)alloca(dwAllocSize);
-+            CLRDATA_ADDRESS *heapAddrs = (CLRDATA_ADDRESS*)Alloca(dwAllocSize);
-             if (FAILED(g_sos->GetGCHeapList(mNumHeaps, heapAddrs, NULL)))
-                 sos::Throw<DataRead>("Failed to get GCHeaps.");
- 
diff --git a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_util.h b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_util.h
deleted file mode 100644
index 88355a7..0000000
--- a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_util.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- src/ToolBox/SOS/Strike/util.h.orig	2016-01-28 19:04:13.000000000 +0000
-+++ src/ToolBox/SOS/Strike/util.h
-@@ -683,7 +683,7 @@ namespace Output
-             if (IsDMLEnabled() && mDml != Output::DML_None)
-             {
-                 const int len = GetDMLWidth(mDml);
--                char *buffer = (char*)alloca(len);
-+                char *buffer = (char*)Alloca(len);
-             
-                 BuildDML(buffer, len, (CLRDATA_ADDRESS)mValue, mFormat, mDml);
-                 DMLOut(buffer);
-@@ -732,7 +732,7 @@ namespace Output
-             if (IsDMLEnabled() && mDml != Output::DML_None)
-             {
-                 const int len = GetDMLColWidth(mDml, width);
--                char *buffer = (char*)alloca(len);
-+                char *buffer = (char*)Alloca(len);
-             
-                 BuildDMLCol(buffer, len, (CLRDATA_ADDRESS)mValue, mFormat, mDml, leftAlign, width);
-                 DMLOut(buffer);
-@@ -782,7 +782,7 @@ namespace Output
-             const char *cstr = (const char *)str;
-         
-             int len = MultiByteToWideChar(CP_ACP, 0, cstr, -1, NULL, 0);
--            WCHAR *buffer = (WCHAR *)alloca(len*sizeof(WCHAR));
-+            WCHAR *buffer = (WCHAR *)Alloca(len*sizeof(WCHAR));
-         
-             MultiByteToWideChar(CP_ACP, 0, cstr, -1, buffer, len);
-         
-@@ -798,7 +798,7 @@ namespace Output
-             if (IsDMLEnabled() && mDml != Output::DML_None)
-             {
-                 const int len = GetDMLColWidth(mDml, 0);
--                char *buffer = (char*)alloca(len);
-+                char *buffer = (char*)Alloca(len);
-             
-                 BuildDMLCol(buffer, len, (CLRDATA_ADDRESS)mValue, mFormat, mDml, false, 0);
-                 return buffer;


Home | Main Index | Thread Index | Old Index