From patchwork Thu Nov 7 12:38:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 289308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 7C0452C008E for ; Thu, 7 Nov 2013 23:38:49 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7F99A8A90F; Thu, 7 Nov 2013 12:38:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Zxb5yyQnakJu; Thu, 7 Nov 2013 12:38:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1668F888E9; Thu, 7 Nov 2013 12:38:46 +0000 (UTC) X-Original-To: uclibc@lists.busybox.net Delivered-To: uclibc@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C3D4A1BF94C for ; Thu, 7 Nov 2013 12:38:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BC75093C73 for ; Thu, 7 Nov 2013 12:38:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3WEsIO7PP-1j for ; Thu, 7 Nov 2013 12:38:42 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from sivan.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by hemlock.osuosl.org (Postfix) with ESMTP id 04B0993C1F for ; Thu, 7 Nov 2013 12:38:42 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) by sivan.tkos.co.il (Postfix) with ESMTPA id C1DBCB4FA6; Thu, 7 Nov 2013 14:38:41 +0200 (IST) From: Baruch Siach To: uclibc@uclibc.org Subject: [PATCH v4 2/2] librt: fix mq_timed{send, receive} return instructions Date: Thu, 7 Nov 2013 14:38:18 +0200 Message-Id: <440f1485bb7d2feb54c1188ffd54217b155d4208.1383827721.git.baruch@tkos.co.il> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <10c2c5c130aa3c1f3aef2161e0428058d9078abf.1383827721.git.baruch@tkos.co.il> References: <10c2c5c130aa3c1f3aef2161e0428058d9078abf.1383827721.git.baruch@tkos.co.il> X-BeenThere: uclibc@uclibc.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Discussion and development of uClibc \(the embedded C library\)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: uclibc-bounces@uclibc.org Sender: uclibc-bounces@uclibc.org Not all architectures use 'ret' as function return instruction. For example, xtensa usually uses 'retw'. Use the ret_ERRVAL arch dependant macro instead. Signed-off-by: Baruch Siach --- v4: Split architecture ret_ERRVAL change to a separate patch as suggested by Bernhard Reutner-Fischer v3: Add a common ret_ERRVAL, and redefine for special archs (Bernhard Reutner-Fischer) v2: Add ret_ERRVAL to architectures missing it as noted by Bernhard Reutner-Fischer. --- librt/mq_timedreceive.S | 2 +- librt/mq_timedsend.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/librt/mq_timedreceive.S b/librt/mq_timedreceive.S index 43a5fda..00fecac 100644 --- a/librt/mq_timedreceive.S +++ b/librt/mq_timedreceive.S @@ -3,6 +3,6 @@ #error Missing definition of NR_timedreceive needed for cancellation. #endif PSEUDO(mq_timedreceive, mq_timedreceive, 5) -ret +ret_ERRVAL PSEUDO_END(mq_timedreceive) librt_hidden_def(mq_timedreceive) diff --git a/librt/mq_timedsend.S b/librt/mq_timedsend.S index 13d91da..ee8d483 100644 --- a/librt/mq_timedsend.S +++ b/librt/mq_timedsend.S @@ -3,6 +3,6 @@ #error Missing definition of NR_timedsend needed for cancellation. #endif PSEUDO(mq_timedsend, mq_timedsend, 5) -ret +ret_ERRVAL PSEUDO_END(mq_timedsend) librt_hidden_def(mq_timedsend)