From 417476824314a8477473adefd4eea261d00b6c89 Mon Sep 17 00:00:00 2001 From: Ivan Pang Date: Tue, 31 May 2016 14:30:42 -0500 Subject: [PATCH 1/1] makerules: removed fpu libgcc.a since arm-none-eabi-gcc flag -mfloat-abi=hard automatically links it Signed-off-by: Ivan Pang --- makerules/rules_GCC_a8.mk | 2 +- makerules/rules_GCC_arm9.mk | 2 +- makerules/rules_a15.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/makerules/rules_GCC_a8.mk b/makerules/rules_GCC_a8.mk index 5b02c6b..8407c5d 100644 --- a/makerules/rules_GCC_a8.mk +++ b/makerules/rules_GCC_a8.mk @@ -120,7 +120,7 @@ _LNKFLAGS = $(LNKFLAGS_INTERNAL) $(LNKFLAGS_INTERNAL_COMMON) $(LNKFLAGS_INTERNAL # Path of the RTS library - normally doesn't change for a given tool-chain RTSLIB_PATH = -LIB_PATHS += $(EXT_LIB_a8host) $(CODEGEN_PATH_A8_GCC)/lib/gcc/arm-none-eabi/4.9.3/fpu/libgcc.a $(CODEGEN_PATH_A8_GCC)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A8_GCC)/arm-none-eabi/lib/fpu/libm.a $(CODEGEN_PATH_A8_GCC)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A8_GCC)/arm-none-eabi/lib/fpu/libg.a +LIB_PATHS += $(EXT_LIB_a8host) $(CODEGEN_PATH_A8_GCC)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A8_GCC)/arm-none-eabi/lib/fpu/libm.a $(CODEGEN_PATH_A8_GCC)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A8_GCC)/arm-none-eabi/lib/fpu/libg.a LNK_LIBS = $(addprefix -l,$(LIB_PATHS)) # Linker - to create executable file diff --git a/makerules/rules_GCC_arm9.mk b/makerules/rules_GCC_arm9.mk index d522583..de5045c 100644 --- a/makerules/rules_GCC_arm9.mk +++ b/makerules/rules_GCC_arm9.mk @@ -115,7 +115,7 @@ _LNKFLAGS = $(LNKFLAGS_INTERNAL) $(LNKFLAGS_INTERNAL_COMMON) $(LNKFLAGS_INTERNAL # Path of the RTS library - normally doesn't change for a given tool-chain RTSLIB_PATH = -LIB_PATHS += $(EXT_LIB_arm9) $(CODEGEN_PATH_A9_GCC)/lib/gcc/arm-none-eabi/4.9.3/fpu/libgcc.a $(CODEGEN_PATH_A9_GCC)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A9_GCC)/arm-none-eabi/lib/fpu/libm.a $(CODEGEN_PATH_A9_GCC)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A9_GCC)/arm-none-eabi/lib/fpu/libg.a +LIB_PATHS += $(EXT_LIB_arm9) $(CODEGEN_PATH_A9_GCC)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A9_GCC)/arm-none-eabi/lib/fpu/libm.a $(CODEGEN_PATH_A9_GCC)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A9_GCC)/arm-none-eabi/lib/fpu/libg.a LNK_LIBS = $(addprefix -l,$(LIB_PATHS)) # Linker - to create executable file diff --git a/makerules/rules_a15.mk b/makerules/rules_a15.mk index c262b95..0630585 100644 --- a/makerules/rules_a15.mk +++ b/makerules/rules_a15.mk @@ -120,7 +120,7 @@ _LNKFLAGS = $(LNKFLAGS_INTERNAL) $(LNKFLAGS_INTERNAL_COMMON) $(LNKFLAGS_INTERNAL # Path of the RTS library - normally doesn't change for a given tool-chain RTSLIB_PATH = -LIB_PATHS += $(EXT_LIB_a15host) $(CODEGEN_PATH_A15)/lib/gcc/arm-none-eabi/4.9.3/fpu/libgcc.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libm.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libg.a +LIB_PATHS += $(EXT_LIB_a15host) $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libm.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libg.a LNK_LIBS = $(addprefix -l,$(LIB_PATHS)) -- 2.39.2