Skip to content

Commit 20948ad

Browse files
0xc01700xc0170
committed
Merge pull request #1535 from sg-/remove-gcc-cw
Remove stale gcc tools
2 parents 9dcb51c + c7f84c8 commit 20948ad

File tree

16 files changed

+53
-351
lines changed

16 files changed

+53
-351
lines changed

‎docs/BUILDING.md

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ Compiler | Mbed SDK Abbreviation | Example Version
104104
-----------------------|-----------------------|-----------
105105
Keil ARM Compiler | ARM, uARM | ARM C/C++ Compiler, 5.03 [Build 117]
106106
GCC ARM | GCC_ARM | gcc version 4.8.3 20131129 (release)
107-
GCC CodeSourcery | GCC_CS | gcc version 4.8.1 (Sourcery CodeBench Lite 2013.11-24)
108107
GCC CodeRed | GCC_CR | gcc version 4.6.2 20121016 (release)
109108
IAR Embedded Workbench | IAR | IAR ANSI C/C++ Compiler V6.70.1.5641/W32 for ARM
110109

@@ -174,9 +173,6 @@ MY_ARM_CLIB = join(ARM_PATH, "lib", "microlib")
174173
# GCC ARM
175174
GCC_ARM_PATH = "C:/Work/toolchains/gcc_arm_4_8/4_8_2013q4/bin"
176175

177-
# GCC CodeSourcery
178-
GCC_CS_PATH = "C:/Work/toolchains/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
179-
180176
# GCC CodeRed
181177
GCC_CR_PATH = "C:/Work/toolchains/LPCXpresso_6.1.4_194/lpcxpresso/tools/bin"
182178

@@ -194,17 +190,15 @@ MUTs = {
194190
Note: You need to provide the absolute path to your compiler(s) installed on your host machine. Replace corresponding variable values with paths to compilers installed in your system:
195191
* ```ARM_PATH``` for armcc compiler.
196192
* ```GCC_ARM_PATH``` for GCC ARM compiler.
197-
* ```GCC_CS_PATH``` for GCC CodeSourcery compiler.
198193
* ```GCC_CR_PATH``` for GCC CodeRed compiler.
199194
* ```IAR_PATH``` for IAR compiler.
200195

201196
If for example you do not use ```IAR``` compiler you do not have to modify anything. Workspace tools will use ```IAR_PATH`` variable only if you explicit ask for it from command line. So do not worry and replace only paths for your installed compilers.
202197

203-
Note: Because this is a Python script and ```ARM_PATH```, ```GCC_ARM_PATH```, ```GCC_CS_PATH```, ```GCC_CR_PATH```, ```IAR_PATH``` are Python string variables please use double backlash or single slash as path's directories delimiter to avoid incorrect path format. For example:
198+
Note: Because this is a Python script and ```ARM_PATH```, ```GCC_ARM_PATH```, ```GCC_CR_PATH```, ```IAR_PATH``` are Python string variables please use double backlash or single slash as path's directories delimiter to avoid incorrect path format. For example:
204199
```python
205200
ARM_PATH = "C:/Work/toolchains/ARMCompiler_5.03_117_Windows"
206201
GCC_ARM_PATH = "C:/Work/toolchains/gcc_arm_4_8/4_8_2013q4/bin"
207-
GCC_CS_PATH = "C:/Work/toolchains/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
208202
GCC_CR_PATH = "C:/Work/toolchains/LPCXpresso_6.1.4_194/lpcxpresso/tools/bin"
209203
IAR_PATH = "C:/Work/toolchains/iar_6_5/arm"
210204
```
@@ -263,7 +257,7 @@ Volume serial number is 006C006F 6243:3EA9
263257

264258
Note: Why ```LCP1768```? For this example we are using ```LPC1768``` because this platform supports all compilers so you are sure you only need to specify proper compiler.
265259

266-
If you are not using ARM Compiler replace ```ARM``` with your compiler nickname: ```GCC_ARM```, ```GCC_CS```, ```GCC_CR``` or ```IAR```. For example if you are using IAR type command:
260+
If you are not using ARM Compiler replace ```ARM``` with your compiler nickname: ```GCC_ARM```, ```GCC_CR``` or ```IAR```. For example if you are using IAR type command:
267261
```
268262
$ python build.py -m LPC1768 -t IAR
269263
```
@@ -335,17 +329,17 @@ Build successes:
335329
* If you’re unsure which platforms and toolchains are supported please use switch ```-S``` to print simple matrix of platform to compiler dependencies.
336330
```
337331
$ python build.py -S
338-
+-------------------------+-----------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
339-
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR | GCC_CS | GCC_CW_EWL | GCC_CW_NEWLIB |
340-
+-------------------------+-----------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
341-
| APPNEARME_MICRONFCBOARD | Supported | Default | Supported | - | - | - | - | - |
342-
| ARCH_BLE | Default | - | Supported | Supported | - | - | - | - |
343-
| ARCH_GPRS | Supported | Default | Supported | Supported | Supported | - | - | - |
332+
+-------------------------+-----------+-----------+-----------+-----------+-----------+
333+
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR |
334+
+-------------------------+-----------+-----------+-----------+-----------+-----------+
335+
| APPNEARME_MICRONFCBOARD | Supported | Default | Supported | - | - |
336+
| ARCH_BLE | Default | - | Supported | Supported | - |
337+
| ARCH_GPRS | Supported | Default | Supported | Supported | Supported |
344338
...
345-
| UBLOX_C029 | Supported | Default | Supported | Supported | - | - | - | - |
346-
| WALLBOT_BLE | Default | - | Supported | Supported | - | - | - | - |
347-
| XADOW_M0 | Supported | Default | Supported | Supported | Supported | - | - | - |
348-
+-------------------------+-----------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
339+
| UBLOX_C029 | Supported | Default | Supported | Supported | - |
340+
| WALLBOT_BLE | Default | - | Supported | Supported | - |
341+
| XADOW_M0 | Supported | Default | Supported | Supported | Supported |
342+
+-------------------------+-----------+-----------+-----------+-----------+-----------+
349343
*Default - default on-line compiler
350344
*Supported - supported off-line compiler
351345
@@ -356,19 +350,19 @@ Total permutations: 297
356350
Above list can be overwhelming so please do not hesitate to use switch ```-f``` to filter ```Platform``` column.
357351
```
358352
$ python build.py -S -f ^K
359-
+--------------+-----------+---------+-----------+-----------+--------+--------+------------+---------------+
360-
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR | GCC_CS | GCC_CW_EWL | GCC_CW_NEWLIB |
361-
+--------------+-----------+---------+-----------+-----------+--------+--------+------------+---------------+
362-
| K20D50M | Default | - | Supported | Supported | - | - | - | - |
363-
| K22F | Default | - | Supported | Supported | - | - | - | - |
364-
| K64F | Default | - | Supported | Supported | - | - | - | - |
365-
| KL05Z | Supported | Default | Supported | Supported | - | - | - | - |
366-
| KL25Z | Default | - | Supported | Supported | - | - | Supported | Supported |
367-
| KL43Z | Default | - | Supported | - | - | - | - | - |
368-
| KL46Z | Default | - | Supported | Supported | - | - | - | - |
369-
| NRF51_DK | Default | - | Supported | Supported | - | - | - | - |
370-
| NRF51_DK_OTA | Default | - | Supported | - | - | - | - | - |
371-
+--------------+-----------+---------+-----------+-----------+--------+--------+------------+---------------+
353+
+--------------+-----------+---------+-----------+-----------+--------+
354+
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR |
355+
+--------------+-----------+---------+-----------+-----------+--------+
356+
| K20D50M | Default | - | Supported | Supported | - |
357+
| K22F | Default | - | Supported | Supported | - |
358+
| K64F | Default | - | Supported | Supported | - |
359+
| KL05Z | Supported | Default | Supported | Supported | - |
360+
| KL25Z | Default | - | Supported | Supported | - |
361+
| KL43Z | Default | - | Supported | - | - |
362+
| KL46Z | Default | - | Supported | Supported | - |
363+
| NRF51_DK | Default | - | Supported | Supported | - |
364+
| NRF51_DK_OTA | Default | - | Supported | - | - |
365+
+--------------+-----------+---------+-----------+-----------+--------+
372366
*Default - default on-line compiler
373367
*Supported - supported off-line compiler
374368
@@ -378,11 +372,11 @@ Total permutations: 28
378372
or just give platform name:
379373
```
380374
$ python build.py -S -f LPC1768
381-
+----------+---------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
382-
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR | GCC_CS | GCC_CW_EWL | GCC_CW_NEWLIB |
383-
+----------+---------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
384-
| LPC1768 | Default | Supported | Supported | Supported | Supported | Supported | - | - |
385-
+----------+---------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
375+
+----------+---------+-----------+-----------+-----------+-----------+
376+
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR |
377+
+----------+---------+-----------+-----------+-----------+-----------+
378+
| LPC1768 | Default | Supported | Supported | Supported | Supported |
379+
+----------+---------+-----------+-----------+-----------+-----------+
386380
*Default - default on-line compiler
387381
*Supported - supported off-line compiler
388382

‎docs/TESTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,15 @@ Below we can see how sample ```test_spec.json``` file content could look like. (
148148
```json
149149
{
150150
"targets": {
151-
"LPC1768" : ["ARM", "uARM", "GCC_ARM", "GCC_CS", "GCC_CR", "IAR"],
151+
"LPC1768" : ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"],
152152
"KL25Z" : ["ARM", "GCC_ARM"],
153153
"NUCLEO_F103RB" : ["ARM", "uARM"]
154154
}
155155
}
156156
```
157157
Above example configuration will force tests for LPC1768, KL25Z, NUCLEO_F103RB platforms and:
158158

159-
* Compilers: ```ARM```, ```uARM```, ```GCC_ARM```, ```GCC_CS```, ```GCC_CR``` and ```IAR``` will be used to compile tests for NXP's ```LPC1768```.
159+
* Compilers: ```ARM```, ```uARM```, ```GCC_ARM```, ```GCC_CR``` and ```IAR``` will be used to compile tests for NXP's ```LPC1768```.
160160
* Compilers: ```ARM``` and ```GCC_ARM``` will be used for Freescales' ```KL25Z``` platform.
161161
* Compilers: ```ARM``` and ```uARM``` will be used for STMicro's ```NUCLEO_F103RB``` platform.
162162

‎libraries/mbed/common/retarget.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -493,10 +493,7 @@ extern "C" caddr_t _sbrk(int incr) {
493493
#endif
494494

495495

496-
#ifdef TOOLCHAIN_GCC_CW
497-
// TODO: Ideally, we would like to define directly "_ExitProcess"
498-
extern "C" void mbed_exit(int return_code) {
499-
#elif defined TOOLCHAIN_GCC_ARM
496+
#if defined TOOLCHAIN_GCC_ARM
500497
extern "C" void _exit(int return_code) {
501498
#else
502499
namespace std {
@@ -520,7 +517,7 @@ extern "C" void exit(int return_code) {
520517
while (1);
521518
}
522519

523-
#if !defined(TOOLCHAIN_GCC_ARM) && !defined(TOOLCHAIN_GCC_CW)
520+
#if !defined(TOOLCHAIN_GCC_ARM)
524521
} //namespace std
525522
#endif
526523

‎workspace_tools/build_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def build_library(src_paths, build_path, target, toolchain_name,
184184
""" src_path: the path of the source directory
185185
build_path: the path of the build directory
186186
target: ['LPC1768', 'LPC11U24', 'LPC2368']
187-
toolchain: ['ARM', 'uARM', 'GCC_ARM', 'GCC_CS', 'GCC_CR']
187+
toolchain: ['ARM', 'uARM', 'GCC_ARM', 'GCC_CR']
188188
library_paths: List of paths to additional libraries
189189
clean: Rebuild everything if True
190190
notify: Notify function for logs

‎workspace_tools/build_release.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131

3232
OFFICIAL_MBED_LIBRARY_BUILD = (
3333
('LPC11U24', ('ARM', 'uARM', 'GCC_ARM', 'IAR')),
34-
('LPC1768', ('ARM', 'GCC_ARM', 'GCC_CR', 'GCC_CS', 'IAR')),
35-
('UBLOX_C027', ('ARM', 'GCC_ARM', 'GCC_CR', 'GCC_CS', 'IAR')),
36-
('ARCH_PRO', ('ARM', 'GCC_ARM', 'GCC_CR', 'GCC_CS', 'IAR')),
34+
('LPC1768', ('ARM', 'GCC_ARM', 'GCC_CR', 'IAR')),
35+
('UBLOX_C027', ('ARM', 'GCC_ARM', 'GCC_CR', 'IAR')),
36+
('ARCH_PRO', ('ARM', 'GCC_ARM', 'GCC_CR', 'IAR')),
3737
('LPC2368', ('ARM', 'GCC_ARM')),
3838
('LPC2460', ('GCC_ARM',)),
3939
('LPC812', ('uARM','IAR')),

‎workspace_tools/buildbot/master.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ c['slavePortnum'] = 9989
2929
####### OFFICIAL_MBED_LIBRARY_BUILD
3030

3131
OFFICIAL_MBED_LIBRARY_BUILD = (
32-
('LPC1768', ('ARM', 'GCC_ARM', 'GCC_CR', 'GCC_CS', 'IAR')),
32+
('LPC1768', ('ARM', 'GCC_ARM', 'GCC_CR', 'IAR')),
3333
('KL05Z', ('ARM', 'uARM', 'GCC_ARM')),
3434
('KL25Z', ('ARM', 'GCC_ARM')),
3535
('LPC11U24', ('ARM', 'uARM')),
@@ -45,7 +45,7 @@ OFFICIAL_MBED_LIBRARY_BUILD = (
4545
('NUCLEO_L152RE', ('ARM', 'uARM')),
4646
('NUCLEO_F401RE', ('ARM', 'uARM')),
4747
('NUCLEO_F030R8', ('ARM', 'uARM')),
48-
('UBLOX_C027', ('ARM', 'GCC_ARM', 'GCC_CR', 'GCC_CS', 'IAR')),
48+
('UBLOX_C027', ('ARM', 'GCC_ARM', 'GCC_CR', 'IAR')),
4949
# ('NRF51822', ('ARM',)),
5050
)
5151

‎workspace_tools/export/codesourcery.py

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎workspace_tools/export/codesourcery_arch_pro.tmpl

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎workspace_tools/export/codesourcery_lpc1768.tmpl

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)