pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
corert-git: Eliminate local patch - merged upstream
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sun Jan 24 22:21:55 2016 +0100
Changeset: 8df41ead14871fa305bc4bc86a196d5a86dcd59e
Modified Files:
corert-git/distinfo
Removed Files:
corert-git/patches/patch-src_Native_Bootstrap_main.cpp
Log Message:
corert-git: Eliminate local patch - merged upstream
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8df41ead14871fa305bc4bc86a196d5a86dcd59e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
corert-git/distinfo | 1 -
.../patches/patch-src_Native_Bootstrap_main.cpp | 36 ----------------------
2 files changed, 37 deletions(-)
diffs:
diff --git a/corert-git/distinfo b/corert-git/distinfo
index 19ccb93..afc7651 100644
--- a/corert-git/distinfo
+++ b/corert-git/distinfo
@@ -1,3 +1,2 @@
$NetBSD$
-SHA1 (patch-src_Native_Bootstrap_main.cpp) = d5477c79ae452fd858110167da1e40edb32053bb
diff --git a/corert-git/patches/patch-src_Native_Bootstrap_main.cpp b/corert-git/patches/patch-src_Native_Bootstrap_main.cpp
deleted file mode 100644
index c9390a9..0000000
--- a/corert-git/patches/patch-src_Native_Bootstrap_main.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
---- src/Native/Bootstrap/main.cpp.orig 2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/Bootstrap/main.cpp
-@@ -135,8 +135,7 @@ namespace System_Private_CoreLib { names
-
- using namespace System_Private_CoreLib;
-
--extern "C" void __EEType_System_Private_CoreLib_System_String();
--extern "C" void __EEType_System_Private_CoreLib_System_String__Array();
-+extern "C" void* __EEType_System_Private_CoreLib_System_String;
-
- Object * __allocate_string(int32_t len)
- {
-@@ -248,8 +247,8 @@ extern "C" void RhReRegisterForFinalize(
- extern "C" void * g_pDispatchMapTemporaryWorkaround;
- void * g_pDispatchMapTemporaryWorkaround;
-
--extern "C" void __StringTableStart();
--extern "C" void __StringTableEnd();
-+extern "C" void* __StringTableStart;
-+extern "C" void* __StringTableEnd;
- extern "C" void* GetModuleSection(int id, int* length)
- {
- struct ModuleSectionSymbol
-@@ -266,8 +265,8 @@ extern "C" void* GetModuleSection(int id
- { System::String::__getMethodTable(), sizeof(void*) },
- { nullptr, 0 },
- #else
-- { __EEType_System_Private_CoreLib_System_String, sizeof(void*) },
-- { __StringTableStart, (uint8_t*)__StringTableEnd - (uint8_t*)__StringTableStart },
-+ { (void*)&__EEType_System_Private_CoreLib_System_String, sizeof(void*) },
-+ { (void*)&__StringTableStart, (uint8_t*)&__StringTableEnd - (uint8_t*)&__StringTableStart },
- #endif
- };
-
Home |
Main Index |
Thread Index |
Old Index