From 1e8528d6e8e89a30e41ea5c233600cba78fb81f4 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Thu, 2 Jan 2020 09:48:19 +0100 Subject: [PATCH] cpu/mips: remove use of export for LINKFLAGS --- cpu/mips32r2_common/Makefile.include | 2 +- cpu/mips_pic32mx/Makefile.include | 4 ++-- cpu/mips_pic32mz/Makefile.include | 4 ++-- makefiles/arch/mips.inc.mk | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cpu/mips32r2_common/Makefile.include b/cpu/mips32r2_common/Makefile.include index 79c3f89cde..b65543819c 100644 --- a/cpu/mips32r2_common/Makefile.include +++ b/cpu/mips32r2_common/Makefile.include @@ -9,7 +9,7 @@ export USEMODULE += periph_timer ifeq ($(USE_UHI_SYSCALLS),1) #Use UHI to handle syscalls - export LINKFLAGS += -luhi + LINKFLAGS += -luhi export USEMODULE += newlib_syscalls_mips_uhi CFLAGS += -DHAVE_HEAP_STATS else diff --git a/cpu/mips_pic32mx/Makefile.include b/cpu/mips_pic32mx/Makefile.include index ab8bb6c4e9..b5bf9d8278 100644 --- a/cpu/mips_pic32mx/Makefile.include +++ b/cpu/mips_pic32mx/Makefile.include @@ -6,8 +6,8 @@ include $(RIOTMAKE)/arch/mips.inc.mk # define build specific options CFLAGS += -march=m4k -DSKIP_COPY_TO_RAM -export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) -export LINKFLAGS += -Tpic32mx512_12_128_uhi.ld +LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) +LINKFLAGS += -Tpic32mx512_12_128_uhi.ld # the pickit programmer (MPLAB-IPE) wants physical addresses in the hex file!! OBJCOPY = objcopy #use system objcopy as toolchain one is broken. diff --git a/cpu/mips_pic32mz/Makefile.include b/cpu/mips_pic32mz/Makefile.include index 3b282fda4f..58d6ca0dd3 100644 --- a/cpu/mips_pic32mz/Makefile.include +++ b/cpu/mips_pic32mz/Makefile.include @@ -7,8 +7,8 @@ include $(RIOTMAKE)/arch/mips.inc.mk CFLAGS += -march=m5101 -mmicromips -DSKIP_COPY_TO_RAM CFLAGS += -DMIPS_MICROMIPS -export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) -export LINKFLAGS += -Tpic32mz2048_uhi.ld +LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) +LINKFLAGS += -Tpic32mz2048_uhi.ld # the pickit programmer (MPLAB-IPE) wants physical addresses in the hex file!! OBJCOPY = objcopy #use system objcopy as toolchain one is broken. diff --git a/makefiles/arch/mips.inc.mk b/makefiles/arch/mips.inc.mk index 0438869177..7f932c81c2 100644 --- a/makefiles/arch/mips.inc.mk +++ b/makefiles/arch/mips.inc.mk @@ -45,7 +45,7 @@ ifeq ($(USE_HARD_FLOAT),1) else #hard-float is the default so we must set soft-float CFLAGS += -msoft-float - export LINKFLAGS += -msoft-float + LINKFLAGS += -msoft-float endif ifeq ($(USE_DSP),1) @@ -60,10 +60,10 @@ endif ASFLAGS += $(CFLAGS_CPU) $(CFLAGS_OPT) $(CFLAGS_DBG) -export LINKFLAGS += $(MIPS_HAL_LDFLAGS) -export LINKFLAGS += -L$(RIOTCPU)/$(CPU)/ldscripts -export LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT) -export LINKFLAGS += -Wl,--gc-sections +LINKFLAGS += $(MIPS_HAL_LDFLAGS) +LINKFLAGS += -L$(RIOTCPU)/$(CPU)/ldscripts +LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT) +LINKFLAGS += -Wl,--gc-sections OPTIONAL_CFLAGS_BLACKLIST += -Wformat-overflow OPTIONAL_CFLAGS_BLACKLIST += -Wformat-truncation