From 1fa57117120a65eed9ac38664048b04ed00c9d1c Mon Sep 17 00:00:00 2001 From: aozima Date: Fri, 22 May 2015 16:48:01 +0800 Subject: [PATCH 1/2] fixed assembly warnings. --- libcpu/arm/cortex-m4/context_rvds.S | 1 - 1 file changed, 1 deletion(-) diff --git a/libcpu/arm/cortex-m4/context_rvds.S b/libcpu/arm/cortex-m4/context_rvds.S index d7cb34d5c3..fa7a1c90f8 100644 --- a/libcpu/arm/cortex-m4/context_rvds.S +++ b/libcpu/arm/cortex-m4/context_rvds.S @@ -205,7 +205,6 @@ rt_hw_context_switch_to PROC LDR r0, =SCB_VTOR LDR r0, [r0] LDR r0, [r0] - NOP MSR msp, r0 ; enable interrupts at processor level From 6230ff81ccbf3834727c7b62e6228ba1d6716339 Mon Sep 17 00:00:00 2001 From: aozima Date: Fri, 22 May 2015 16:49:07 +0800 Subject: [PATCH 2/2] fixed scons building error when use LIB. --- tools/keil.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/keil.py b/tools/keil.py index 16fc0d1fc5..4cf07a0741 100644 --- a/tools/keil.py +++ b/tools/keil.py @@ -75,6 +75,8 @@ def MDK4AddGroupForFN(ProjectFiles, parent, name, filename, project_path): obj_name = name.replace('.s', '.o') elif name.find('.S') != -1: obj_name = name.replace('.s', '.o') + else: + obj_name = name if ProjectFiles.count(obj_name): name = basename + '_' + name @@ -272,6 +274,8 @@ def MDK5AddGroup(ProjectFiles, parent, name, files, project_path): obj_name = name.replace('.s', '.o') elif name.find('.S') != -1: obj_name = name.replace('.s', '.o') + else: + obj_name = name if ProjectFiles.count(obj_name): name = basename + '_' + name