From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/1343 Path: news.gmane.org!not-for-mail From: Isaac Dunham Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH 5/10] __sigsetjmp alias Date: Sun, 22 Jul 2012 18:28:23 -0700 Message-ID: <20120722182823.417c8457@newbook> References: <20120722181332.191d4fa5@newbook> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/NPQ639X=eL=E9M_X.Istl79" X-Trace: dough.gmane.org 1343006924 8169 80.91.229.3 (23 Jul 2012 01:28:44 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 23 Jul 2012 01:28:44 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-1344-gllmg-musl=m.gmane.org@lists.openwall.com Mon Jul 23 03:28:40 2012 Return-path: Envelope-to: gllmg-musl@plane.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1St7Rv-0007rL-Dl for gllmg-musl@plane.gmane.org; Mon, 23 Jul 2012 03:28:39 +0200 Original-Received: (qmail 16083 invoked by uid 550); 23 Jul 2012 01:28:38 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 16073 invoked from network); 23 Jul 2012 01:28:38 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=lavabit; d=lavabit.com; b=6uwQwFpMxOZDNWSouUgswf0kf+ytcgDfkdFttBZ6+izNceZ47nI+9lY3QUS/29zm/1DYn1Goec84UjjY1Knm5ejZvzmjgQim+7bIGz4RRPWv2uGqNqrFLk4OcaoQCa7ch6IQCzmXjLu1DXoFMNuYWSpCMkTvX/SUP7MH4NHw23Y=; h=Date:From:To:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type; In-Reply-To: <20120722181332.191d4fa5@newbook> X-Mailer: Claws Mail 3.7.4 (GTK+ 2.20.1; i486-pc-linux-gnu) Xref: news.gmane.org gmane.linux.lib.musl.general:1343 Archived-At: --MP_/NPQ639X=eL=E9M_X.Istl79 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Sun, 22 Jul 2012 18:13:32 -0700 Isaac Dunham wrote: > This patch series is basically a reworked version of orc's previous > patch. Here, I had to guess and add aliases for arm & mips. At this point, the mips alias isn't meaningful, since mips is static only, but here's hoping it works sometime... Isaac Dunham --MP_/NPQ639X=eL=E9M_X.Istl79 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=5-sigset.diff diff --git a/src/signal/arm/sigsetjmp.s b/src/signal/arm/sigsetjmp.s index acb0301..654b6c6 100644 --- a/src/signal/arm/sigsetjmp.s +++ b/src/signal/arm/sigsetjmp.s @@ -1,6 +1,9 @@ .global sigsetjmp .type sigsetjmp,%function +.weak __sigsetjmp +.type __sigsetjmp,%function sigsetjmp: +__sigsetjmp: str a2,[a1,#256] tst a2,a2 beq setjmp diff --git a/src/signal/i386/sigsetjmp.s b/src/signal/i386/sigsetjmp.s index 06e0a61..7a53e19 100644 --- a/src/signal/i386/sigsetjmp.s +++ b/src/signal/i386/sigsetjmp.s @@ -1,6 +1,9 @@ .global sigsetjmp .type sigsetjmp,@function +.weak __sigsetjmp +.type __sigsetjmp,@function sigsetjmp: +__sigsetjmp: mov 4(%esp),%eax mov 8(%esp),%ecx mov %ecx,24(%eax) diff --git a/src/signal/mips/sigsetjmp.s b/src/signal/mips/sigsetjmp.s index ae9c542..de7328c 100644 --- a/src/signal/mips/sigsetjmp.s +++ b/src/signal/mips/sigsetjmp.s @@ -2,7 +2,10 @@ .global sigsetjmp .type sigsetjmp,@function +.weak __sigsetjmp +.type __sigsetjmp,@function sigsetjmp: +__sigsetjmp: lui $gp, %hi(_gp_disp) addiu $gp, %lo(_gp_disp) beq $5, $0, 1f diff --git a/src/signal/x86_64/sigsetjmp.s b/src/signal/x86_64/sigsetjmp.s index 94d7148..da0028b 100644 --- a/src/signal/x86_64/sigsetjmp.s +++ b/src/signal/x86_64/sigsetjmp.s @@ -1,7 +1,10 @@ /* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */ .global sigsetjmp .type sigsetjmp,@function +.weak __sigsetjmp +.type __sigsetjmp,@function sigsetjmp: +__sigsetjmp: andl %esi,%esi movq %rsi,64(%rdi) jz 1f --MP_/NPQ639X=eL=E9M_X.Istl79--