All of lore.kernel.org
 help / color / mirror / Atom feed
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][PATCH] wvstreams: Disable calls to makecontext on musl
Date: Fri, 11 Oct 2019 10:28:18 -0700	[thread overview]
Message-ID: <20191011172818.718226-1-raj.khem@gmail.com> (raw)

makecontext API is deprecated and not implemented in musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...nt-use-ucontext-on-non-glibc-systems.patch | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch
index 232db9e63b..ac4dd81ce8 100644
--- a/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch
+++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch
@@ -8,8 +8,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  utils/wvtask.cc | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
-diff --git a/utils/wvtask.cc b/utils/wvtask.cc
-index cdcd544..c0bff7d 100644
 --- a/utils/wvtask.cc
 +++ b/utils/wvtask.cc
 @@ -199,7 +199,9 @@ WvTaskMan::WvTaskMan()
@@ -22,7 +20,7 @@ index cdcd544..c0bff7d 100644
      if (context_return == 0)
      {
  	// initial setup - start the stackmaster() task (never returns!)
-@@ -265,13 +267,17 @@ int WvTaskMan::run(WvTask &task, int val)
+@@ -265,13 +267,17 @@ int WvTaskMan::run(WvTask &task, int val
  	state = &old_task->mystate;
      
      context_return = 0;
@@ -68,7 +66,7 @@ index cdcd544..c0bff7d 100644
      if (context_return == 0)
      {
  	assert(magic_number == -WVTASK_MAGIC);
-@@ -371,7 +383,9 @@ void WvTaskMan::get_stack(WvTask &task, size_t size)
+@@ -371,7 +383,9 @@ void WvTaskMan::get_stack(WvTask &task,
  	// initial setup
  	stack_target = &task;
  	context_return = size/1024 + (size%1024 > 0);
@@ -108,7 +106,7 @@ index cdcd544..c0bff7d 100644
      if (context_return == 0)
      {
  	// done the setjmp; that means the target task now has
-@@ -510,7 +530,9 @@ void WvTaskMan::do_task()
+@@ -510,20 +530,25 @@ void WvTaskMan::do_task()
                  }
                  else
                  {
@@ -118,9 +116,14 @@ index cdcd544..c0bff7d 100644
                      task->func_call.uc_stack.ss_size = task->stacksize;
                      task->func_call.uc_stack.ss_sp = task->stack;
                      task->func_call.uc_stack.ss_flags = 0;
-@@ -521,9 +543,11 @@ void WvTaskMan::do_task()
+                     task->func_call.uc_link = &task->func_return;
++#ifdef __GLIBC__
+                     Dprintf("WvTaskMan: makecontext #%d (%s)\n",
+                             task->tid, (const char *)task->name);
+                     makecontext(&task->func_call,
                              (void (*)(void))call_func, 1, task);
- 
+-
++#endif
                      context_return = 0;
 +#ifdef __GLIBC__
                      assert(getcontext(&task->func_return) == 0);
@@ -130,6 +133,3 @@ index cdcd544..c0bff7d 100644
                  }
  		
  		// the task's function terminated.
--- 
-2.13.3
-
-- 
2.23.0



             reply	other threads:[~2019-10-11 17:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-11 17:28 Khem Raj [this message]
2019-10-11 19:05 ` [meta-oe][PATCH] wvstreams: Disable calls to makecontext on musl Adrian Bunk
2019-10-11 23:52   ` Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191011172818.718226-1-raj.khem@gmail.com \
    --to=raj.khem@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.