diff options
| -rw-r--r-- | src/Makefile.housekeeping | 4 | ||||
| -rw-r--r-- | src/include/compiler.h | 17 |
2 files changed, 4 insertions, 17 deletions
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index c0c1c910..e240a738 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -533,14 +533,14 @@ endif # COMPILE_c = $(CC) $(CFLAGS) $(CFLAGS_c) $(OBJ_CFLAGS) RULE_c = $(Q)$(COMPILE_c) -c $< -o $@ $(POST_O) -RULE_c_to_dbg%.o = $(Q)$(COMPILE_c) -Ddebug_$(subst -,_,$(OBJECT))=$* -c $< -o $@ $(POST_O) +RULE_c_to_dbg%.o = $(Q)$(COMPILE_c) -DDBGLVL_MAX=$* -c $< -o $@ $(POST_O) RULE_c_to_c = $(Q)$(COMPILE_c) -E -c $< > $@ RULE_c_to_s = $(Q)$(COMPILE_c) -S -g0 -c $< -o $@ PREPROCESS_S = $(CPP) $(CFLAGS) $(CFLAGS_S) $(OBJ_CFLAGS) ASSEMBLE_S = $(AS) $(ASFLAGS) RULE_S = $(Q)$(PREPROCESS_S) $< | $(ASSEMBLE_S) -o $@ -RULE_S_to_dbg%.o = $(Q)$(PREPROCESS_S) -Ddebug_$(subst -,_,$(OBJECT))=$* $< | $(ASSEMBLE_S) -o $@ +RULE_S_to_dbg%.o = $(Q)$(PREPROCESS_S) -DDBGLVL_MAX=$* $< | $(ASSEMBLE_S) -o $@ RULE_S_to_s = $(Q)$(PREPROCESS_S) $< > $@ DEBUG_TARGETS += dbg%.o c s diff --git a/src/include/compiler.h b/src/include/compiler.h index 132793b5..3f5c913a 100644 --- a/src/include/compiler.h +++ b/src/include/compiler.h @@ -250,16 +250,9 @@ REQUEST_EXPANDED ( CONFIG_SYMBOL ); * */ -/* - * If debug_OBJECT is set to a true value, the macro DBG(...) will - * expand to printf(...) when compiling OBJECT, and the symbol - * DEBUG_LEVEL will be inserted into the object file. - * - */ -#define DEBUG_SYMBOL PREFIX_OBJECT ( debug_ ) - -#if DEBUG_SYMBOL == 0 +#ifndef DBGLVL_MAX #define NDEBUG +#define DBGLVL_MAX 0 #endif #ifndef ASSEMBLY @@ -276,12 +269,6 @@ extern void dbg_md5_da ( unsigned long dispaddr, extern void dbg_pause ( void ); extern void dbg_more ( void ); -#if DEBUG_SYMBOL -#define DBGLVL_MAX DEBUG_SYMBOL -#else -#define DBGLVL_MAX 0 -#endif - /* Allow for selective disabling of enabled debug levels */ #if DBGLVL_MAX int __debug_disable; |