+++ /dev/null
-From 73063a5586b8dadf5b8f651fc792cfbbeace2392 Mon Sep 17 00:00:00 2001
-From: Igor Kulaychuk <i.kulaychuk@samsung.com>
-Date: Thu, 24 Aug 2017 23:31:36 +0300
-Subject: [PATCH 1/5] Add more stuff to devel package for debugger
-
----
- packaging/coreclr.spec | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
-index 46211a0..226c6d7 100644
---- a/packaging/coreclr.spec
-+++ b/packaging/coreclr.spec
-@@ -302,11 +302,20 @@ ln -sf ../%{netcoreappdir}/corerun %{buildroot}%{_datadir}/%{dotnetdir}/corer
-
- # .NET Core Headers and static libraries
- mkdir -p %{buildroot}%{_datadir}/%{netcoreappdir}/src/pal/src/
--cp -rf %{_reldir}/inc %{buildroot}%{_datadir}/%{netcoreappdir}/
--cp -rf src/inc %{buildroot}%{_datadir}/%{netcoreappdir}/src/
--cp -rf src/pal/inc %{buildroot}%{_datadir}/%{netcoreappdir}/src/pal/
--cp -rf %{_reldir}/lib %{buildroot}%{_datadir}/%{netcoreappdir}
--cp -rf src/pal/src/include %{buildroot}%{_datadir}/%{netcoreappdir}/src/pal/src
-+mkdir -p %{buildroot}%{_datadir}/%{netcoreappdir}/src/debug/
-+mkdir -p %{buildroot}%{_datadir}/%{netcoreappdir}/src/dlls/
-+mkdir -p %{buildroot}%{_datadir}/%{netcoreappdir}/src/coreclr/hosts/
-+mkdir -p %{buildroot}%{_datadir}/%{netcoreappdir}/src/ToolBox/SOS/
-+cp -rf src/inc %{buildroot}%{_datadir}/%{netcoreappdir}/src/
-+cp -rf src/pal/inc %{buildroot}%{_datadir}/%{netcoreappdir}/src/pal/
-+cp -rf src/pal/prebuilt %{buildroot}%{_datadir}/%{netcoreappdir}/src/pal/
-+cp -rf src/debug/inc %{buildroot}%{_datadir}/%{netcoreappdir}/src/debug/
-+cp -rf src/debug/shim %{buildroot}%{_datadir}/%{netcoreappdir}/src/debug/
-+cp -rf src/dlls/dbgshim %{buildroot}%{_datadir}/%{netcoreappdir}/src/dlls/
-+cp -rf src/coreclr/hosts/inc %{buildroot}%{_datadir}/%{netcoreappdir}/src/coreclr/hosts/
-+cp -rf src/ToolBox/SOS/Strike %{buildroot}%{_datadir}/%{netcoreappdir}/src/ToolBox/SOS
-+cp -rf src/pal/src/include %{buildroot}%{_datadir}/%{netcoreappdir}/src/pal/src
-+cp -rf %{_reldir}/lib %{buildroot}%{_datadir}/%{netcoreappdir}
-
- # make link for .NET CoreOverlay
- ln -sf ../%{netcoreappdir}/corerun %{buildroot}%{_datadir}/%{tizennetdir}
-@@ -368,10 +377,8 @@ ln -sf ../%{netcoreappdir}/SOS.NETCore.dll %{buildroot}%{_datadir}/%{tizenne
-
- %files devel
- %manifest %{name}.manifest
--%dir %{_datadir}/%{netcoreappdir}/inc
- %dir %{_datadir}/%{netcoreappdir}/lib
- %dir %{_datadir}/%{netcoreappdir}/src
--%{_datadir}/%{netcoreappdir}/inc/*
- %{_datadir}/%{netcoreappdir}/lib/*
- %{_datadir}/%{netcoreappdir}/src/*
- %endif
---
-2.7.4
-
-From cf1d582145e4ae064593b4d351b60477e0673299 Mon Sep 17 00:00:00 2001
+From c62d48577e6562996b1c1ab74d3f125b3262672a Mon Sep 17 00:00:00 2001
From: Igor Kulaychuk <i.kulaychuk@samsung.com>
-Date: Thu, 24 Aug 2017 23:39:57 +0300
-Subject: [PATCH 2/5] Add patch for breakpoints on ARM
+Date: Mon, 5 Feb 2018 11:08:09 +0300
+Subject: [PATCH 1/4] Add patch for breakpoints on ARM
+Signed-off-by: Igor Kulaychuk <i.kulaychuk@samsung.com>
+Signed-off-by: Dmitry Kovalenko <d.kovalenko@samsung.com>
---
packaging/coreclr.spec | 4 +-
packaging/fix-arm-breakpoints.patch | 133 ++++++++++++++++++++++++++++++++++++
create mode 100644 packaging/fix-arm-breakpoints.patch
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
-index 226c6d7..81311b1 100644
+index 89fd3047..013a4c2a 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -23,7 +23,7 @@ Source1000: downloaded_files.tar.gz
Source1001: %{name}.manifest
Source1002: libicu.tar.gz
Source1003: dep_libs.tar.gz
--# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
-+# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
- Patch0: Add-project.assets.json-files.patch
- Patch1: Add-Tizen-RuntimeID-case.patch
- Patch2: Change-O3-build-in-clang3.8.patch
-@@ -43,6 +43,7 @@ Patch15: 0001-Fix-CreateDump-related-undefined-reference-on-non-AM.patch
- Patch16: 0001-ARM-Linux-Enable-DacStackWalk.patch
- Patch17: profiling.patch
- Patch18: clear_cache.patch
-+Patch19: fix-arm-breakpoints.patch
+-# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
++# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
+ Patch0: 0001-Add-project.assets.json-files.patch
+ Patch1: 0001-ARM-Linux-Support-unaligned-struct-read-write-11290.patch
+ Patch2: 0002-x86-Linux-Thread-safe-UMThunkMarshInfo-RunTimeInit-1.patch
+@@ -62,6 +62,7 @@ Patch34: 0001-Fix-assert-in-HelperMethodFrame-UpdateRegDisplay-142.patch
+ Patch35: 0001-Fix-clrstack-command-of-lldb-sosplugin-on-x86-13973.patch
+ Patch36: 0001-Fix-typo-in-SetDebuggerREGDISPLAYFromREGDISPLAY-1422.patch
+ Patch37: 0001-Use-addresses-without-sign-extension-in-lldb-plugin-.patch
++Patch38: fix-arm-breakpoints.patch
- ExcludeArch: aarch64
-@@ -160,6 +161,7 @@ cp %{SOURCE1001} .
- %patch16 -p1
- %patch17 -p1
- %patch18 -p1
-+%patch19 -p1
+ ExcludeArch: aarch64
+@@ -204,6 +205,7 @@ cp %{SOURCE1001} .
+ %patch35 -p1
+ %patch36 -p1
+ %patch37 -p1
++%patch38 -p1
%if 0%{skipmscorlib}
%else
diff --git a/packaging/fix-arm-breakpoints.patch b/packaging/fix-arm-breakpoints.patch
new file mode 100644
-index 0000000..092a4e3
+index 00000000..092a4e39
--- /dev/null
+++ b/packaging/fix-arm-breakpoints.patch
@@ -0,0 +1,133 @@
+ {
+ // If this is breakpoint context, it is set up to point to an instruction after the break instruction.
--
-2.7.4
+2.13.6
-From 7b7b73c5ee5a152597f8547c5dc7d6786dd2938e Mon Sep 17 00:00:00 2001
+From e572cf64fed4ac7bdf574a504f68424a8cc14baf Mon Sep 17 00:00:00 2001
From: Igor Kulaychuk <i.kulaychuk@samsung.com>
Date: Thu, 24 Aug 2017 23:44:38 +0300
-Subject: [PATCH 3/5] Enable Debug IPC
+Subject: [PATCH 2/4] Enable Debug IPC
---
packaging/coreclr.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
-index 81311b1..57aedb5 100644
+index 013a4c2a..71cc6083 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
-@@ -255,7 +255,7 @@ export PAL_DBG_CHANNELS=""
+@@ -304,7 +304,7 @@ export PAL_DBG_CHANNELS=""
# No build native and mscorlib.
%else
# Build native only.
%endif
%else
%if 0%{skipnative}
-@@ -263,7 +263,7 @@ export PAL_DBG_CHANNELS=""
+@@ -312,7 +312,7 @@ export PAL_DBG_CHANNELS=""
./build.sh %{_barch} %{_buildtype} -skiprestore skipnative skipnuget %{testopt}
%else
# Build native and mscorlib.
%endif
--
-2.7.4
+2.13.6
-From 84eb6d8886363b7495881717e0d48fbe95ac6ec1 Mon Sep 17 00:00:00 2001
+From 7ee849fb6359f0f00223e9750a4e4d4550bc5bd6 Mon Sep 17 00:00:00 2001
From: Igor Kulaychuk <i.kulaychuk@samsung.com>
Date: Thu, 31 Aug 2017 20:22:56 +0300
-Subject: [PATCH 4/5] Add patch for undefined references in SOS
+Subject: [PATCH 3/4] Add patch for undefined references in SOS
+Signed-off-by: Igor Kulaychuk <i.kulaychuk@samsung.com>
+Signed-off-by: Dmitry Kovalenko <d.kovalenko@samsung.com>
---
packaging/coreclr.spec | 2 +
packaging/fix-undefined-references-in-sos.patch | 276 ++++++++++++++++++++++++
create mode 100644 packaging/fix-undefined-references-in-sos.patch
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
-index 57aedb5..917fbc2 100644
+index 71cc6083..20eda688 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
-@@ -44,6 +44,7 @@ Patch16: 0001-ARM-Linux-Enable-DacStackWalk.patch
- Patch17: profiling.patch
- Patch18: clear_cache.patch
- Patch19: fix-arm-breakpoints.patch
-+Patch20: fix-undefined-references-in-sos.patch
+@@ -63,6 +63,7 @@ Patch35: 0001-Fix-clrstack-command-of-lldb-sosplugin-on-x86-13973.patch
+ Patch36: 0001-Fix-typo-in-SetDebuggerREGDISPLAYFromREGDISPLAY-1422.patch
+ Patch37: 0001-Use-addresses-without-sign-extension-in-lldb-plugin-.patch
+ Patch38: fix-arm-breakpoints.patch
++Patch39: fix-undefined-references-in-sos.patch
- ExcludeArch: aarch64
-@@ -162,6 +163,7 @@ cp %{SOURCE1001} .
- %patch17 -p1
- %patch18 -p1
- %patch19 -p1
-+%patch20 -p1
+ ExcludeArch: aarch64
+@@ -206,6 +207,7 @@ cp %{SOURCE1001} .
+ %patch36 -p1
+ %patch37 -p1
+ %patch38 -p1
++%patch39 -p1
%if 0%{skipmscorlib}
%else
diff --git a/packaging/fix-undefined-references-in-sos.patch b/packaging/fix-undefined-references-in-sos.patch
new file mode 100644
-index 0000000..96d7bcf
+index 00000000..96d7bcf5
--- /dev/null
+++ b/packaging/fix-undefined-references-in-sos.patch
@@ -0,0 +1,276 @@
+-}
+-#endif
--
-2.7.4
+2.13.6
-From 765fdc841203909fcdbc13dfcc2ae91b0b1ebc85 Mon Sep 17 00:00:00 2001
+From 96fed12d0cc3b847be9f02e54f247288c539fc9d Mon Sep 17 00:00:00 2001
From: Igor Kulaychuk <i.kulaychuk@samsung.com>
Date: Thu, 14 Sep 2017 15:40:49 +0300
-Subject: [PATCH 5/5] Fix SetDebuggerREGDISPLAYFromREGDISPLAY() function on ARM
+Subject: [PATCH 4/4] Fix SetDebuggerREGDISPLAYFromREGDISPLAY() function on ARM
+Signed-off-by: Igor Kulaychuk <i.kulaychuk@samsung.com>
+Signed-off-by: Dmitry Kovalenko <d.kovalenko@samsung.com>
---
packaging/coreclr.spec | 2 ++
...x-arm-set-debuggerregdisplay-from-context.patch | 31 ++++++++++++++++++++++
create mode 100644 packaging/fix-arm-set-debuggerregdisplay-from-context.patch
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
-index 917fbc2..a0d03ff 100644
+index 20eda688..fb33455c 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
-@@ -45,6 +45,7 @@ Patch17: profiling.patch
- Patch18: clear_cache.patch
- Patch19: fix-arm-breakpoints.patch
- Patch20: fix-undefined-references-in-sos.patch
-+Patch21: fix-arm-set-debuggerregdisplay-from-context.patch
+@@ -64,6 +64,7 @@ Patch36: 0001-Fix-typo-in-SetDebuggerREGDISPLAYFromREGDISPLAY-1422.patch
+ Patch37: 0001-Use-addresses-without-sign-extension-in-lldb-plugin-.patch
+ Patch38: fix-arm-breakpoints.patch
+ Patch39: fix-undefined-references-in-sos.patch
++Patch40: fix-arm-set-debuggerregdisplay-from-context.patch
- ExcludeArch: aarch64
-@@ -164,6 +165,7 @@ cp %{SOURCE1001} .
- %patch18 -p1
- %patch19 -p1
- %patch20 -p1
-+%patch21 -p1
+ ExcludeArch: aarch64
+@@ -208,6 +209,7 @@ cp %{SOURCE1001} .
+ %patch37 -p1
+ %patch38 -p1
+ %patch39 -p1
++%patch40 -p1
%if 0%{skipmscorlib}
%else
diff --git a/packaging/fix-arm-set-debuggerregdisplay-from-context.patch b/packaging/fix-arm-set-debuggerregdisplay-from-context.patch
new file mode 100644
-index 0000000..7ddfc73
+index 00000000..7ddfc736
--- /dev/null
+++ b/packaging/fix-arm-set-debuggerregdisplay-from-context.patch
@@ -0,0 +1,31 @@
+ pDRD->SP = pRD->SP;
+ pDRD->PC = (SIZE_T)*(pRD->pPC);
--
-2.7.4
+2.13.6
projects / sdk / tools / netcoredbg.git / commitdiff