Skip to content

Commit c7f84c8

Browse files
sg-sg-
committed
Remove all references and use of code warrior GCC in docs, build and
exporters¦
1 parent 018cdb9 commit c7f84c8

File tree

6 files changed

+33
-87
lines changed

6 files changed

+33
-87
lines changed

‎docs/BUILDING.md

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -329,17 +329,17 @@ Build successes:
329329
* If you’re unsure which platforms and toolchains are supported please use switch ```-S``` to print simple matrix of platform to compiler dependencies.
330330
```
331331
$ python build.py -S
332-
+-------------------------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
333-
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR | GCC_CW_EWL | GCC_CW_NEWLIB |
334-
+-------------------------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
335-
| APPNEARME_MICRONFCBOARD | Supported | Default | Supported | - | - | - | - |
336-
| ARCH_BLE | Default | - | Supported | Supported | - | - | - |
337-
| 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 |
338338
...
339-
| UBLOX_C029 | Supported | Default | Supported | Supported | - | - | - |
340-
| WALLBOT_BLE | Default | - | Supported | Supported | - | - | - |
341-
| XADOW_M0 | Supported | Default | Supported | Supported | Supported | - | - |
342-
+-------------------------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
339+
| UBLOX_C029 | Supported | Default | Supported | Supported | - |
340+
| WALLBOT_BLE | Default | - | Supported | Supported | - |
341+
| XADOW_M0 | Supported | Default | Supported | Supported | Supported |
342+
+-------------------------+-----------+-----------+-----------+-----------+-----------+
343343
*Default - default on-line compiler
344344
*Supported - supported off-line compiler
345345
@@ -350,19 +350,19 @@ Total permutations: 297
350350
Above list can be overwhelming so please do not hesitate to use switch ```-f``` to filter ```Platform``` column.
351351
```
352352
$ python build.py -S -f ^K
353-
+--------------+-----------+---------+-----------+-----------+--------+------------+---------------+
354-
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR | GCC_CW_EWL | GCC_CW_NEWLIB |
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 | - | Supported | Supported |
361-
| KL43Z | Default | - | Supported | - | - | - | - |
362-
| KL46Z | Default | - | Supported | Supported | - | - | - |
363-
| NRF51_DK | Default | - | Supported | Supported | - | - | - |
364-
| NRF51_DK_OTA | Default | - | Supported | - | - | - | - |
365-
+--------------+-----------+---------+-----------+-----------+--------+------------+---------------+
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+
+--------------+-----------+---------+-----------+-----------+--------+
366366
*Default - default on-line compiler
367367
*Supported - supported off-line compiler
368368
@@ -372,11 +372,11 @@ Total permutations: 28
372372
or just give platform name:
373373
```
374374
$ python build.py -S -f LPC1768
375-
+----------+---------+-----------+-----------+-----------+-----------+------------+---------------+
376-
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR | GCC_CW_EWL | GCC_CW_NEWLIB |
377-
+----------+---------+-----------+-----------+-----------+-----------+------------+---------------+
378-
| LPC1768 | Default | Supported | Supported | Supported | Supported | - | - |
379-
+----------+---------+-----------+-----------+-----------+-----------+------------+---------------+
375+
+----------+---------+-----------+-----------+-----------+-----------+
376+
| Platform | ARM | uARM | GCC_ARM | IAR | GCC_CR |
377+
+----------+---------+-----------+-----------+-----------+-----------+
378+
| LPC1768 | Default | Supported | Supported | Supported | Supported |
379+
+----------+---------+-----------+-----------+-----------+-----------+
380380
*Default - default on-line compiler
381381
*Supported - supported off-line compiler
382382

‎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/settings.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@
5959
# IAR
6060
IAR_PATH = "C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.0/arm"
6161

62-
# GCC Code Warrior
63-
CW_GCC_PATH = "C:/Freescale/CW MCU v10.3/Cross_Tools/arm-none-eabi-gcc-4_6_2/bin"
64-
CW_EWL_PATH = "C:/Freescale/CW MCU v10.3/MCU/ARM_GCC_Support/ewl/lib"
65-
6662
# Goanna static analyser. Please overload it in private_settings.py
6763
GOANNA_PATH = "c:/Program Files (x86)/RedLizards/Goanna Central 3.2.3/bin"
6864

‎workspace_tools/targets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ def __init__(self):
466466
Target.__init__(self)
467467
self.core = "Cortex-M0+"
468468
self.extra_labels = ['Freescale', 'KLXX']
469-
self.supported_toolchains = ["ARM", "GCC_CW_EWL", "GCC_CW_NEWLIB", "GCC_ARM","IAR"]
469+
self.supported_toolchains = ["ARM", "GCC_ARM", "IAR"]
470470
self.supported_form_factors = ["ARDUINO"]
471471
self.is_disk_virtual = True
472472
self.detect_code = ["0200"]

‎workspace_tools/toolchains/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -740,31 +740,26 @@ def var(self, key, value):
740740
self.notify({'type': 'var', 'key': key, 'val': value})
741741

742742
from workspace_tools.settings import ARM_BIN
743-
from workspace_tools.settings import GCC_ARM_PATH, GCC_CR_PATH, CW_EWL_PATH, CW_GCC_PATH
743+
from workspace_tools.settings import GCC_ARM_PATH, GCC_CR_PATH
744744
from workspace_tools.settings import IAR_PATH
745745

746746
TOOLCHAIN_BIN_PATH = {
747747
'ARM': ARM_BIN,
748748
'uARM': ARM_BIN,
749749
'GCC_ARM': GCC_ARM_PATH,
750750
'GCC_CR': GCC_CR_PATH,
751-
'GCC_CW_EWL': CW_EWL_PATH,
752-
'GCC_CW_NEWLIB': CW_GCC_PATH,
753751
'IAR': IAR_PATH
754752
}
755753

756754
from workspace_tools.toolchains.arm import ARM_STD, ARM_MICRO
757755
from workspace_tools.toolchains.gcc import GCC_ARM, GCC_CR
758-
from workspace_tools.toolchains.gcc import GCC_CW_EWL, GCC_CW_NEWLIB
759756
from workspace_tools.toolchains.iar import IAR
760757

761758
TOOLCHAIN_CLASSES = {
762759
'ARM': ARM_STD,
763760
'uARM': ARM_MICRO,
764761
'GCC_ARM': GCC_ARM,
765762
'GCC_CR': GCC_CR,
766-
'GCC_CW_EWL': GCC_CW_EWL,
767-
'GCC_CW_NEWLIB': GCC_CW_NEWLIB,
768763
'IAR': IAR
769764
}
770765

‎workspace_tools/toolchains/gcc.py

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from os.path import join, basename, splitext
1919

2020
from workspace_tools.toolchains import mbedToolchain
21-
from workspace_tools.settings import GCC_ARM_PATH, GCC_CR_PATH, CW_EWL_PATH, CW_GCC_PATH
21+
from workspace_tools.settings import GCC_ARM_PATH, GCC_CR_PATH
2222
from workspace_tools.settings import GOANNA_PATH
2323
from workspace_tools.hooks import hook_tool
2424

@@ -213,45 +213,3 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False,
213213
self.ld.extend(["-u _printf_float", "-u _scanf_float"])
214214
self.ld += ["-nostdlib"]
215215

216-
217-
class GCC_CW(GCC):
218-
ARCH_LIB = {
219-
"Cortex-M0+": "armv6-m",
220-
}
221-
222-
def __init__(self, target, options=None, notify=None, macros=None, silent=False, extra_verbose=False):
223-
GCC.__init__(self, target, options, notify, macros, silent, CW_GCC_PATH, extra_verbose=extra_verbose)
224-
225-
226-
class GCC_CW_EWL(GCC_CW):
227-
def __init__(self, target, options=None, notify=None, macros=None, silent=False, extra_verbose=False):
228-
GCC_CW.__init__(self, target, options, notify, macros, silent, extra_verbose=extra_verbose)
229-
230-
# Compiler
231-
common = [
232-
'-mfloat-abi=soft',
233-
'-nostdinc', '-I%s' % join(CW_EWL_PATH, "EWL_C", "include"),
234-
]
235-
self.cc += common + [
236-
'-include', join(CW_EWL_PATH, "EWL_C", "include", 'lib_c99.prefix')
237-
]
238-
self.cppc += common + [
239-
'-nostdinc++', '-I%s' % join(CW_EWL_PATH, "EWL_C++", "include"),
240-
'-include', join(CW_EWL_PATH, "EWL_C++", "include", 'lib_ewl_c++.prefix')
241-
]
242-
243-
# Linker
244-
self.sys_libs = []
245-
self.CIRCULAR_DEPENDENCIES = False
246-
self.ld = [join(CW_GCC_PATH, "arm-none-eabi-g++"),
247-
"-Xlinker --gc-sections",
248-
"-L%s" % join(CW_EWL_PATH, "lib", GCC_CW.ARCH_LIB[target.core]),
249-
"-n", "-specs=ewl_c++.specs", "-mfloat-abi=soft",
250-
"-Xlinker --undefined=__pformatter_", "-Xlinker --defsym=__pformatter=__pformatter_",
251-
"-Xlinker --undefined=__sformatter", "-Xlinker --defsym=__sformatter=__sformatter",
252-
] + self.cpu
253-
254-
255-
class GCC_CW_NEWLIB(GCC_CW):
256-
def __init__(self, target, options=None, notify=None, macros=None, silent=False, extra_verbose=False):
257-
GCC_CW.__init__(self, target, options, notify, macros, silent, extra_verbose=extra_verbose)

0 commit comments

Comments
 (0)