X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Frules.mk;h=6b858474124b85b6cbdbf5a991af093e369e438d;hb=57dfb183e24175bc782647d4e6aebe31063f3881;hp=a6dae1df6c4df24ac409deea85af27f6bcbd1e81;hpb=18c5f92e969edd499f2c41110984a131fa9693f3;p=bertos.git

diff --git a/bertos/rules.mk b/bertos/rules.mk
index a6dae1df..6b858474 100644
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -161,6 +161,9 @@ ifeq ($$($(1)_DEBUG),1)
 
         $(1)_CFLAGS += -D_DEBUG
         $(1)_CXXFLAGS += -D_DEBUG
+else
+        $(1)_CFLAGS += -fomit-frame-pointer
+        $(1)_CXXFLAGS += -fomit-frame-pointer
 endif
 
 $(1)_COBJ    = $$(foreach file,$$($(1)_CSRC:%.c=%.o),$$(OBJDIR)/$(1)/$$(file))
@@ -172,49 +175,40 @@ $(1)_OBJ    := $$($(1)_COBJ) $$($(1)_CXXOBJ) $$($(1)_PCOBJ) $$($(1)_AOBJ) $$($(1
 $(1)_SRC    := $$($(1)_CSRC) $$($(1)_CXXSRC) $$($(1)_PCSRC) $$($(1)_ASRC) $$($(1)_CPPASRC)
 OBJ         += $$($(1)_OBJ)
 
-# Sometimes $(CC) is actually set to a C++ compiler in disguise, and it
-# would whine if we passed it C-only flags.  Checking for the presence of
-# "++" in the name is a kludge that seems to work mostly.
-ifeq (++,$$(findstring ++,$$($(1)_CC)))
-        $(1)_REAL_CFLAGS = $$(CXXFLAGS)
-else
-	$(1)_REAL_CFLAGS = $$(CFLAGS)
-endif
-
 # Compile: instructions to create assembler and/or object files from C source
 $$($(1)_COBJ) : $$(OBJDIR)/$(1)/%.o : %.c
 	$L "$(1): Compiling $$< (C)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CC) -c $$($(1)_REAL_CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CC) -c $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$($$(*F)_CFLAGS) $$< -o $$@
 
 # Compile: instructions to create assembler and/or object files from C++ source
 $$($(1)_CXXOBJ) : $$(OBJDIR)/$(1)/%.o : %.cpp
 	$L "$(1): Compiling $$< (C++)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CXX) -c $$(CXXFLAGS) $$($(1)_CXXFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CXX) -c $$(CXXFLAGS) $$($(1)_CXXFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$($$(*F)_CXXFLAGS) $$< -o $$@
 
 # Generate assembly sources from C files (debug)
 $$(OBJDIR)/$(1)/%.s : %.c
 	$L "$(1): Generating asm source $$<"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CC) -S $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CC) -S $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$($$(*F)_CFLAGS) $$< -o $$@
 
 # Generate special progmem variant of a source file
 $$($(1)_PCOBJ) : $$(OBJDIR)/$(1)/%_P.o : %.c
 	$L "$(1): Compiling $$< (PROGMEM)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CC) -c -D_PROGMEM $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CC) -c -D_PROGMEM $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$($$(*F)_CFLAGS) $$< -o $$@
 
 # Assemble: instructions to create object file from assembler files
 $$($(1)_AOBJ): $$(OBJDIR)/$(1)/%.o : %.s
 	$L "$(1): Assembling $$<"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_AS) -c $$(ASFLAGS) $$($(1)_ASFLAGS) $$< -o $$@
+	$Q $$($(1)_AS) -c $$(ASFLAGS) $$($(1)_ASFLAGS) $$($$(*F)_ASFLAGS) $$< -o $$@
 
 $$($(1)_CPPAOBJ): $$(OBJDIR)/$(1)/%.o : %.S
 	$L "$(1): Assembling with CPP $$<"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$($(1)_CC) -c $$(CPPAFLAGS) $$($(1)_CPPAFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+	$Q $$($(1)_CC) -c $$(CPPAFLAGS) $$($(1)_CPPAFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$($$(*F)_CPPAFLAGS) $$< -o $$@
 
 
 # Link: instructions to create elf output file from object files
@@ -242,22 +236,62 @@ $$(OUTDIR)/$(1)_whole.elf: bumprev $$($(1)_SRC) $$($(1)_LDSCRIPT)
 	$Q $$($(1)_CC) $$($(1)_SRC) $$(CFLAGS) $$($(1)_CFLAGS) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$@
 
 # Flash target
-# NOTE: we retry in case of failure because the STK500 programmer is crappy
 .PHONY: flash_$(1)
 flash_$(1): $(OUTDIR)/$(1).hex flash_$(1)_local
 	$L "$(1): Flashing target"
+	$Q if [ ! -f $$($(1)_FLASH_SCRIPT) ] ; then \
+		printf "CLDLG: No flash script found.\n" ; \
+		exit 1 ; \
+	fi
 	$Q if [ ! "$$($(1)_PROGRAMMER_TYPE)" == "none" ] ; then \
 		PROGRAMMER_CPU=$$($(1)_PROGRAMMER_CPU) PROGRAMMER_TYPE=$$($(1)_PROGRAMMER_TYPE) \
 		PROGRAMMER_PORT=$$($(1)_PROGRAMMER_PORT) IMAGE_FILE=$$< \
 		$$($(1)_FLASH_SCRIPT) ; \
 	else \
-		printf "No programmer interface configured, see http://dev.bertos.org/wiki/ProgrammerInterface\n" ; \
+		printf "CLDLG: No programmer interface configured, see http://dev.bertos.org/wiki/ProgrammerInterface\n" ; \
 		exit 1 ; \
-	fi
+	fi 
 
 .PHONY: flash_$(1)_local
 flash_$(1)_local:
 
+.PHONY: stopflash_$(1)
+stopflash_$(1): 
+	$L "$(1): Stopping target flashing"
+	$Q if [ ! -f $$($(1)_STOPFLASH_SCRIPT) ] ; then \
+		printf "CLDLG: No stopflash script found.\n" ; \
+		exit 1 ; \
+	fi
+	$Q $$($(1)_STOPFLASH_SCRIPT) ;
+
+
+# Debug target
+.PHONY: debug_$(1)
+debug_$(1): $(OUTDIR)/$(1).elf
+	$L "$(1): Debugging target"
+	$Q if [ ! -f $$($(1)_DEBUG_SCRIPT) ] ; then \
+		printf "CLDLG: No debug script found.\n" ; \
+		exit 1 ; \
+	fi
+	$Q if [ ! "$$($(1)_PROGRAMMER_TYPE)" == "none" ] ; then \
+		PROGRAMMER_CPU=$$($(1)_PROGRAMMER_CPU) PROGRAMMER_TYPE=$$($(1)_PROGRAMMER_TYPE) \
+		PROGRAMMER_PORT=$$($(1)_PROGRAMMER_PORT) GDB_PORT=3333 \
+		ELF_FILE=$$< \
+		$$($(1)_DEBUG_SCRIPT) ; \
+	else \
+		printf "CLDLG: No programmer interface configured, see http://dev.bertos.org/wiki/ProgrammerInterface\n" ; \
+		exit 1 ; \
+	fi
+
+.PHONY: stopdebug_$(1)
+stopdebug_$(1): 
+	$L "$(1): Stopping debugger"
+	$Q if [ ! -f $$($(1)_STOPDEBUG_SCRIPT) ] ; then \
+		printf "CLDLG: No stopdebug script found.\n" ; \
+		exit 1 ; \
+	fi
+	$Q $$($(1)_STOPDEBUG_SCRIPT) ;
+
 .PHONY: fuses_$(!)
 fuses_$(1):
 	if [ ! -z "$$($(1)_efuse)" ] ; then \