From 6101d1e80ec0cc16ff134eb7bbb4109bcde87fba Mon Sep 17 00:00:00 2001
From: bernard <bernard.xiong@rt-thread.com>
Date: Tue, 17 Oct 2017 09:53:16 +0800
Subject: [PATCH] [BSP] Update QEMU VExpress A9 BSP.

---
 bsp/qemu-vexpress-a9/applications/SConscript | 4 ++--
 bsp/qemu-vexpress-a9/drivers/SConscript      | 6 +-----
 bsp/qemu-vexpress-a9/drivers/board.c         | 2 +-
 bsp/qemu-vexpress-a9/link.lds                | 4 ++++
 bsp/qemu-vexpress-a9/rtconfig.py             | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bsp/qemu-vexpress-a9/applications/SConscript b/bsp/qemu-vexpress-a9/applications/SConscript
index 01eb940dfb..2ec6848e1d 100644
--- a/bsp/qemu-vexpress-a9/applications/SConscript
+++ b/bsp/qemu-vexpress-a9/applications/SConscript
@@ -2,8 +2,8 @@ Import('RTT_ROOT')
 Import('rtconfig')
 from building import *
 
-cwd     = os.path.join(str(Dir('#')), 'applications')
-src	= Glob('*.c')
+cwd     = GetCurrentDir()
+src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd, str(Dir('#'))]
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
diff --git a/bsp/qemu-vexpress-a9/drivers/SConscript b/bsp/qemu-vexpress-a9/drivers/SConscript
index 9987f53e4b..e98eb13101 100644
--- a/bsp/qemu-vexpress-a9/drivers/SConscript
+++ b/bsp/qemu-vexpress-a9/drivers/SConscript
@@ -1,11 +1,7 @@
-import copy
-Import('RTT_ROOT')
-Import('rtconfig')
 from building import *
 
 cwd     = GetCurrentDir()
-src	= Glob('*.c')
-
+src     = Glob('*.c')
 CPPPATH = [cwd]
 
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
diff --git a/bsp/qemu-vexpress-a9/drivers/board.c b/bsp/qemu-vexpress-a9/drivers/board.c
index 4c63b297d6..8be0a47103 100644
--- a/bsp/qemu-vexpress-a9/drivers/board.c
+++ b/bsp/qemu-vexpress-a9/drivers/board.c
@@ -14,7 +14,6 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <components.h>
 
 #include "board.h"
 
@@ -89,3 +88,4 @@ void rt_hw_board_init(void)
 
     rt_thread_idle_sethook(idle_wfi);
 }
+
diff --git a/bsp/qemu-vexpress-a9/link.lds b/bsp/qemu-vexpress-a9/link.lds
index 4a30d56a22..51b2ced922 100644
--- a/bsp/qemu-vexpress-a9/link.lds
+++ b/bsp/qemu-vexpress-a9/link.lds
@@ -36,6 +36,10 @@ SECTIONS
     } =0
     __text_end = .;
 
+    __exidx_start = .;
+    .ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
+    __exidx_end = .;
+
     __rodata_start = .;
     .rodata   : { *(.rodata) *(.rodata.*) }
     __rodata_end = .;
diff --git a/bsp/qemu-vexpress-a9/rtconfig.py b/bsp/qemu-vexpress-a9/rtconfig.py
index d11f0aa432..0bd53277f5 100644
--- a/bsp/qemu-vexpress-a9/rtconfig.py
+++ b/bsp/qemu-vexpress-a9/rtconfig.py
@@ -27,7 +27,7 @@ if PLATFORM == 'gcc':
     CXX = PREFIX + 'g++'
     AS = PREFIX + 'gcc'
     AR = PREFIX + 'ar'
-    LINK = PREFIX + 'gcc'
+    LINK = PREFIX + 'g++'
     TARGET_EXT = 'elf'
     SIZE = PREFIX + 'size'
     OBJDUMP = PREFIX + 'objdump'
-- 
GitLab