diff options
| author | Nathaniel Graff <nathaniel.graff@sifive.com> | 2019-03-05 18:45:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 18:45:37 +0000 |
| commit | 27ce8f39998000aec5c1a309d3147c925117eb93 (patch) | |
| tree | 783163ce2c6c8326eb5895065355ab3668326b62 /scripts | |
| parent | 292612e3ed9861088255d961d024863c56e4bd18 (diff) | |
| parent | 0af076bd25030fe95336a6314809b0552891225f (diff) | |
Merge pull request #177 from sifive/set-cmodel
Use settings.mk to set the code model for the target
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/libmetal.mk | 2 | ||||
| -rw-r--r-- | scripts/standalone.mk | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/scripts/libmetal.mk b/scripts/libmetal.mk index ea16632..6e6aada 100644 --- a/scripts/libmetal.mk +++ b/scripts/libmetal.mk @@ -13,7 +13,7 @@ $(BSP_DIR)/build/Makefile: @rm -rf $(dir $@) @mkdir -p $(dir $@) cd $(dir $@) && \ - CFLAGS="-march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -ffunction-sections -fdata-sections -g -mcmodel=medany" \ + CFLAGS="-march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -ffunction-sections -fdata-sections -g -mcmodel=$(RISCV_CMODEL)" \ $(abspath $(MEE_SOURCE_PATH)/configure) \ --host=$(CROSS_COMPILE) \ --prefix=$(abspath $(BSP_DIR)/install) \ diff --git a/scripts/standalone.mk b/scripts/standalone.mk index e5f2ff7..e80e0c1 100644 --- a/scripts/standalone.mk +++ b/scripts/standalone.mk @@ -28,6 +28,10 @@ ifeq ($(RISCV_ABI),) $(error $(BSP_DIR)/board.mk must set RISCV_ABI, the ABI to target) endif +ifeq ($(RISCV_CMODEL),) +RISCV_CMODEL = medany +endif + # Determines the XLEN from the toolchain tuple ifeq ($(patsubst rv32%,rv32,$(RISCV_ARCH)),rv32) RISCV_XLEN := 32 @@ -92,8 +96,8 @@ $(PROGRAM_ELF): \ AR=$(RISCV_AR) \ CC=$(RISCV_GCC) \ CXX=$(RISCV_GXX) \ - CFLAGS="-Os -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -ffunction-sections -fdata-sections -g -mcmodel=medany -I$(abspath $(BSP_DIR)/install/include/)" \ - CXXFLAGS="-Os -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -ffunction-sections -fdata-sections -g -mcmodel=medany -I$(abspath $(BSP_DIR)/install/include/)" \ + CFLAGS="-Os -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -ffunction-sections -fdata-sections -g -mcmodel=$(RISCV_CMODEL) -I$(abspath $(BSP_DIR)/install/include/)" \ + CXXFLAGS="-Os -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -ffunction-sections -fdata-sections -g -mcmodel=$(RISCV_CMODEL) -I$(abspath $(BSP_DIR)/install/include/)" \ LDFLAGS="-nostartfiles -nostdlib -L$(sort $(dir $(abspath $(filter %.a,$^)))) -T$(abspath $(filter %.lds,$^))" \ LDLIBS="-Wl,--gc-sections -Wl,--start-group -lc -lgcc -lmetal -lmetal-gloss -Wl,--end-group" touch -c $@ |