Commit e493c6bf authored by Thanassis Tsiodras's avatar Thanassis Tsiodras

Use proper compiler (as per Sebastian's suggestions)

parent 21e7e205
Pipeline #70 skipped
# Configuration section # Configuration section
# #
# Use environment variables if found, otherwise fallback to sane defaults # Use environment variables if found, otherwise fallback to sane defaults
# If not explicitely selected (with 'make FPU=1'), compile for FPU emulation
ifeq ($(FPU),)
FPU=0
endif
# To be able to properly handle any combination of (FPU, LEON, release)
# options, create a SUFFIX (see below) to differentiate output folders
ifeq ($(FPU),1)
FPU_SUFFIX=FPU
else
FPU_SUFFIX=NONFPU
endif
# Build up our settings from our inputs and our environment
LEON ?= leon3 LEON ?= leon3
RTEMS ?= /opt/rtems-4.11-2016.04.01.FPU RTEMS ?= /opt/rtems-4.11-2016.04.01.${FPU_SUFFIX}
RTEMS_MAKEFILE_PATH ?= ${RTEMS}/sparc-rtems4.11/${LEON} RTEMS_MAKEFILE_PATH ?= ${RTEMS}/sparc-rtems4.11/${LEON}
RTEMS_LIB=${RTEMS_MAKEFILE_PATH}/lib RTEMS_LIB=${RTEMS_MAKEFILE_PATH}/lib
CROSS_PREFIX=sparc-rtems4.11 CROSS_PREFIX=sparc-rtems4.11
# Detect the platform (last part of the path of RTEMS_MAKEFILE_PATH - e.g. leon3, leon2, etc) # If not selected, compile debug version of binary (no optimizations)
PLATFORM = $(shell sh -c "echo ${RTEMS_MAKEFILE_PATH} | sed 's,^.*/,,'") #ifeq ($(CFG),)
#CFG=debug
#endif
# The directories containing the source files, separated by ':' # The directories containing the source files, separated by ':'
VPATH=src VPATH=src
# If not selected, compile debug version of binary (no optimizations)
ifeq ($(CFG),)
CFG=debug
endif
# If not explicitely selected (with 'make FPU=1'), compile for FPU emulation
ifeq ($(FPU),)
FPU=0
endif
# Your source files: regardless of where they reside in the source tree, # Your source files: regardless of where they reside in the source tree,
# VPATH will locate them... # VPATH will locate them...
NONFPU_SRC= \ NONFPU_SRC= \
init.c init.c \
task2.c
# Code that must be compiled with native FPU enabled (when FPU=1 is passed)
FPU_SRC= \ FPU_SRC= \
task1.c \ task1.c
task2.c
SUFFIX=$(CFG).$(FPU_SUFFIX).$(LEON)
# Build a Dependency list and an Object list, by replacing the .c # Build a Dependency list and an Object list, by replacing the .c
# extension to .d for dependency files, and .o for object files. # extension to .d for dependency files, and .o for object files.
NONFPU_DEP = $(patsubst %.c, deps.$(CFG)/NONFPU_%.d, ${NONFPU_SRC}) NONFPU_DEP = $(patsubst %.c, deps.$(SUFFIX)/NONFPU_%.d, ${NONFPU_SRC})
FPU_DEP = $(patsubst %.c, deps.$(CFG)/FPU_%.d, ${FPU_SRC}) FPU_DEP = $(patsubst %.c, deps.$(SUFFIX)/FPU_%.d, ${FPU_SRC})
NONFPU_OBJ = $(patsubst %.c, objs.$(CFG)/NONFPU_%.o, ${NONFPU_SRC}) NONFPU_OBJ = $(patsubst %.c, objs.$(SUFFIX)/NONFPU_%.o, ${NONFPU_SRC})
FPU_OBJ = $(patsubst %.c, objs.$(CFG)/FPU_%.o, ${FPU_SRC}) FPU_OBJ = $(patsubst %.c, objs.$(SUFFIX)/FPU_%.o, ${FPU_SRC})
# Your final binary # Your final binary
TARGET=fputest TARGET=fputest
...@@ -59,16 +69,16 @@ COMMON += -B${RTEMS_LIB} -specs bsp_specs -qrtems \ ...@@ -59,16 +69,16 @@ COMMON += -B${RTEMS_LIB} -specs bsp_specs -qrtems \
# Separate compile options per configuration # Separate compile options per configuration
ifeq ($(CFG),debug) ifeq ($(CFG),debug)
CFLAGS += ${COMMON} -g -D_DEBUG ${INCLUDEFLAGS} -msoft-float CFLAGS += ${COMMON} -g -D_DEBUG ${INCLUDEFLAGS}
else else
CFLAGS += ${COMMON} -g -O2 ${INCLUDEFLAGS} -msoft-float CFLAGS += ${COMMON} -g -O2 ${INCLUDEFLAGS}
endif endif
# Should we generate native FPU instructions for the FPU_SRC? # Should we generate native FPU instructions for the FPU_SRC?
ifeq ($(FPU),1) ifeq ($(FPU),1)
CFLAGS:=$(shell bash -c "echo ${CFLAGS} | sed 's,-msoft-float,,'")
CFLAGS_FPU:=${CFLAGS} CFLAGS_FPU:=${CFLAGS}
else else
CFLAGS += -msoft-float
CFLAGS_FPU:=${CFLAGS} CFLAGS_FPU:=${CFLAGS}
LDFLAGS += -msoft-float LDFLAGS += -msoft-float
endif endif
...@@ -76,22 +86,29 @@ endif ...@@ -76,22 +86,29 @@ endif
# A common link flag for all configurations # A common link flag for all configurations
LDFLAGS += ${COMMON} -Wl,--gc-sections LDFLAGS += ${COMMON} -Wl,--gc-sections
all: inform bin.$(CFG)/${TARGET} all: inform bin.$(SUFFIX)/${TARGET}
inform: inform:
ifneq ($(CFG),release) ifneq ($(CFG),release)
ifneq ($(CFG),debug) ifneq ($(CFG),debug)
@echo "Invalid configuration "$(CFG)" specified." @echo " "
@echo "Invalid or missing configuration (CFG) "$(CFG)" specified."
@echo " "
@echo "You must specify a configuration when running make, e.g." @echo "You must specify a configuration when running make, e.g."
@echo "make CFG=debug" @echo " "
@echo @echo " make CFG=debug LEON=leon3 FPU=1 V=1"
@echo "Possible choices for configuration are 'release' and 'debug'" @echo " "
@echo "- Possible choices for CFG are 'release' and 'debug'"
@echo "- Possible choices for LEON are 'leon2' and 'leon3' (default)"
@echo "- Possible choices for FPU are '1' (native) and '0' (emulated) (default)"
@echo "- Possible choices for V are '1' (show commands) and '0' (silent) (default)"
@echo " "
@exit 1 @exit 1
endif endif
endif endif
bin.$(CFG)/${TARGET}: ${NONFPU_OBJ} ${FPU_OBJ} | inform bin.$(SUFFIX)/${TARGET}: ${NONFPU_OBJ} ${FPU_OBJ} | inform
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
ifeq ($(V),1) ifeq ($(V),1)
$(CC) -g -o $@ $^ ${LDFLAGS} $(CC) -g -o $@ $^ ${LDFLAGS}
...@@ -103,9 +120,9 @@ ifeq ($(CFG),release) ...@@ -103,9 +120,9 @@ ifeq ($(CFG),release)
@${CROSS_PREFIX}-objcopy --only-keep-debug $@ ${@}.debug @${CROSS_PREFIX}-objcopy --only-keep-debug $@ ${@}.debug
@${CROSS_PREFIX}-strip $@ @${CROSS_PREFIX}-strip $@
endif endif
@echo Built with RTEMS at ${RTEMS_LIB} for ${PLATFORM}. @echo Built with RTEMS at ${RTEMS_LIB} for ${LEON}.
objs.$(CFG)/NONFPU_%.o: %.c objs.$(SUFFIX)/NONFPU_%.o: %.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
ifeq ($(V),1) ifeq ($(V),1)
$(CC) -c $(CFLAGS) -o $@ $< $(CC) -c $(CFLAGS) -o $@ $<
...@@ -114,7 +131,7 @@ else ...@@ -114,7 +131,7 @@ else
@$(CC) -c $(CFLAGS) -o $@ $< @$(CC) -c $(CFLAGS) -o $@ $<
endif endif
objs.$(CFG)/FPU_%.o: %.c objs.$(SUFFIX)/FPU_%.o: %.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
ifeq ($(V),1) ifeq ($(V),1)
$(CC) -c $(CFLAGS_FPU) -o $@ $< $(CC) -c $(CFLAGS_FPU) -o $@ $<
...@@ -123,14 +140,14 @@ else ...@@ -123,14 +140,14 @@ else
@$(CC) -c $(CFLAGS_FPU) -o $@ $< @$(CC) -c $(CFLAGS_FPU) -o $@ $<
endif endif
deps.$(CFG)/NONFPU_%.d: %.c deps.$(SUFFIX)/NONFPU_%.d: %.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo Generating dependencies for $< @echo Generating dependencies for $<
@set -e ; $(CDEP) -MM -MP $(INCLUDEFLAGS) $< > $@.$$$$; \ @set -e ; $(CDEP) -MM -MP $(INCLUDEFLAGS) $< > $@.$$$$; \
sed 's,\($*\)\.o[ :]*,objs.$(CFG)\/NONFPU_\1.o $@ : ,g' < $@.$$$$ > $@; \ sed 's,\($*\)\.o[ :]*,objs.$(CFG)\/NONFPU_\1.o $@ : ,g' < $@.$$$$ > $@; \
rm -f $@.$$$$ rm -f $@.$$$$
deps.$(CFG)/FPU_%.d: %.c deps.$(SUFFIX)/FPU_%.d: %.c
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo Generating dependencies for $< @echo Generating dependencies for $<
@set -e ; $(CDEP) -MM -MP $(INCLUDEFLAGS) $< > $@.$$$$; \ @set -e ; $(CDEP) -MM -MP $(INCLUDEFLAGS) $< > $@.$$$$; \
...@@ -138,9 +155,7 @@ deps.$(CFG)/FPU_%.d: %.c ...@@ -138,9 +155,7 @@ deps.$(CFG)/FPU_%.d: %.c
rm -f $@.$$$$ rm -f $@.$$$$
clean: clean:
@rm -rf \ @rm -rf deps.* objs.* bin.*
deps.debug objs.debug bin.debug \
deps.release objs.release bin.release
# Unless "make clean" is called, include the dependency files # Unless "make clean" is called, include the dependency files
# which are auto-generated. Don't fail if they are missing # which are auto-generated. Don't fail if they are missing
......
...@@ -27,7 +27,7 @@ rtems_task Init(rtems_task_argument argument) ...@@ -27,7 +27,7 @@ rtems_task Init(rtems_task_argument argument)
RTEMS_MINIMUM_STACK_SIZE, RTEMS_MINIMUM_STACK_SIZE,
RTEMS_DEFAULT_MODES, // use RTEMS_DEFAULT_MODES | RTEMS_TIMESLICE for Linux/Windows like RTEMS_DEFAULT_MODES, // use RTEMS_DEFAULT_MODES | RTEMS_TIMESLICE for Linux/Windows like
// handling of tasks with same priority (i.e. pre-emption) // handling of tasks with same priority (i.e. pre-emption)
i == 0 ? RTEMS_FLOATING_POINT : RTEMS_DEFAULT_ATTRIBUTES, i == 1 ? RTEMS_FLOATING_POINT : RTEMS_DEFAULT_ATTRIBUTES,
&Task_id[i]); &Task_id[i]);
if (status != RTEMS_SUCCESSFUL) { if (status != RTEMS_SUCCESSFUL) {
printf("Failed to rtems_task_create... status:%0x\n", status); printf("Failed to rtems_task_create... status:%0x\n", status);
...@@ -37,7 +37,7 @@ rtems_task Init(rtems_task_argument argument) ...@@ -37,7 +37,7 @@ rtems_task Init(rtems_task_argument argument)
// Start Task // Start Task
status = rtems_task_start( status = rtems_task_start(
Task_id[i], Task_id[i],
i == 0 ? Task1_EntryPoint : Task2_EntryPoint, i == 1 ? Task1_EntryPoint : Task2_EntryPoint,
i); i);
} }
printf("Parent task sleeps for a second...\n"); printf("Parent task sleeps for a second...\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment