!300 修复不能开启硬浮点选项的问题

Merge pull request !300 from Zhaotianyu/0910fix_fpu_hard

BUILD.gn

@@ -29,9 +29,17 @@
 
 import("config.gni")
 
+LITEOS_LOS_CONFIG_H = rebase_path("$LITEOSTOPDIR/kernel/include/los_config.h")
+
 config("los_config") {
   cflags = [ "-Werror" ]
 
+  asmflags = [
+    "-DCLZ=CLZ",
+    "-imacros",
+    "$LITEOS_LOS_CONFIG_H",
+  ]
+
   include_dirs = [
     "//kernel/liteos_m/kernel/include",
     "//kernel/liteos_m/kernel/arch/include",

components/cppsupport/los_cppsupport.c

@@ -31,7 +31,6 @@
 
 #include "los_cppsupport.h"
 
-
 typedef VOID (*InitFunc)(VOID);
 
 INT32 LOS_CppSystemInit(UINTPTR initArrayStart, UINTPTR initArrayEnd)
@@ -46,5 +45,3 @@ INT32 LOS_CppSystemInit(UINTPTR initArrayStart, UINTPTR initArrayEnd)
 
     return 0;
 }
-
-

targets/riscv_nuclei_demo_soc_gcc/GCC/Makefile

@@ -176,7 +176,7 @@ $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
 	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
 
 $(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
-	$(AS) -c $(CFLAGS) $< -o $@
+	$(AS) -c $(CFLAGS) $(ASFLAGS) $< -o $@
 
 $(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile $(LDSCRIPT)
 	$(CC) $(OBJECTS) $(LDFLAGS) -o $@

targets/riscv_nuclei_demo_soc_gcc/GCC/liteos_m.mk

@@ -36,9 +36,11 @@ C_INCLUDES    += -I. \
                  -I$(LITEOSTOPDIR)/kernel/arch/include \
                  -I$(LITEOSTOPDIR)/kernel/arch/risc-v/nuclei/gcc
 
+ASFLAGS       += -imacros $(LITEOSTOPDIR)/kernel/include/los_config.h -DCLZ=CLZ
+
 # list of ASM .S program objects
 OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASMS_SOURCES:.S=.o)))
 vpath %.S $(sort $(dir $(ASMS_SOURCES)))
 
 $(BUILD_DIR)/%.o: %.S Makefile | $(BUILD_DIR)
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(CC) -c $(CFLAGS) $(ASFLAGS) $< -o $@

targets/riscv_nuclei_gd32vf103_soc_gcc/GCC/Makefile

@@ -178,7 +178,7 @@ $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
 	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
 
 $(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
-	$(AS) -c $(CFLAGS) $< -o $@
+	$(AS) -c $(CFLAGS) $(ASFLAGS) $< -o $@
 
 $(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile $(LDSCRIPT)
 	$(CC) $(OBJECTS) $(LDFLAGS) -o $@

targets/riscv_nuclei_gd32vf103_soc_gcc/GCC/liteos_m.mk

@@ -36,9 +36,11 @@ C_INCLUDES    += -I. \
                  -I$(LITEOSTOPDIR)/kernel/arch/include \
                  -I$(LITEOSTOPDIR)/kernel/arch/risc-v/nuclei/gcc
 
+ASFLAGS       += -imacros $(LITEOSTOPDIR)/kernel/include/los_config.h -DCLZ=CLZ
+
 # list of ASM .S program objects
 OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASMS_SOURCES:.S=.o)))
 vpath %.S $(sort $(dir $(ASMS_SOURCES)))
 
 $(BUILD_DIR)/%.o: %.S Makefile | $(BUILD_DIR)
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(CC) -c $(CFLAGS) $(ASFLAGS) $< -o $@