From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31821 invoked by alias); 23 Jan 2014 11:49:43 -0000 Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org Received: (qmail 31811 invoked by uid 89); 23 Jan 2014 11:49:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f53.google.com Received: from mail-wg0-f53.google.com (HELO mail-wg0-f53.google.com) (74.125.82.53) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 23 Jan 2014 11:49:42 +0000 Received: by mail-wg0-f53.google.com with SMTP id y10so1310065wgg.8 for ; Thu, 23 Jan 2014 03:49:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=S60/BbMGz7r5dzEW4RbGq55g7ph33lhsCSNdauNXr7E=; b=JK/igpSPqH2+lWDzFleTe5IS8tf3xo5OSXJzPUSE+M3h656SsOv4RQJ0LCig5XYnT5 2YgsrT2D2dobhxVjyRHg+ZWtOQZhmug8QVZMnJ+I95XZDKc6OcROCcc2q2d9xKc79yDC 1l1F/ucCrFNeim+B7zNFza/pS25q9ud/RUv86TPtgnS3EBEDjTGofPx69Xb+KvlTkEXU fhXxgbhUfart1JOiCc8IPMFVU3wSk19tmqd1uhIIeWTyBZvNBETIvt9r76OxBlLLsP+x MJW+e2DtxTSG1RyjAglBvaOar4XvxUggg9N7rx5iemTyia13n01N0wqkNqvwo9ZdX9kU NcOA== X-Gm-Message-State: ALoCoQk3q3DFMKGYqQykUpIRD5tVCavI9X0VDfYiM1GEdQBy9no/oecAHQEpRNlgcTEQqyuSmZZt X-Received: by 10.194.170.133 with SMTP id am5mr6320777wjc.42.1390477778962; Thu, 23 Jan 2014 03:49:38 -0800 (PST) Received: from localhost.localdomain (cpc6-seac21-2-0-cust453.7-2.cable.virginm.net. [82.1.113.198]) by mx.google.com with ESMTPSA id uq2sm21700279wjc.5.2014.01.23.03.49.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jan 2014 03:49:38 -0800 (PST) From: Will Newton To: libc-ports@sourceware.org Cc: patches@linaro.org, Will Newton Subject: [PATCH] ARM: Fix clone build for ARMv4 Date: Thu, 23 Jan 2014 11:49:00 -0000 Message-Id: <1390477771-30826-1-git-send-email-will.newton@linaro.org> X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg00052.txt.bz2 ARMv4 does not have the blx instruction, so use the BLX macro which handles abstracting this for us. ports/ChangeLog.arm: 2014-01-23 Will Newton [BZ #16499] * sysdeps/unix/sysv/linux/arm/clone.S: Use BLX macro instead of blx instruction directly. --- ports/sysdeps/unix/sysv/linux/arm/clone.S | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ports/sysdeps/unix/sysv/linux/arm/clone.S b/ports/sysdeps/unix/sysv/linux/arm/clone.S index 44286a5..03fe9ab 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/clone.S +++ b/ports/sysdeps/unix/sysv/linux/arm/clone.S @@ -88,14 +88,8 @@ PSEUDO_END (__clone) #endif @ pick the function arg and call address off the stack and execute ldr r0, [sp, #4] -#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__) ldr ip, [sp], #8 - mov lr, pc - bx ip -#else - ldr lr, [sp], #8 - blx lr -#endif + BLX (ip) @ and we are done, passing the return value through r0 b PLTJMP(HIDDEN_JUMPTARGET(_exit)) -- 1.8.1.4