From a39a56b5ef3482aeaa7aa9d749d1368a5899d417 Mon Sep 17 00:00:00 2001 From: QL Date: Fri, 28 Dec 2018 13:46:16 -0500 Subject: [PATCH] 6.3.8 --- doxygen/Doxyfile | 4 +- doxygen/Doxyfile-CHM | 4 +- doxygen/Doxyfile-DOC | 4 +- doxygen/exa.dox | 2 +- doxygen/exa_mware.dox | 2 +- doxygen/exa_rtos.dox | 26 +++++++-- doxygen/history.dox | 8 +++ doxygen/main.dox | 2 +- doxygen/make.bat | 6 +- doxygen/metrics.dox | 4 +- .../blinky_efm32-slstk3401a/qk/gnu/Makefile | 53 ++++++++--------- .../blinky_efm32-slstk3401a/qv/gnu/Makefile | 53 ++++++++--------- .../blinky_ek-tm4c123gxl/qk/gnu/Makefile | 53 ++++++++--------- .../blinky_ek-tm4c123gxl/qv/gnu/Makefile | 53 ++++++++--------- .../dpp_efm32-slstk3401a/qk/gnu/Makefile | 55 +++++++++--------- .../dpp_efm32-slstk3401a/qv/gnu/Makefile | 55 +++++++++--------- .../dpp_efm32-slstk3401a/qxk/gnu/Makefile | 55 +++++++++--------- .../arm-cm/dpp_ek-tm4c123gxl/qk/gnu/Makefile | 39 +++++++------ .../qk/gnu_with-stack-prot/Makefile | 58 +++++++++---------- .../arm-cm/dpp_ek-tm4c123gxl/qv/gnu/Makefile | 39 +++++++------ .../arm-cm/dpp_ek-tm4c123gxl/qxk/gnu/Makefile | 35 +++++------ .../arm-cm/dpp_mbed-lpc1768/qk/gnu/Makefile | 55 +++++++++--------- .../arm-cm/dpp_mbed-lpc1768/qv/gnu/Makefile | 55 +++++++++--------- .../arm-cm/dpp_nucleo-h743zi/qk/gnu/Makefile | 36 ++++++------ .../arm-cm/dpp_nucleo-h743zi/qv/gnu/Makefile | 36 ++++++------ .../arm-cm/dpp_nucleo-h743zi/qxk/gnu/Makefile | 36 ++++++------ .../arm-cm/dpp_nucleo-l053r8/qk/gnu/Makefile | 55 +++++++++--------- .../qk/gnu_with-stack-prot/Makefile | 51 ++++++++-------- .../arm-cm/dpp_nucleo-l053r8/qv/gnu/Makefile | 55 +++++++++--------- .../arm-cm/dpp_nucleo-l053r8/qxk/gnu/Makefile | 53 ++++++++--------- .../dpp_nucleo-l053r8/qxk/llvm/Makefile | 4 +- .../arm-cm/dpp_nucleo-l152re/qk/gnu/Makefile | 55 +++++++++--------- .../arm-cm/dpp_nucleo-l152re/qv/gnu/Makefile | 53 ++++++++--------- .../dpp_stm32f4-discovery/qk/gnu/Makefile | 53 ++++++++--------- .../dpp_stm32f4-discovery/qv/gnu/Makefile | 53 ++++++++--------- .../dpp_stm32f4-discovery/qxk/gnu/Makefile | 53 ++++++++--------- .../dpp_stm32f746g-discovery/qk/gnu/Makefile | 34 ++++++----- .../dpp_stm32f746g-discovery/qv/gnu/Makefile | 34 ++++++----- .../dpp_stm32f746g-discovery/qxk/gnu/Makefile | 34 ++++++----- .../game_efm32-slstk3401a/qk/gnu/Makefile | 53 ++++++++--------- .../game_efm32-slstk3401a/qv/gnu/Makefile | 53 ++++++++--------- .../arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile | 40 +++++++------ .../arm-cm/dpp_nucleo-h743zi/gnu/Makefile | 38 ++++++------ .../dpp_stm32f746g-discovery/gnu/Makefile | 38 ++++++------ .../arm-cm/lwip_ek-lm3s6965/qk/gnu/Makefile | 51 ++++++++-------- .../arm-cm/lwip_ek-lm3s6965/qv/gnu/Makefile | 51 ++++++++-------- examples/qutest/blinky/test/make_efm32 | 36 ++++++------ examples/qutest/blinky/test/make_tm4c123 | 39 ++++++------- examples/qutest/dpp/test_dpp/make_efm32 | 36 ++++++------ examples/qutest/dpp/test_dpp/make_tm4c123 | 39 ++++++------- examples/qutest/evt_par/test/make_tm4c123 | 39 ++++++------- examples/qutest/qhsmtst/test/make_efm32 | 36 ++++++------ examples/qutest/qhsmtst/test/make_tm4c123 | 39 ++++++------- examples/qutest/qmsmtst/test/make_efm32 | 36 ++++++------ examples/qutest/qmsmtst/test/make_tm4c123 | 39 ++++++------- examples/qutest/self_test/test/make_efm32 | 36 ++++++------ examples/qutest/self_test/test/make_tm4c123 | 39 ++++++------- examples/qutest/unity_basic/test/make_efm32 | 36 ++++++------ examples/qutest/unity_basic/test/make_tm4c123 | 39 ++++++------- examples/qutest/unity_mock/test/make_efm32 | 36 ++++++------ examples/qutest/unity_mock/test/make_tm4c123 | 39 ++++++------- .../arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile | 38 ++++++------ include/qep.h | 12 ++-- version-6.3.7 | 2 - version-6.3.8 | 2 + 65 files changed, 1208 insertions(+), 1149 deletions(-) delete mode 100644 version-6.3.7 create mode 100644 version-6.3.8 diff --git a/doxygen/Doxyfile b/doxygen/Doxyfile index 33505ff2..ec049770 100644 --- a/doxygen/Doxyfile +++ b/doxygen/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "QP/C" -PROJECT_NUMBER = "6.3.7" +PROJECT_NUMBER = "6.3.8" PROJECT_BRIEF = PROJECT_LOGO = images/header_logo_ql.png OUTPUT_DIRECTORY = @@ -119,8 +119,8 @@ INPUT = \ exa_apps.dox \ exa_native.dox \ exa_rtos.dox \ - exa_qutest.dox \ exa_os.dox \ + exa_qutest.dox \ exa_mware.dox \ ports.dox \ ports_native.dox \ diff --git a/doxygen/Doxyfile-CHM b/doxygen/Doxyfile-CHM index 78d2136c..fefda1ff 100644 --- a/doxygen/Doxyfile-CHM +++ b/doxygen/Doxyfile-CHM @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "QP/C" -PROJECT_NUMBER = "6.3.7" +PROJECT_NUMBER = "6.3.8" PROJECT_BRIEF = PROJECT_LOGO = images/header_logo_ql.png OUTPUT_DIRECTORY = @@ -119,8 +119,8 @@ INPUT = \ exa_apps.dox \ exa_native.dox \ exa_rtos.dox \ - exa_qutest.dox \ exa_os.dox \ + exa_qutest.dox \ exa_mware.dox \ ports.dox \ ports_native.dox \ diff --git a/doxygen/Doxyfile-DOC b/doxygen/Doxyfile-DOC index c655ddb0..705c74bb 100644 --- a/doxygen/Doxyfile-DOC +++ b/doxygen/Doxyfile-DOC @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "QP/C" -PROJECT_NUMBER = "6.3.7" +PROJECT_NUMBER = "6.3.8" PROJECT_BRIEF = PROJECT_LOGO = images/header_logo_ql.png OUTPUT_DIRECTORY = @@ -123,8 +123,8 @@ INPUT = \ exa_apps.dox \ exa_native.dox \ exa_rtos.dox \ - exa_qutest.dox \ exa_os.dox \ + exa_qutest.dox \ exa_mware.dox \ ports.dox \ ports_native.dox \ diff --git a/doxygen/exa.dox b/doxygen/exa.dox index f9a185a8..70905ca0 100644 --- a/doxygen/exa.dox +++ b/doxygen/exa.dox @@ -197,7 +197,7 @@ QP/C examples are located in sub-directories of the exa
  • A @subpage exa_native "Native examples" are located in sub-directories named after the CPU architecture, such as arm-cm for ARM Cortex-M. Under that directory, the sub-directories blinky_ek-tm4c123gxl contain the specific example on the specified board, such as "Blinky" on the EK-TM4C123GXL board here. In the specific example folder, you find sub-folders for the @ref comp_qv "QV", @ref comp_qk "QK" and @ref comp_qxk "QXK" kernels, respectively.
    • -
  • B @subpage exa_rtos "Examples for 3rd-party RTOS"/@subpage exa_os "OS" are located in sub-directories named after the RTOS/OS, such as ucos-ii for uCOS-II RTOS. Under that directory, the sub-directories, such as arm-cm, contain examples for the specified CPU architecture, such as ARM Cortex-M here. +
  • B @subpage exa_rtos "Examples for 3rd-party RTOS"/@ref exa_os "OS" are located in sub-directories named after the RTOS/OS, such as ucos-ii for uCOS-II RTOS. Under that directory, the sub-directories, such as arm-cm, contain examples for the specified CPU architecture, such as ARM Cortex-M here.
  • C @subpage exa_mware "Examples for 3rd-party Middleware" are located in sub-directories named after the middleware, such as lwIP for the lwIP TCP/IP stack. Under that directory, the sub-directories, such as arm-cm, contain examples for the specified CPU architecture, such as ARM Cortex-M here. diff --git a/doxygen/exa_mware.dox b/doxygen/exa_mware.dox index 9c1f1794..57c229f6 100644 --- a/doxygen/exa_mware.dox +++ b/doxygen/exa_mware.dox @@ -1,4 +1,4 @@ -/*! @page exa_mware Third-Party Middleware +/*! @page exa_mware Examples for Third-Party Middleware - @subpage exa_lwip - @subpage exa_emwin diff --git a/doxygen/exa_rtos.dox b/doxygen/exa_rtos.dox index 648a19e0..d14b3174 100644 --- a/doxygen/exa_rtos.dox +++ b/doxygen/exa_rtos.dox @@ -144,16 +144,36 @@ Demonstrated features: /*##########################################################################*/ /*! @page exa_threadx ThreadX +@htmlonly + +@endhtmlonly + The QP/C examples for ThreadX (Express Logic) are as follows: -- @subpage threadx_dpp_stm32f429-discovery STM32F4-Discovery
    (IAR EWARM toolset) +- @subpage threadx_dpp_ek-tm4c123gxl (Cortex-M4F)
    (IAR EWARM toolchain) +- @subpage threadx_dpp_stm32f429-discovery
    (IAR EWARM toolchain) @note You can hover the mouse cursor over the    icon in the list below to see the picture of the board. @next{exa_ti-rtos examples} */ +/*##########################################################################*/ +/*! @page threadx_dpp_ek-tm4c123gxl DPP on EK-TM4C123GXL +@image html bd_EK-TM4C123GXL.jpg EK-TM4C123GXL board + +@ref dpp "DPP example" for ThreadX on Texas Instruments TivaC123GXL MCU (Cortex-M4F) with the following toolchain: +- IAR-ARM + +Demonstrated features: +- Multiple Active Objects +- QP/Spy output over the virtual COM port (Spy build configuration) +- QP/Spy input over the virtual COM port (bi-directional Spy) (Spy build configuration) + + +@next{threadx_dpp_stm32f429-discovery examples} +*/ /*##########################################################################*/ /*! @page threadx_dpp_stm32f429-discovery DPP on STM32F4-Discovery @@ -163,10 +183,6 @@ The @ref dpp "DPP example" for ThreadX on STM32F4-Discovery board is located dir The sub-directory iar contains the workspace and project file that you can open in IAR EWARM IDE. -@attention -Due to the limitations of the ThreadX library for Windows, the DPP example can only instantiate one `Philo[0]` active object. - - After you load the DPP example into the STM32F4-Discovery board, the application should start blinking the 4 on-board LEDs. You can press the User button (blue) to PAUSE the philosophers for as long as the button is depressed. The philosophers resume dining when you release the User button. (In the PAUSED state the Table active object stops granting permissions to eat, so eventually all philosophers end in the "hungry" state.) diff --git a/doxygen/history.dox b/doxygen/history.dox index 49bb2c07..d5af1573 100644 --- a/doxygen/history.dox +++ b/doxygen/history.dox @@ -1,6 +1,14 @@ /** @page history Revision History +@section qpc_6_3_8 Version 6.3.8, 2018-12-31 +The main purpose of this release is the update the `Makefiles` that use the [GNU-ARM Embedded Toolchain](https://developer.arm.com/open-source/gnu-toolchain/gnu-rm) to match the recent update in [QTools for Windows 6.3.8](https://sourceforge.net/projects/qpc/files/QTools/). Specifically, all `Makefiles` in the `examples` directory have been updated to use the GNU-ARM toolchain located in `qtools\gnu_arm-none-eabi` and use the tools prefix **arm-none-eabi-**. + +@note +The `Makefiles` that use the GNU-ARM included in this release require [QTools for Windows version 6.3.8 or newer](https://sourceforge.net/projects/qpc/files/QTools/) and will **NOT** work with the older QTools collection. + + +------------------------------------------------------------------------------ @section qpc_6_3_7 Version 6.3.7, 2018-11-20 The main goal of this release is to provide Python test scripts that match the newly re-designed Python support for the [QUTest unit testing harness](https://www.state-machine.com/qtools/qutest.html) (see QTools **6.3.7**). Specifically, the Python tests scripts (*.py files) in the `qpc/examples/qutest` directory) have been all upgraded to the new syntax and format. Also, all the makefiles in that directory have been modified to execute Python test scripts by default, and Tcl test scripts only when the argument `SCRIPTS=tcl` is specified. diff --git a/doxygen/main.dox b/doxygen/main.dox index c9433459..4bac0ac6 100644 --- a/doxygen/main.dox +++ b/doxygen/main.dox @@ -130,7 +130,7 @@ Training and consulting services are also available from Quantum Leaps. Please r @image html logo_ql_TM.jpg -Copyright © 2002-2018 Quantum Leaps, LLC. All Rights Reserved.@n +Copyright © 2005-2019 Quantum Leaps, LLC. All Rights Reserved.@n @next{gs} */ diff --git a/doxygen/make.bat b/doxygen/make.bat index f6ee6a36..877ebe99 100644 --- a/doxygen/make.bat +++ b/doxygen/make.bat @@ -1,8 +1,8 @@ @echo off :: ========================================================================== :: Product: QP/C script for generating Doxygen documentation -:: Last Updated for Version: 6.3.7 -:: Date of the Last Update: 2018-11-18 +:: Last Updated for Version: 6.3.8 +:: Date of the Last Update: 2018-12-27 :: :: Q u a n t u m L e a P s :: ------------------------ @@ -38,7 +38,7 @@ echo usage: echo make echo make -CHM -set VERSION=6.3.7 +set VERSION=6.3.8 :: Generate Resource Standard Metrics for QP/C ............................... set DOXHOME="C:\tools\doxygen\bin" diff --git a/doxygen/metrics.dox b/doxygen/metrics.dox index 8cb7e33a..7b27b6cd 100644 --- a/doxygen/metrics.dox +++ b/doxygen/metrics.dox @@ -1,7 +1,7 @@ /** @page metrics Code Metrics @code - Standard Code Metrics for QP/C 6.3.7 + Standard Code Metrics for QP/C 6.3.8 Resource Standard Metrics (TM) for C, C++, C# and Java Version 7.75 - mSquaredTechnologies.com @@ -9,7 +9,7 @@ License Type: Windows Single User License Licensed To : Quantum Leaps, LLC License No. : WS2975 License Date: Dec 15, 2013 - Build Date : Sep 2 2009 Run Date: Dec 05, 2018 + Build Date : Sep 2 2009 Run Date: Dec 28, 2018 (C)1996-2009 M Squared Technologies LLC ________________________________________________________________________ diff --git a/examples/arm-cm/blinky_efm32-slstk3401a/qk/gnu/Makefile b/examples/arm-cm/blinky_efm32-slstk3401a/qk/gnu/Makefile index c68969a2..ecc01e28 100644 --- a/examples/arm-cm/blinky_efm32-slstk3401a/qk/gnu/Makefile +++ b/examples/arm-cm/blinky_efm32-slstk3401a/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for Blinky on EMF32-SLSTK3401A, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EMF32-SLSTK3401A, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -104,7 +104,7 @@ C_SRCS := \ em_gpio.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -151,10 +151,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -162,11 +162,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -191,11 +192,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -207,11 +208,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -221,19 +222,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -265,7 +266,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -278,10 +279,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/blinky_efm32-slstk3401a/qv/gnu/Makefile b/examples/arm-cm/blinky_efm32-slstk3401a/qv/gnu/Makefile index 6ca3d980..9aabcbef 100644 --- a/examples/arm-cm/blinky_efm32-slstk3401a/qv/gnu/Makefile +++ b/examples/arm-cm/blinky_efm32-slstk3401a/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for Blinky on EMF32-SLSTK3401A, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EMF32-SLSTK3401A, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -104,7 +104,7 @@ C_SRCS := \ em_gpio.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -151,10 +151,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -162,11 +162,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -191,11 +192,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -207,11 +208,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -221,19 +222,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -265,7 +266,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -278,10 +279,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/blinky_ek-tm4c123gxl/qk/gnu/Makefile b/examples/arm-cm/blinky_ek-tm4c123gxl/qk/gnu/Makefile index 2ff5ed48..43ac4508 100644 --- a/examples/arm-cm/blinky_ek-tm4c123gxl/qk/gnu/Makefile +++ b/examples/arm-cm/blinky_ek-tm4c123gxl/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Blinky on EK-TM4C123GXL, QK, GNU-ARM gnutoolchains.com/arm-eabi -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EK-TM4C123GXL, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -148,10 +148,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -159,11 +159,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -188,11 +189,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -204,11 +205,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -218,19 +219,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -262,7 +263,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -275,10 +276,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/blinky_ek-tm4c123gxl/qv/gnu/Makefile b/examples/arm-cm/blinky_ek-tm4c123gxl/qv/gnu/Makefile index 9c2d32d4..98c7fab8 100644 --- a/examples/arm-cm/blinky_ek-tm4c123gxl/qv/gnu/Makefile +++ b/examples/arm-cm/blinky_ek-tm4c123gxl/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for Blinky on EK-TM4C123GXL, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EK-TM4C123GXL, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -148,10 +148,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -159,11 +159,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -188,11 +189,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -204,11 +205,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -218,19 +219,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -262,7 +263,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -275,10 +276,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/qk/gnu/Makefile b/examples/arm-cm/dpp_efm32-slstk3401a/qk/gnu/Makefile index f8e17455..e9af8e46 100644 --- a/examples/arm-cm/dpp_efm32-slstk3401a/qk/gnu/Makefile +++ b/examples/arm-cm/dpp_efm32-slstk3401a/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on EMF32-SLSTK3401A, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EMF32-SLSTK3401A, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -106,7 +106,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -153,10 +153,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -164,11 +164,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -180,7 +181,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -193,11 +194,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -209,11 +210,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -223,19 +224,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -267,7 +268,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -280,10 +281,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/qv/gnu/Makefile b/examples/arm-cm/dpp_efm32-slstk3401a/qv/gnu/Makefile index df74acf3..575f312d 100644 --- a/examples/arm-cm/dpp_efm32-slstk3401a/qv/gnu/Makefile +++ b/examples/arm-cm/dpp_efm32-slstk3401a/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on EMF32-SLSTK3401A, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EMF32-SLSTK3401A, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -106,7 +106,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -153,10 +153,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -164,11 +164,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -180,7 +181,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -193,11 +194,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -209,11 +210,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -223,19 +224,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -267,7 +268,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -280,10 +281,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/qxk/gnu/Makefile b/examples/arm-cm/dpp_efm32-slstk3401a/qxk/gnu/Makefile index 3cd93823..5f3c4c48 100644 --- a/examples/arm-cm/dpp_efm32-slstk3401a/qxk/gnu/Makefile +++ b/examples/arm-cm/dpp_efm32-slstk3401a/qxk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on EMF32-SLSTK3401A, QXK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EMF32-SLSTK3401A, QXK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -107,7 +107,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -157,10 +157,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -168,11 +168,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -184,7 +185,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -197,11 +198,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -213,11 +214,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -227,19 +228,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -271,7 +272,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -284,10 +285,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/qk/gnu/Makefile b/examples/arm-cm/dpp_ek-tm4c123gxl/qk/gnu/Makefile index 6bbf9442..bd225f34 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/qk/gnu/Makefile +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on EK-TM4C123GXL, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EK-TM4C123GXL, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -149,10 +149,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -176,7 +177,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -230,8 +231,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -263,7 +264,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/qk/gnu_with-stack-prot/Makefile b/examples/arm-cm/dpp_ek-tm4c123gxl/qk/gnu_with-stack-prot/Makefile index 9e905215..508b7529 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/qk/gnu_with-stack-prot/Makefile +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/qk/gnu_with-stack-prot/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on EK-TM4C123GXL, QK kernel, GNU-ARM -# Last Updated for Version: 6.3.2 -# Date of the Last Update: 2018-06-22 +# Product: Makefile for QP/C on EK-TM4C123GXL, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -149,10 +149,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -176,7 +177,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -190,13 +191,12 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ - -ffunction-sections -fdata-sections -fstack-protector-all \ - -O2 $(INCLUDES) $(DEFINES) -DNDEBUG + -ffunction-sections -fdata-sections \ + -O1 $(INCLUDES) $(DEFINES) -DNDEBUG CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ - -ffunction-sections -fdata-sections -fstack-protector-all \ - -fno-rtti -fno-exceptions \ - -O2 $(INCLUDES) $(DEFINES) -DNDEBUG + -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ + -O1 $(INCLUDES) $(DEFINES) -DNDEBUG else ifeq (spy, $(CONF)) # Spy configuration ................................ @@ -207,12 +207,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ - -ffunction-sections -fdata-sections -fstack-protector-all \ + -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ - -ffunction-sections -fdata-sections -fstack-protector-all \ - -fno-rtti -fno-exceptions \ + -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY else # default Debug configuration .......................................... @@ -222,19 +221,18 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ - -ffunction-sections -fdata-sections -fstack-protector-all \ + -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ - -ffunction-sections -fdata-sections -fstack-protector-all \ - -fno-rtti -fno-exceptions \ + -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib -fstack-protector-all \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -266,7 +264,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/qv/gnu/Makefile b/examples/arm-cm/dpp_ek-tm4c123gxl/qv/gnu/Makefile index 918833a0..1b5c739d 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/qv/gnu/Makefile +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on EK-TM4C123GXL, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EK-TM4C123GXL, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -149,10 +149,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -176,7 +177,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -230,8 +231,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -263,7 +264,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/qxk/gnu/Makefile b/examples/arm-cm/dpp_ek-tm4c123gxl/qxk/gnu/Makefile index 56d58649..53387204 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/qxk/gnu/Makefile +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/qxk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on EK-TM4C123GXL, QXK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EK-TM4C123GXL, QXK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -153,10 +153,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -164,11 +164,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -180,7 +181,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -234,8 +235,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) diff --git a/examples/arm-cm/dpp_mbed-lpc1768/qk/gnu/Makefile b/examples/arm-cm/dpp_mbed-lpc1768/qk/gnu/Makefile index b5b08a99..271f1061 100644 --- a/examples/arm-cm/dpp_mbed-lpc1768/qk/gnu/Makefile +++ b/examples/arm-cm/dpp_mbed-lpc1768/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on mbed-LPC1768, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on mbed-LPC1768, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ C_SRCS := \ startup_LPC17xx.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -149,10 +149,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -176,7 +177,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -189,11 +190,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -205,11 +206,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -219,19 +220,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -263,7 +264,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -276,10 +277,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_mbed-lpc1768/qv/gnu/Makefile b/examples/arm-cm/dpp_mbed-lpc1768/qv/gnu/Makefile index f4b67d4e..4cd0f1a1 100644 --- a/examples/arm-cm/dpp_mbed-lpc1768/qv/gnu/Makefile +++ b/examples/arm-cm/dpp_mbed-lpc1768/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on mbed-LPC1768, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on mbed-LPC1768, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ C_SRCS := \ startup_LPC17xx.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -149,10 +149,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -176,7 +177,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -189,11 +190,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -205,11 +206,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -219,19 +220,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -263,7 +264,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -276,10 +277,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_nucleo-h743zi/qk/gnu/Makefile b/examples/arm-cm/dpp_nucleo-h743zi/qk/gnu/Makefile index f6d8b02f..1072db68 100644 --- a/examples/arm-cm/dpp_nucleo-h743zi/qk/gnu/Makefile +++ b/examples/arm-cm/dpp_nucleo-h743zi/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on NUCLEO-H743ZI, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.1 -# Date of the Last Update: 2018-02-16 +# Product: Makefile for QP/C on NUCLEO-H743ZI, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -163,10 +163,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -174,11 +174,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -190,7 +191,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -244,10 +245,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) diff --git a/examples/arm-cm/dpp_nucleo-h743zi/qv/gnu/Makefile b/examples/arm-cm/dpp_nucleo-h743zi/qv/gnu/Makefile index c6a7d8af..f98d0bcd 100644 --- a/examples/arm-cm/dpp_nucleo-h743zi/qv/gnu/Makefile +++ b/examples/arm-cm/dpp_nucleo-h743zi/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on NUCLEO-H743ZI, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on NUCLEO-H743ZI, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -162,10 +162,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -173,11 +173,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -189,7 +190,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -243,10 +244,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) diff --git a/examples/arm-cm/dpp_nucleo-h743zi/qxk/gnu/Makefile b/examples/arm-cm/dpp_nucleo-h743zi/qxk/gnu/Makefile index 613475c7..ad360be2 100644 --- a/examples/arm-cm/dpp_nucleo-h743zi/qxk/gnu/Makefile +++ b/examples/arm-cm/dpp_nucleo-h743zi/qxk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on NUCLEO-H743ZI, QXK kernel, GNU-ARM -# Last Updated for Version: 6.1.1 -# Date of the Last Update: 2018-02-16 +# Product: Makefile for QP/C on NUCLEO-H743ZI, QXK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -167,10 +167,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -178,11 +178,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -194,7 +195,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -248,10 +249,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qk/gnu/Makefile b/examples/arm-cm/dpp_nucleo-l053r8/qk/gnu/Makefile index bb311c80..9ca7e282 100644 --- a/examples/arm-cm/dpp_nucleo-l053r8/qk/gnu/Makefile +++ b/examples/arm-cm/dpp_nucleo-l053r8/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on NUCLEO-L053R8, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on NUCLEO-L053R8, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ C_SRCS := \ startup_stm32l053xx.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -149,10 +149,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -176,7 +177,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -189,11 +190,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -205,11 +206,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) -DQ_SPY @@ -219,19 +220,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -263,7 +264,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -276,10 +277,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qk/gnu_with-stack-prot/Makefile b/examples/arm-cm/dpp_nucleo-l053r8/qk/gnu_with-stack-prot/Makefile index 83f4a800..32530fb5 100644 --- a/examples/arm-cm/dpp_nucleo-l053r8/qk/gnu_with-stack-prot/Makefile +++ b/examples/arm-cm/dpp_nucleo-l053r8/qk/gnu_with-stack-prot/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on NUCLEO-L053R8, QK kernel, GNU-ARM -# Last Updated for Version: 6.3.3 -# Date of the Last Update: 2018-06-22 +# Product: Makefile for QP/C on NUCLEO-L053R8, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -149,10 +149,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -189,11 +190,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fstack-protector-all \ -O2 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fstack-protector-all \ -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -206,11 +207,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fstack-protector-all \ -O2 $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fstack-protector-all \ -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) -DQ_SPY @@ -221,11 +222,11 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fstack-protector-all \ -O2 $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fstack-protector-all \ -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) @@ -233,8 +234,8 @@ CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib -fstack-protector-all \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -266,7 +267,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -279,10 +280,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qv/gnu/Makefile b/examples/arm-cm/dpp_nucleo-l053r8/qv/gnu/Makefile index 09fb68db..9e444ed8 100644 --- a/examples/arm-cm/dpp_nucleo-l053r8/qv/gnu/Makefile +++ b/examples/arm-cm/dpp_nucleo-l053r8/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on NUCLEO-L053R8, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on NUCLEO-L053R8, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ C_SRCS := \ startup_stm32l053xx.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -149,10 +149,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -176,7 +177,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -189,11 +190,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -205,11 +206,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) -DQ_SPY @@ -219,19 +220,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -263,7 +264,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -276,10 +277,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qxk/gnu/Makefile b/examples/arm-cm/dpp_nucleo-l053r8/qxk/gnu/Makefile index 0e1db675..6b8ed3cf 100644 --- a/examples/arm-cm/dpp_nucleo-l053r8/qxk/gnu/Makefile +++ b/examples/arm-cm/dpp_nucleo-l053r8/qxk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## # Product: Makefile for QP/C, DPP on NUCLEO-L053R8, QXK kernel, GNU-ARM -# Last Updated for Version: 6.1.1 -# Date of the Last Update: 2018-02-16 +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -103,7 +103,7 @@ C_SRCS := \ startup_stm32l053xx.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -153,10 +153,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -164,11 +164,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -180,7 +181,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -193,11 +194,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -209,11 +210,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) -DQ_SPY @@ -223,19 +224,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O2 $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -267,7 +268,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -280,10 +281,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qxk/llvm/Makefile b/examples/arm-cm/dpp_nucleo-l053r8/qxk/llvm/Makefile index 2947292e..525b965e 100644 --- a/examples/arm-cm/dpp_nucleo-l053r8/qxk/llvm/Makefile +++ b/examples/arm-cm/dpp_nucleo-l053r8/qxk/llvm/Makefile @@ -193,11 +193,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CFLAGS = $(ARM_CPU) $(ARM_TARGET) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_TARGET) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -fuse-baremetal-sysroot -fshort-enums -fno-common \ -ffunction-sections -fdata-sections \ -O2 $(INCLUDES) $(DEFINES) diff --git a/examples/arm-cm/dpp_nucleo-l152re/qk/gnu/Makefile b/examples/arm-cm/dpp_nucleo-l152re/qk/gnu/Makefile index c09b4e39..c6d5c7f3 100644 --- a/examples/arm-cm/dpp_nucleo-l152re/qk/gnu/Makefile +++ b/examples/arm-cm/dpp_nucleo-l152re/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on NUCLEO-L152RE, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on NUCLEO-L152RE, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ C_SRCS := \ startup_stm32l1xx.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -149,10 +149,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -176,7 +177,7 @@ MKDIR := mkdir RM := rm #----------------------------------------------------------------------------- -# build options for various configurations for ARM Cortex-M4F +# build options for various configurations for ARM Cortex-M # # combine all the soruces... @@ -189,11 +190,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -205,11 +206,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -219,19 +220,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -263,7 +264,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -276,10 +277,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_nucleo-l152re/qv/gnu/Makefile b/examples/arm-cm/dpp_nucleo-l152re/qv/gnu/Makefile index 988ccc44..34ac6ed1 100644 --- a/examples/arm-cm/dpp_nucleo-l152re/qv/gnu/Makefile +++ b/examples/arm-cm/dpp_nucleo-l152re/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on NUCLEO-L152RE, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on NUCLEO-L152RE, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ C_SRCS := \ startup_stm32l1xx.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -149,10 +149,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -160,11 +160,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -189,11 +190,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -205,11 +206,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -219,19 +220,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -263,7 +264,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -276,10 +277,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_stm32f4-discovery/qk/gnu/Makefile b/examples/arm-cm/dpp_stm32f4-discovery/qk/gnu/Makefile index 8ae89522..7e8bbd95 100644 --- a/examples/arm-cm/dpp_stm32f4-discovery/qk/gnu/Makefile +++ b/examples/arm-cm/dpp_stm32f4-discovery/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: DPP on STM32F4-Discovery, QK, GNU-ARM gnutoolchains.com/arm-eabi -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on STM32F4-Discovery, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -107,7 +107,7 @@ C_SRCS := \ stm32f4xx_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -154,10 +154,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -165,11 +165,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -194,11 +195,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -210,11 +211,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -224,19 +225,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -268,7 +269,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -281,10 +282,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_stm32f4-discovery/qv/gnu/Makefile b/examples/arm-cm/dpp_stm32f4-discovery/qv/gnu/Makefile index d36f7881..7857947a 100644 --- a/examples/arm-cm/dpp_stm32f4-discovery/qv/gnu/Makefile +++ b/examples/arm-cm/dpp_stm32f4-discovery/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: DPP on STM32F4-Discovery, QV, GNU-ARM gnutoolchains.com/arm-eabi -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on STM32F4-Discovery, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -107,7 +107,7 @@ C_SRCS := \ stm32f4xx_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -154,10 +154,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -165,11 +165,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -194,11 +195,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -210,11 +211,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -224,19 +225,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -268,7 +269,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -281,10 +282,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_stm32f4-discovery/qxk/gnu/Makefile b/examples/arm-cm/dpp_stm32f4-discovery/qxk/gnu/Makefile index 2ac66651..6fa89e30 100644 --- a/examples/arm-cm/dpp_stm32f4-discovery/qxk/gnu/Makefile +++ b/examples/arm-cm/dpp_stm32f4-discovery/qxk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: DPP on STM32F4-Discovery, QXK, GNU-ARM gnutoolchains.com/arm-eabi -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on STM32F4-Discovery, QXK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -108,7 +108,7 @@ C_SRCS := \ stm32f4xx_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -158,10 +158,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -169,11 +169,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -198,11 +199,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -214,11 +215,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -228,19 +229,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -272,7 +273,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -285,10 +286,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/dpp_stm32f746g-discovery/qk/gnu/Makefile b/examples/arm-cm/dpp_stm32f746g-discovery/qk/gnu/Makefile index a1684e6c..d221b551 100644 --- a/examples/arm-cm/dpp_stm32f746g-discovery/qk/gnu/Makefile +++ b/examples/arm-cm/dpp_stm32f746g-discovery/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on STM32F746G-Discovery, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on STM32F746G-Discovery, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -162,10 +162,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -173,11 +173,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -243,10 +244,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) diff --git a/examples/arm-cm/dpp_stm32f746g-discovery/qv/gnu/Makefile b/examples/arm-cm/dpp_stm32f746g-discovery/qv/gnu/Makefile index c881dabe..39e0e286 100644 --- a/examples/arm-cm/dpp_stm32f746g-discovery/qv/gnu/Makefile +++ b/examples/arm-cm/dpp_stm32f746g-discovery/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on STM32F746G-Discovery, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on STM32F746G-Discovery, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -162,10 +162,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -173,11 +173,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -243,10 +244,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) diff --git a/examples/arm-cm/dpp_stm32f746g-discovery/qxk/gnu/Makefile b/examples/arm-cm/dpp_stm32f746g-discovery/qxk/gnu/Makefile index 50663e84..edfe5c29 100644 --- a/examples/arm-cm/dpp_stm32f746g-discovery/qxk/gnu/Makefile +++ b/examples/arm-cm/dpp_stm32f746g-discovery/qxk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on STM32F746G-Discovery, QXK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on STM32F746G-Discovery, QXK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -166,10 +166,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -177,11 +177,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -247,10 +248,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) diff --git a/examples/arm-cm/game_efm32-slstk3401a/qk/gnu/Makefile b/examples/arm-cm/game_efm32-slstk3401a/qk/gnu/Makefile index fa4e43b4..6c3c13a4 100644 --- a/examples/arm-cm/game_efm32-slstk3401a/qk/gnu/Makefile +++ b/examples/arm-cm/game_efm32-slstk3401a/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for Game on EMF32-SLSTK3401A, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EMF32-SLSTK3401A, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -116,7 +116,7 @@ C_SRCS := \ displaypalemlib.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -163,10 +163,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -174,11 +174,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -203,11 +204,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -219,11 +220,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -233,19 +234,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -277,7 +278,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -290,10 +291,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/arm-cm/game_efm32-slstk3401a/qv/gnu/Makefile b/examples/arm-cm/game_efm32-slstk3401a/qv/gnu/Makefile index 6434052a..39843b03 100644 --- a/examples/arm-cm/game_efm32-slstk3401a/qv/gnu/Makefile +++ b/examples/arm-cm/game_efm32-slstk3401a/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for Game on EMF32-SLSTK3401A, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EMF32-SLSTK3401A, QV kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -116,7 +116,7 @@ C_SRCS := \ displaypalemlib.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -163,10 +163,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -174,11 +174,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -203,11 +204,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -219,11 +220,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -233,19 +234,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -277,7 +278,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -290,10 +291,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/freertos/arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile b/examples/freertos/arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile index 71adbbca..eb99eba3 100644 --- a/examples/freertos/arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile +++ b/examples/freertos/arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on EK-TM4C123GXL, FreeRTOS kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on EK-TM4C123GXL, FreeRTOS kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -158,10 +158,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -169,11 +169,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -189,8 +190,8 @@ RM := rm # # combine all the soruces... -C_SRCS += $(QP_SRCS) -C_SRCS += $(RTOS_SRCS) +C_SRCS += $(QP_SRCS) $(RTOS_SRCS) +ASM_SRCS += $(QP_ASMS) ifeq (rel, $(CONF)) # Release configuration .................................. @@ -239,10 +240,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) @@ -271,7 +273,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c diff --git a/examples/freertos/arm-cm/dpp_nucleo-h743zi/gnu/Makefile b/examples/freertos/arm-cm/dpp_nucleo-h743zi/gnu/Makefile index dacd6941..0410abc5 100644 --- a/examples/freertos/arm-cm/dpp_nucleo-h743zi/gnu/Makefile +++ b/examples/freertos/arm-cm/dpp_nucleo-h743zi/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on NUCLEO-H743ZI, FreeRTOS, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on NUCLEO-H743ZI, FreeRTOS, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -171,10 +171,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -182,11 +182,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -202,8 +203,8 @@ RM := rm # # combine all the soruces... -C_SRCS += $(QP_SRCS) -C_SRCS += $(RTOS_SRCS) +C_SRCS += $(QP_SRCS) $(RTOS_SRCS) +ASM_SRCS += $(QP_ASMS) ifeq (rel, $(CONF)) # Release configuration .................................. @@ -252,10 +253,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) diff --git a/examples/freertos/arm-cm/dpp_stm32f746g-discovery/gnu/Makefile b/examples/freertos/arm-cm/dpp_stm32f746g-discovery/gnu/Makefile index 346de513..00e9ff62 100644 --- a/examples/freertos/arm-cm/dpp_stm32f746g-discovery/gnu/Makefile +++ b/examples/freertos/arm-cm/dpp_stm32f746g-discovery/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on STM32F746G-Discovery, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Product: Makefile for QP/C on STM32F746G-Discovery, QK kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -171,10 +171,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -182,11 +182,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -202,8 +203,8 @@ RM := rm # # combine all the soruces... -C_SRCS += $(QP_SRCS) -C_SRCS += $(RTOS_SRCS) +C_SRCS += $(QP_SRCS) $(RTOS_SRCS) +ASM_SRCS += $(QP_ASMS) ifeq (rel, $(CONF)) # Release configuration .................................. @@ -252,10 +253,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) diff --git a/examples/lwip/arm-cm/lwip_ek-lm3s6965/qk/gnu/Makefile b/examples/lwip/arm-cm/lwip_ek-lm3s6965/qk/gnu/Makefile index e6d5b479..e3dbd3cb 100644 --- a/examples/lwip/arm-cm/lwip_ek-lm3s6965/qk/gnu/Makefile +++ b/examples/lwip/arm-cm/lwip_ek-lm3s6965/qk/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## # Product: Makefile for lwIP on EK-LM3S6965, QK kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -115,7 +115,7 @@ C_SRCS := \ startup_LM3S6965.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -162,10 +162,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -173,11 +173,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -202,11 +203,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -218,11 +219,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -232,19 +233,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -276,7 +277,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -289,10 +290,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/lwip/arm-cm/lwip_ek-lm3s6965/qv/gnu/Makefile b/examples/lwip/arm-cm/lwip_ek-lm3s6965/qv/gnu/Makefile index 6c4308d9..1a628e7c 100644 --- a/examples/lwip/arm-cm/lwip_ek-lm3s6965/qv/gnu/Makefile +++ b/examples/lwip/arm-cm/lwip_ek-lm3s6965/qv/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## # Product: Makefile for lwIP on EK-LM3S6965, QV kernel, GNU-ARM -# Last Updated for Version: 6.1.0 -# Date of the Last Update: 2018-02-07 +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/Qtools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -115,7 +115,7 @@ C_SRCS := \ startup_LM3S6965.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(PROJECT).ld @@ -162,10 +162,10 @@ FLOAT_ABI := #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -173,11 +173,12 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line @@ -202,11 +203,11 @@ BIN_DIR := rel ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG -CPPFLAGS = $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O1 $(INCLUDES) $(DEFINES) -DNDEBUG @@ -218,11 +219,11 @@ C_SRCS += $(QS_SRCS) ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) -DQ_SPY @@ -232,19 +233,19 @@ BIN_DIR := dbg ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU) -CFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections \ -O $(INCLUDES) $(DEFINES) -CPPFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ +CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \ -O $(INCLUDES) $(DEFINES) endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) @@ -276,7 +277,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c @@ -289,10 +290,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ # include dependency files only if our goal depends on their existence ifneq ($(MAKECMDGOALS),clean) diff --git a/examples/qutest/blinky/test/make_efm32 b/examples/qutest/blinky/test/make_efm32 index 8aa32e24..ebf6e7aa 100644 --- a/examples/qutest/blinky/test/make_efm32 +++ b/examples/qutest/blinky/test/make_efm32 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for EMF32, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on EMF32, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -111,7 +111,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -157,10 +157,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -168,11 +168,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # FLASH tool (NOTE: Requires the JLINK utility) @@ -187,8 +187,8 @@ FLASH := $(TARGET_DIR)\flash.bat # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -217,8 +217,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -264,7 +264,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -284,10 +284,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/blinky/test/make_tm4c123 b/examples/qutest/blinky/test/make_tm4c123 index 5a283148..ffc0cb97 100644 --- a/examples/qutest/blinky/test/make_tm4c123 +++ b/examples/qutest/blinky/test/make_tm4c123 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for TM4C123, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on TM4C123, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -43,7 +43,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -107,7 +107,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -153,10 +153,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -164,11 +164,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # NOTE: The following symbol LMFLASH assumes that LMFlash.exe can @@ -179,15 +179,14 @@ ifeq ($(LMFLASH),) FLASH := LMFlash.exe -q ek-tm4c123gxl endif - ############################################################################## # Typically you should not need to change anything below this line # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -216,8 +215,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -263,7 +262,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -283,10 +282,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/dpp/test_dpp/make_efm32 b/examples/qutest/dpp/test_dpp/make_efm32 index 4c888a3e..0a8585c6 100644 --- a/examples/qutest/dpp/test_dpp/make_efm32 +++ b/examples/qutest/dpp/test_dpp/make_efm32 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for EMF32, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on EMF32, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -113,7 +113,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -159,10 +159,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -170,11 +170,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # FLASH tool (NOTE: Requires the JLINK utility) @@ -189,8 +189,8 @@ FLASH := $(TARGET_DIR)\flash.bat # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -219,8 +219,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -266,7 +266,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -286,10 +286,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/dpp/test_dpp/make_tm4c123 b/examples/qutest/dpp/test_dpp/make_tm4c123 index ae49fd0f..4b2b1e36 100644 --- a/examples/qutest/dpp/test_dpp/make_tm4c123 +++ b/examples/qutest/dpp/test_dpp/make_tm4c123 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for TM4C123, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on TM4C123, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -43,7 +43,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -109,7 +109,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -155,10 +155,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -166,11 +166,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # NOTE: The following symbol LMFLASH assumes that LMFlash.exe can @@ -181,15 +181,14 @@ ifeq ($(LMFLASH),) FLASH := LMFlash.exe -q ek-tm4c123gxl endif - ############################################################################## # Typically you should not need to change anything below this line # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -218,8 +217,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -265,7 +264,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -285,10 +284,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/evt_par/test/make_tm4c123 b/examples/qutest/evt_par/test/make_tm4c123 index bb1bdd84..cf6ed158 100644 --- a/examples/qutest/evt_par/test/make_tm4c123 +++ b/examples/qutest/evt_par/test/make_tm4c123 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for TM4C123, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on TM4C123, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -43,7 +43,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -106,7 +106,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -152,10 +152,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -163,11 +163,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # NOTE: The following symbol LMFLASH assumes that LMFlash.exe can @@ -178,15 +178,14 @@ ifeq ($(LMFLASH),) FLASH := LMFlash.exe -q ek-tm4c123gxl endif - ############################################################################## # Typically you should not need to change anything below this line # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -215,8 +214,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -262,7 +261,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -282,10 +281,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/qhsmtst/test/make_efm32 b/examples/qutest/qhsmtst/test/make_efm32 index d7874109..a2682b59 100644 --- a/examples/qutest/qhsmtst/test/make_efm32 +++ b/examples/qutest/qhsmtst/test/make_efm32 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for EMF32, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on EMF32, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -110,7 +110,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -156,10 +156,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -167,11 +167,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # FLASH tool (NOTE: Requires the JLINK utility) @@ -186,8 +186,8 @@ FLASH := $(TARGET_DIR)\flash.bat # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -216,8 +216,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -263,7 +263,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -283,10 +283,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/qhsmtst/test/make_tm4c123 b/examples/qutest/qhsmtst/test/make_tm4c123 index b5c6c5d6..d07d0e11 100644 --- a/examples/qutest/qhsmtst/test/make_tm4c123 +++ b/examples/qutest/qhsmtst/test/make_tm4c123 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for TM4C123, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on TM4C123, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -43,7 +43,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -106,7 +106,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -152,10 +152,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -163,11 +163,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # NOTE: The following symbol LMFLASH assumes that LMFlash.exe can @@ -178,15 +178,14 @@ ifeq ($(LMFLASH),) FLASH := LMFlash.exe -q ek-tm4c123gxl endif - ############################################################################## # Typically you should not need to change anything below this line # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -215,8 +214,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -262,7 +261,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -282,10 +281,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/qmsmtst/test/make_efm32 b/examples/qutest/qmsmtst/test/make_efm32 index f8e44108..2353cbc9 100644 --- a/examples/qutest/qmsmtst/test/make_efm32 +++ b/examples/qutest/qmsmtst/test/make_efm32 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for EMF32, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on EMF32, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -110,7 +110,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -156,10 +156,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -167,11 +167,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # FLASH tool (NOTE: Requires the JLINK utility) @@ -186,8 +186,8 @@ FLASH := $(TARGET_DIR)\flash.bat # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -216,8 +216,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -263,7 +263,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -283,10 +283,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/qmsmtst/test/make_tm4c123 b/examples/qutest/qmsmtst/test/make_tm4c123 index 037d474b..eb199e6e 100644 --- a/examples/qutest/qmsmtst/test/make_tm4c123 +++ b/examples/qutest/qmsmtst/test/make_tm4c123 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for TM4C123, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on TM4C123, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -43,7 +43,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -106,7 +106,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -152,10 +152,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -163,11 +163,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # NOTE: The following symbol LMFLASH assumes that LMFlash.exe can @@ -178,15 +178,14 @@ ifeq ($(LMFLASH),) FLASH := LMFlash.exe -q ek-tm4c123gxl endif - ############################################################################## # Typically you should not need to change anything below this line # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -215,8 +214,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -262,7 +261,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -282,10 +281,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/self_test/test/make_efm32 b/examples/qutest/self_test/test/make_efm32 index 590abeae..12826112 100644 --- a/examples/qutest/self_test/test/make_efm32 +++ b/examples/qutest/self_test/test/make_efm32 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for EMF32, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on EMF32, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -109,7 +109,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -155,10 +155,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -166,11 +166,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # FLASH tool (NOTE: Requires the JLINK utility) @@ -185,8 +185,8 @@ FLASH := $(TARGET_DIR)\flash.bat # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -215,8 +215,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -262,7 +262,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -282,10 +282,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/self_test/test/make_tm4c123 b/examples/qutest/self_test/test/make_tm4c123 index 4b2c50a3..13e0263c 100644 --- a/examples/qutest/self_test/test/make_tm4c123 +++ b/examples/qutest/self_test/test/make_tm4c123 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for TM4C123, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on TM4C123, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -43,7 +43,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -105,7 +105,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -151,10 +151,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -162,11 +162,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # NOTE: The following symbol LMFLASH assumes that LMFlash.exe can @@ -177,15 +177,14 @@ ifeq ($(LMFLASH),) FLASH := LMFlash.exe -q ek-tm4c123gxl endif - ############################################################################## # Typically you should not need to change anything below this line # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -214,8 +213,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -261,7 +260,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -281,10 +280,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/unity_basic/test/make_efm32 b/examples/qutest/unity_basic/test/make_efm32 index a3ad17ff..2e0ebc9d 100644 --- a/examples/qutest/unity_basic/test/make_efm32 +++ b/examples/qutest/unity_basic/test/make_efm32 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for EMF32, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on EMF32, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -110,7 +110,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -156,10 +156,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -167,11 +167,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # FLASH tool (NOTE: Requires the JLINK utility) @@ -186,8 +186,8 @@ FLASH := $(TARGET_DIR)\flash.bat # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -216,8 +216,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -263,7 +263,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -283,10 +283,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/unity_basic/test/make_tm4c123 b/examples/qutest/unity_basic/test/make_tm4c123 index 50d03b1f..6eabefa8 100644 --- a/examples/qutest/unity_basic/test/make_tm4c123 +++ b/examples/qutest/unity_basic/test/make_tm4c123 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for TM4C123, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on TM4C123, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -43,7 +43,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -106,7 +106,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -152,10 +152,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -163,11 +163,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # NOTE: The following symbol LMFLASH assumes that LMFlash.exe can @@ -178,15 +178,14 @@ ifeq ($(LMFLASH),) FLASH := LMFlash.exe -q ek-tm4c123gxl endif - ############################################################################## # Typically you should not need to change anything below this line # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -215,8 +214,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -262,7 +261,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -282,10 +281,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/unity_mock/test/make_efm32 b/examples/qutest/unity_mock/test/make_efm32 index 403aaf34..719c44e0 100644 --- a/examples/qutest/unity_mock/test/make_efm32 +++ b/examples/qutest/unity_mock/test/make_efm32 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for EMF32, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on EMF32, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -111,7 +111,7 @@ C_SRCS := \ em_usart.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -157,10 +157,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -168,11 +168,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # FLASH tool (NOTE: Requires the JLINK utility) @@ -187,8 +187,8 @@ FLASH := $(TARGET_DIR)\flash.bat # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -217,8 +217,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -264,7 +264,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -284,10 +284,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/qutest/unity_mock/test/make_tm4c123 b/examples/qutest/unity_mock/test/make_tm4c123 index 13cb0325..4586a38c 100644 --- a/examples/qutest/unity_mock/test/make_tm4c123 +++ b/examples/qutest/unity_mock/test/make_tm4c123 @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for TM4C123, QUTEST, GNU-ARM -# Last updated for version 6.3.7 -# Last updated on 2018-11-12 +# Product: Makefile for QP/C on TM4C123, QUTEST, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # # Q u a n t u m L e a P s # ------------------------ @@ -43,7 +43,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -107,7 +107,7 @@ C_SRCS := \ startup_TM4C123GH6PM.c # C++ source files -CPP_SRCS := +CPP_SRCS := OUTPUT := $(PROJECT) LD_SCRIPT := $(TARGET_DIR)/test.ld @@ -153,10 +153,10 @@ FLOAT_ABI := -mfloat-abi=softfp #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -164,11 +164,11 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy #----------------------------------------------------------------------------- # NOTE: The following symbol LMFLASH assumes that LMFlash.exe can @@ -179,15 +179,14 @@ ifeq ($(LMFLASH),) FLASH := LMFlash.exe -q ek-tm4c123gxl endif - ############################################################################## # Typically you should not need to change anything below this line # basic utilities (included in QTools for Windows), see: # http://sourceforge.net/projects/qpc/files/Qtools -MKDIR := mkdir -RM := rm +MKDIR := mkdir +RM := rm ifeq ($(SCRIPT),tcl) QUTEST := tclsh $(QTOOLS)/qspy/tcl/qutest.tcl @@ -216,8 +215,8 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ -O $(INCLUDES) $(DEFINES) -DQ_SPY -DQ_UTEST -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) @@ -263,7 +262,7 @@ $(TARGET_BIN) : $(TARGET_ELF) $(FLASH) $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) flash : @@ -283,10 +282,10 @@ $(BIN_DIR)/%.o : %.s $(AS) $(ASFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $< -o $@ $(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< -o $@ + $(CPP) $(CPPFLAGS) $< -o $@ .PHONY : clean show diff --git a/examples/ucos-ii/arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile b/examples/ucos-ii/arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile index 97e0763f..0badf7fd 100644 --- a/examples/ucos-ii/arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile +++ b/examples/ucos-ii/arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile @@ -1,11 +1,11 @@ ############################################################################## -# Product: Makefile for DPP on EK-TM4C123GXL, uC/OS-II kernel, GNU-ARM -# Last Updated for Version: 6.3.1 -# Date of the Last Update: 2018-05-31 +# Product: Makefile for QP/C on EK-TM4C123GXL, uC/OS-II kernel, GNU-ARM +# Last Updated for Version: 6.3.8 +# Date of the Last Update: 2018-12-26 # -# Q u a n t u m L e a P s -# --------------------------- -# innovating embedded systems +# Q u a n t u m L e a P s +# ------------------------ +# Modern Embedded Software # # Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. # @@ -45,7 +45,7 @@ # NOTE: # To use this Makefile on Windows, you will need the GNU make utility, which # is included in the Qtools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ +# https://sourceforge.net/projects/qpc/files/QTools/ # #----------------------------------------------------------------------------- @@ -161,10 +161,10 @@ ASM_FPU := -defsym=__FPU_PRESENT=1 #----------------------------------------------------------------------------- # GNU-ARM toolset (NOTE: You need to adjust to your machine) -# see http://gnutoolchains.com/arm-eabi/ +# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads # ifeq ($(GNU_ARM),) -GNU_ARM := $(QTOOLS)/gnu_arm-eabi +GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi endif # make sure that the GNU-ARM toolset exists... @@ -172,17 +172,18 @@ ifeq ("$(wildcard $(GNU_ARM))","") $(error GNU_ARM toolset not found. Please adjust the Makefile) endif -CC := $(GNU_ARM)/bin/arm-eabi-gcc -CPP := $(GNU_ARM)/bin/arm-eabi-g++ -AS := $(GNU_ARM)/bin/arm-eabi-as -LINK := $(GNU_ARM)/bin/arm-eabi-gcc -BIN := $(GNU_ARM)/bin/arm-eabi-objcopy +CC := $(GNU_ARM)/bin/arm-none-eabi-gcc +CPP := $(GNU_ARM)/bin/arm-none-eabi-g++ +AS := $(GNU_ARM)/bin/arm-none-eabi-as +LINK := $(GNU_ARM)/bin/arm-none-eabi-g++ +BIN := $(GNU_ARM)/bin/arm-none-eabi-objcopy + ############################################################################## # Typically, you should not need to change anything below this line # basic utilities (included in Qtools for Windows), see: -# http://sourceforge.net/projects/qpc/files/QTools +# http://sourceforge.net/projects/qpc/files/Qtools MKDIR := mkdir RM := rm @@ -242,10 +243,11 @@ CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \ endif # ...................................................................... -LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) \ - -mthumb -nostdlib \ +LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \ + -specs=nosys.specs \ -Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS) + ASM_OBJS := $(patsubst %.s,%.o, $(notdir $(ASM_SRCS))) C_OBJS := $(patsubst %.c,%.o, $(notdir $(C_SRCS))) CPP_OBJS := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS))) @@ -274,7 +276,7 @@ $(TARGET_BIN): $(TARGET_ELF) $(BIN) -O binary $< $@ $(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT) - $(CC) $(CFLAGS) -c $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o + $(CC) $(CFLAGS) $(QPC)/include/qstamp.c -o $(BIN_DIR)/qstamp.o $(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS) $(BIN_DIR)/%.d : %.c diff --git a/include/qep.h b/include/qep.h index 6748145f..2ea6f778 100644 --- a/include/qep.h +++ b/include/qep.h @@ -4,8 +4,8 @@ * @ingroup qep * @cond ****************************************************************************** -* Last updated for version 6.3.7 -* Last updated on 2018-11-09 +* Last updated for version 6.3.8 +* Last updated on 2018-12-27 * * Q u a n t u m L e a P s * ------------------------ @@ -45,16 +45,16 @@ * major version number, Y is a 1-digit minor version number, and Z is * a 1-digit release number. */ -#define QP_VERSION 637U +#define QP_VERSION 638U /*! The current QP version number string of the form X.Y.Z, where X is * a 1-digit major version number, Y is a 1-digit minor version number, * and Z is a 1-digit release number. */ -#define QP_VERSION_STR "6.3.7" +#define QP_VERSION_STR "6.3.8" -/*! Tamperproof current QP release (6.3.7) and date (2018-11-09) */ -#define QP_RELEASE 0x940CF332U +/*! Tamperproof current QP release (6.3.8) and date (2018-12-31) */ +#define QP_RELEASE 0x93FA5591U /****************************************************************************/ diff --git a/version-6.3.7 b/version-6.3.7 deleted file mode 100644 index ebb4dd54..00000000 --- a/version-6.3.7 +++ /dev/null @@ -1,2 +0,0 @@ -QP/C 6.3.7 -2018-11-09 diff --git a/version-6.3.8 b/version-6.3.8 new file mode 100644 index 00000000..3f10f9c9 --- /dev/null +++ b/version-6.3.8 @@ -0,0 +1,2 @@ +QP/C 6.3.8 +2018-12-26