From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27608 invoked by alias); 4 May 2010 12:27:19 -0000 Received: (qmail 27592 invoked by uid 22791); 4 May 2010 12:27:17 -0000 X-SWARE-Spam-Status: No, hits=-0.4 required=5.0 tests=AWL,BAYES_40,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from relay.ptn-ipout01.plus.net (HELO relay.ptn-ipout01.plus.net) (212.159.7.35) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 04 May 2010 12:27:12 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArMEAOuv30vUnwpB/2dsb2JhbACRDo0UuzeFEwQ Received: from mailc01.plus.net (HELO pih-smtp-proxy01.plus.net) ([212.159.10.65]) by relay.ptn-ipout01.plus.net with ESMTP; 04 May 2010 13:27:09 +0100 Received: from [80.189.249.164] (helo=[192.168.0.2]) by pih-smtp-proxy01.plus.net with esmtp (Exim 4.63) (envelope-from ) id 1O9HDR-0000e9-3k for ecos-patches@ecos.sourceware.org; Tue, 04 May 2010 13:27:09 +0100 Received: from 127.0.0.1 (AVG SMTP 9.0.814 [271.1.1/2852]); Tue, 04 May 2010 13:27:17 +0100 Message-ID: <4BE012A5.1050907@spen-soft.co.uk> Date: Tue, 04 May 2010 12:27:00 -0000 From: Spencer Oliver User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.1.9) Gecko/20100317 Lightning/1.0b1 Thunderbird/3.0.4 MIME-Version: 1.0 To: ecos-patches@ecos.sourceware.org Subject: [PATCH] when building using binutils 2.20: Content-Type: multipart/mixed; boundary="------------050803030908040305080007" X-IsSubscribed: yes Mailing-List: contact ecos-patches-help@ecos.sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: ecos-patches-owner@ecos.sourceware.org X-SW-Source: 2010-05/txt/msg00001.txt.bz2 This is a multi-part message in MIME format. --------------050803030908040305080007 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 145 cortex_m3: buildfix for binutils 2.20 when building using binutils 2.20: - swi inst now requires an argument. - msr psp,sp is not allowed. --------------050803030908040305080007 Content-Type: text/plain; name="ecos.hg_rev2948.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="ecos.hg_rev2948.patch" Content-length: 2469 # HG changeset patch # User Spencer Oliver # Date 1272975499 -3600 # Node ID d31e3aac03a66dd841d6b9a48c1261c00b437475 # Parent 9b59569aaea99c165f8b838325d2f6bd4951ab36 cortex_m3: buildfix for binutils 2.20 when building using binutils 2.20: - swi inst now requires an argument. - msr psp,sp is not allowed. diff -r 9b59569aaea9 -r d31e3aac03a6 packages/hal/cortexm/arch/current/include/hal_intr.h --- a/packages/hal/cortexm/arch/current/include/hal_intr.h Fri Apr 23 12:01:39 2010 +0000 +++ b/packages/hal/cortexm/arch/current/include/hal_intr.h Tue May 04 13:18:19 2010 +0100 @@ -298,7 +298,7 @@ { \ __asm__ volatile ( \ "ldr r3,=hal_call_dsrs_vsr \n" \ - "swi \n" \ + "swi 0 \n" \ : \ : \ : "r3" \ diff -r 9b59569aaea9 -r d31e3aac03a6 packages/hal/cortexm/arch/current/src/hal_misc.c --- a/packages/hal/cortexm/arch/current/src/hal_misc.c Fri Apr 23 12:01:39 2010 +0000 +++ b/packages/hal/cortexm/arch/current/src/hal_misc.c Tue May 04 13:18:19 2010 +0100 @@ -185,7 +185,7 @@ hal_vsr_table[CYGNUM_HAL_VECTOR_SERVICE] = (CYG_ADDRESS)hal_switch_state_vsr; - __asm__ volatile( "swi" ); + __asm__ volatile( "swi 0" ); hal_vsr_table[CYGNUM_HAL_VECTOR_SERVICE] = (CYG_ADDRESS)hal_default_svc_vsr; diff -r 9b59569aaea9 -r d31e3aac03a6 packages/hal/cortexm/arch/current/src/vectors.S --- a/packages/hal/cortexm/arch/current/src/vectors.S Fri Apr 23 12:01:39 2010 +0000 +++ b/packages/hal/cortexm/arch/current/src/vectors.S Tue May 04 13:18:19 2010 +0100 @@ -130,7 +130,8 @@ msr control,r0 isb // Insert a barrier - msr psp,sp // Copy SP to PSP + mov r0,sp + msr psp,r0 // Copy SP to PSP #if !defined(CYGPKG_KERNEL) sub sp,#(CYGNUM_HAL_COMMON_INTERRUPTS_STACK_SIZE/2) @@ -274,7 +275,7 @@ hal_interrupt_end_done: ldr r3,=hal_interrupt_end_vsr - swi + swi 0 //========================================================================== // Interrupt end VSR --------------050803030908040305080007--