From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14682 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Andre McCurdy Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] arm: avoid conditional branch to PLT in sigsetjmp.s Date: Tue, 17 Sep 2019 23:04:05 -0700 Message-ID: <20190918060405.17630-1-armccurdy@gmail.com> Reply-To: musl@lists.openwall.com Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="201259"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Andre McCurdy To: musl@lists.openwall.com Original-X-From: musl-return-14698-gllmg-musl=m.gmane.org@lists.openwall.com Wed Sep 18 08:04:33 2019 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.89) (envelope-from ) id 1iAT4p-000qEJ-PR for gllmg-musl@m.gmane.org; Wed, 18 Sep 2019 08:04:31 +0200 Original-Received: (qmail 18139 invoked by uid 550); 18 Sep 2019 06:04:27 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 18107 invoked from network); 18 Sep 2019 06:04:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q4lcYMyNSiO0eCatZjZQUDDr5fKL2fG9/HM8w+RB6ng=; b=K6+lRS3RaIejdOgKzcUyPXFMgrdEOKdEbTt3rq8s4A9gRANAKJjwQ9/XMcz2kF4pTp 9vSlrlCMfORKSi+gvf6tUlgjxcMqd+iUVJiZlZ4eYgbNXTsg7sNtyetY7a+/vwx49AF9 xXhVxbqTghSSc+ODppGDZ/m7t+UyzePljug0/FlgnOvbUBUyua7XufY7m0O07UXieBym 3qQnCAmO956H7Dhr3rsibOsfnC4m0TWYjc69NcT77f+LnrkM12FlWF4v1kyW5IkLoQqu 3A56JkRjOY0zm9GTJ8I8x/glKdL11FPgKqw5aJ/8R9PJ/dZm1P0evpBKz4S4evVRPRVA fEjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q4lcYMyNSiO0eCatZjZQUDDr5fKL2fG9/HM8w+RB6ng=; b=O714WxmvI+cNm/W0rjLpcyno/Go2kRMHpsCs/n0KPu1Yb/vz+OUbRv0KO14K9ObYYB 3IvRUtU9x0xJZX5mg03yvBd6BUyvENJ+W36Z5tKm5yDnyMhMK7wIP0+v+vq4VZc1ObxN IW8BDAUd5WEexiHvCXgVwHuXFEoPiiVwhmBE7Q1xyCcrOc0zX9sWVKLuvhwlzL2Y9LEs OMUJ/bMQuI73m9EtpAdhqP4QYGRsTgglwDkYmqqIrtLmQUSt8OzJInncjnN20GVGTQBs 3sGFbw7CDfPimMORUx8rIVnOS6pQRQyjGSEJ99kxkN/fU2Lwr0CM6TyxKEJ6dgZuUfon HDsw== X-Gm-Message-State: APjAAAX5+5Ctj3z/HusKbYD7KSlGDmKDbWKdYR87A072ylxSlMlVisyI 291AcZwPEOdlFPerUGNDxKlv4tnj X-Google-Smtp-Source: APXvYqxt40+NU4f9Cz11nA6LN7qIZCuSf0D9/w/SjiuiuQTUiO86BBsqEhLf9nBYjzhrVMT+RghODg== X-Received: by 2002:a65:4b89:: with SMTP id t9mr2364617pgq.55.1568786654840; Tue, 17 Sep 2019 23:04:14 -0700 (PDT) X-Mailer: git-send-email 2.23.0 Xref: news.gmane.org gmane.linux.lib.musl.general:14682 Archived-At: The R_ARM_THM_JUMP19 relocation type generated for the original code when targeting Thumb 2 is not supported by the gold linker: | .../arm-oe-linux-musleabi/9.2.0/ld: error: conditional branch to PLT in THUMB-2 not supported yet. | src/signal/arm/sigsetjmp.s:9: error: unexpected opcode while processing relocation R_ARM_THM_JUMP19 --- src/signal/arm/sigsetjmp.s | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/signal/arm/sigsetjmp.s b/src/signal/arm/sigsetjmp.s index 318addba..69ebbf49 100644 --- a/src/signal/arm/sigsetjmp.s +++ b/src/signal/arm/sigsetjmp.s @@ -6,9 +6,10 @@ sigsetjmp: __sigsetjmp: tst r1,r1 - beq setjmp + bne 1f + b setjmp - str lr,[r0,#256] +1: str lr,[r0,#256] str r4,[r0,#260+8] mov r4,r0 -- 2.23.0