summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-05-02 05:21:47 (GMT)
committerJiyoung Yun <jy910.yun@samsung.com>2017-05-02 05:25:01 (GMT)
commit3e5a8d0b83690eb8a89ebcd311c6fef9fb93cd27 (patch)
tree481ed871bdf581c16300bcaf01f4dcbb552f9e63
parent7a002575bdd550283ad8dff9756334ff9316c8cc (diff)
downloadcoreclr-3e5a8d0b83690eb8a89ebcd311c6fef9fb93cd27.zip
coreclr-3e5a8d0b83690eb8a89ebcd311c6fef9fb93cd27.tar.gz
coreclr-3e5a8d0b83690eb8a89ebcd311c6fef9fb93cd27.tar.bz2
Do not create /tmp/clr-debug-pipe* files Change-Id: If1dbf2d3f587a41a16d68811d3ffdaad11be24dd Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
-rw-r--r--packaging/Enable_build_with_FEATURE_DBGIPC.patch45
-rw-r--r--packaging/coreclr.spec8
2 files changed, 50 insertions, 3 deletions
diff --git a/packaging/Enable_build_with_FEATURE_DBGIPC.patch b/packaging/Enable_build_with_FEATURE_DBGIPC.patch
new file mode 100644
index 0000000..ae46878
--- /dev/null
+++ b/packaging/Enable_build_with_FEATURE_DBGIPC.patch
@@ -0,0 +1,45 @@
+From 524f53e95807f856aa099ccf4f4a950e0fb9d5dc Mon Sep 17 00:00:00 2001
+From: Jonghyun Park <parjong@gmail.com>
+Date: Thu, 27 Apr 2017 13:45:39 +0900
+Subject: [PATCH] [ARM/Linux] Enable build with FEATURE_DBGIPC=0
+
+---
+ src/debug/di/cordb.cpp | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/debug/di/cordb.cpp b/src/debug/di/cordb.cpp
+index e6ed44d..8fb67cf 100644
+--- a/src/debug/di/cordb.cpp
++++ b/src/debug/di/cordb.cpp
+@@ -20,6 +20,13 @@
+ #include "dbgtransportmanager.h"
+ #endif // FEATURE_DBGIPC_TRANSPORT_DI
+
++#if defined(PLATFORM_UNIX) || defined(__ANDROID__)
++// _aligned_malloc and _aligned_free are unavailable on POSIX and Android
++#define HAVE_ALIGNED_MALLOC 0
++#else
++#define HAVE_ALIGNED_MALLOC 1
++#endif
++
+ //********** Globals. *********************************************************
+ #ifndef FEATURE_PAL
+ HINSTANCE g_hInst; // Instance handle to this piece of code.
+@@ -499,7 +506,7 @@ DbiGetThreadContext(HANDLE hThread,
+ DT_CONTEXT *lpContext)
+ {
+ // if we aren't local debugging this isn't going to work
+-#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || defined(__ANDROID__)
++#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || !HAVE_ALIGNED_MALLOC
+ _ASSERTE(!"Can't use local GetThreadContext remotely, this needed to go to datatarget");
+ return FALSE;
+ #else
+@@ -538,7 +545,7 @@ BOOL
+ DbiSetThreadContext(HANDLE hThread,
+ const DT_CONTEXT *lpContext)
+ {
+-#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || defined(__ANDROID__)
++#if !defined(_ARM_) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || !HAVE_ALIGNED_MALLOC
+ _ASSERTE(!"Can't use local GetThreadContext remotely, this needed to go to datatarget");
+ return FALSE;
+ #else
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 26fa815..07aea25 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -23,10 +23,11 @@ Source1000: downloaded_files.tar.gz
Source1001: %{name}.manifest
Source1002: libicu.tar.gz
Source1003: dep_libs.tar.gz
-# Gbp-Ignore-Patches: 0 1 2
+# Gbp-Ignore-Patches: 0 1 2 3
Patch0: Add-project.lock.json-files.patch
Patch1: Add-Tizen-RuntimeID-case.patch
Patch2: Change-O3-build-in-clang3.8.patch
+Patch3: Enable_build_with_FEATURE_DBGIPC.patch
ExcludeArch: aarch64
@@ -114,6 +115,7 @@ cp %{SOURCE1001} .
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
cp %{SOURCE1000} ./
tar xf %{SOURCE1000}
%ifarch %{arm} %{ix86}
@@ -233,7 +235,7 @@ export PAL_DBG_CHANNELS=""
# No build native and mscorlib.
%else
# Build native only.
-./build.sh %{_barch} %{_buildtype} clang3.8 skipmscorlib skipgenerateversion skipnuget %{testopt} stripSymbols cmakeargs -DFEATURE_GDBJIT=TRUE
+./build.sh %{_barch} %{_buildtype} clang3.8 skipmscorlib skipgenerateversion skipnuget %{testopt} stripSymbols cmakeargs -DFEATURE_GDBJIT=TRUE cmakeargs -DFEATURE_DBGIPC=0
%endif
%else
%if 0%{skipnative}
@@ -241,7 +243,7 @@ export PAL_DBG_CHANNELS=""
./build.sh %{_barch} %{_buildtype} -skiprestore skipnative skipnuget %{testopt}
%else
# Build native and mscorlib.
-./build.sh %{_barch} %{_buildtype} clang3.8 skipgenerateversion -skiprestore skipnuget %{testopt} stripSymbols cmakeargs -DFEATURE_GDBJIT=TRUE
+./build.sh %{_barch} %{_buildtype} clang3.8 skipgenerateversion -skiprestore skipnuget %{testopt} stripSymbols cmakeargs -DFEATURE_GDBJIT=TRUE cmakeargs -DFEATURE_DBGIPC=0
%endif
%endif