From 7e0e4ea9bbc16de9b63a1e8d63887e956e64d00e Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 12 Mar 2023 14:27:15 +0000 Subject: [PATCH] Automatic removal of duplicated inclusion paths on make command lines. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@16161 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/common/startup/ARM/compilers/GCC/rules.mk | 4 ++-- os/common/startup/ARMCMx/compilers/GCC/mk/rules.mk | 4 ++-- os/common/startup/SIMIA32/compilers/GCC/rules.mk | 4 ++-- os/common/startup/e200/compilers/GCC/rules.mk | 4 ++-- readme.txt | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/os/common/startup/ARM/compilers/GCC/rules.mk b/os/common/startup/ARM/compilers/GCC/rules.mk index 85cdbf31a..921404c18 100644 --- a/os/common/startup/ARM/compilers/GCC/rules.mk +++ b/os/common/startup/ARM/compilers/GCC/rules.mk @@ -120,8 +120,8 @@ ASMXOBJS = $(addprefix $(OBJDIR)/, $(notdir $(ASMXSRC:.S=.o))) OBJS = $(ASMXOBJS) $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(ACCOBJS) $(TCPPOBJS) $(TCOBJS) # Paths -IINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR)) -LLIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR)) +IINCDIR = $(sort $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))) +LLIBDIR = $(sort $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))) # Macros DEFS = $(DDEFS) $(UDEFS) diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/rules.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/rules.mk index a7de8cf1d..61c62e285 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/mk/rules.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/mk/rules.mk @@ -106,8 +106,8 @@ ASMXOBJS := $(addprefix $(OBJDIR)/, $(notdir $(ASMXSRC:.S=.o))) OBJS := $(ASMXOBJS) $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS) $(TCCOBJS) # Paths -IINCDIR := $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR)) -LLIBDIR := $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR)) +IINCDIR := $(sort $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))) +LLIBDIR := $(sort $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))) # Macros DEFS := $(DDEFS) $(UDEFS) diff --git a/os/common/startup/SIMIA32/compilers/GCC/rules.mk b/os/common/startup/SIMIA32/compilers/GCC/rules.mk index 3d06b5ce1..86d1beb03 100644 --- a/os/common/startup/SIMIA32/compilers/GCC/rules.mk +++ b/os/common/startup/SIMIA32/compilers/GCC/rules.mk @@ -64,8 +64,8 @@ ASMXOBJS = $(addprefix $(OBJDIR)/, $(notdir $(ASMXSRC:.S=.o))) OBJS = $(ASMXOBJS) $(ASMOBJS) $(COBJS) $(CPPOBJS) $(CCOBJS) # Paths -IINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR)) -LLIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR)) +IINCDIR = $(sort $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))) +LLIBDIR = $(sort $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))) # Macros DEFS = $(DDEFS) $(UDEFS) diff --git a/os/common/startup/e200/compilers/GCC/rules.mk b/os/common/startup/e200/compilers/GCC/rules.mk index 829ec07cc..e4a7a7161 100644 --- a/os/common/startup/e200/compilers/GCC/rules.mk +++ b/os/common/startup/e200/compilers/GCC/rules.mk @@ -87,8 +87,8 @@ ASMXOBJS = $(addprefix $(OBJDIR)/, $(notdir $(ASMXSRC:.S=.o))) OBJS = $(ASMXOBJS) $(ASMOBJS) $(COBJS) $(CPPOBJS) # Paths -IINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR)) -LLIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR)) +IINCDIR = $(sort $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))) +LLIBDIR = $(sort $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))) # Macros DEFS = $(DDEFS) $(UDEFS) diff --git a/readme.txt b/readme.txt index 1c4815e46..7e9afbd51 100644 --- a/readme.txt +++ b/readme.txt @@ -74,6 +74,7 @@ ***************************************************************************** *** Next *** +- NEW: Automatic removal of duplicated inclusion paths on make command lines. - NEW: Reworked STM32 SDMMCv1 and SDMMCv2 drivers, better timeout and clock handling, improved speed for aligned buffers. - NEW: Added a "waend" field to the thread structure in RT for debug