svn commit: trunk/busybox

vda at busybox.net vda at busybox.net
Thu Jun 12 20:23:05 UTC 2008


Author: vda
Date: 2008-06-12 13:23:03 -0700 (Thu, 12 Jun 2008)
New Revision: 22309

Log:
Reinstate DEBUG_PESSIMIZE (by Christian Ionescu-Idbohrn)



Modified:
   trunk/busybox/Config.in
   trunk/busybox/Makefile.flags


Changeset:
Modified: trunk/busybox/Config.in
===================================================================
--- trunk/busybox/Config.in	2008-06-12 16:56:52 UTC (rev 22308)
+++ trunk/busybox/Config.in	2008-06-12 20:23:03 UTC (rev 22309)
@@ -396,6 +396,17 @@
 
 	  Most people should answer N.
 
+config DEBUG_PESSIMIZE
+	bool "Disable compiler optimizations."
+	default n
+	depends on DEBUG
+	help
+	  The compiler's optimization of source code can eliminate and reorder
+	  code, resulting in an executable that's hard to understand when
+	  stepping through it with a debugger.  This switches it off, resulting
+	  in a much bigger executable that more closely matches the source
+	  code.
+
 config WERROR
 	bool "Abort compilation on any warning"
 	default n
@@ -404,18 +415,6 @@
 
 	  Most people should answer N.
 
-# Seems to be unused
-#config DEBUG_PESSIMIZE
-#	bool "Disable compiler optimizations."
-#	default n
-#	depends on DEBUG
-#	help
-#	  The compiler's optimization of source code can eliminate and reorder
-#	  code, resulting in an executable that's hard to understand when
-#	  stepping through it with a debugger.  This switches it off, resulting
-#	  in a much bigger executable that more closely matches the source
-#	  code.
-
 choice
 	prompt "Additional debugging library"
 	default NO_DEBUG_LIB

Modified: trunk/busybox/Makefile.flags
===================================================================
--- trunk/busybox/Makefile.flags	2008-06-12 16:56:52 UTC (rev 22308)
+++ trunk/busybox/Makefile.flags	2008-06-12 20:23:03 UTC (rev 22309)
@@ -35,7 +35,7 @@
 # gcc 3.x emits bogus "old style proto" warning on find.c:alloc_action()
 CFLAGS += $(call cc-ifversion, -ge, 0400, -Wold-style-definition)
 
-CFLAGS += $(call cc-option,-Os -fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,)
+CFLAGS += $(call cc-option,-fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,)
 # -fno-guess-branch-probability: prohibit pseudo-random guessing
 # of branch probabilities (hopefully makes bloatcheck more stable):
 CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
@@ -46,9 +46,16 @@
 # be fixed..
 #CFLAGS+=$(call cc-option,-Wconversion,)
 
-ifeq ($(CONFIG_DEBUG),y)
-CFLAGS += $(call cc-option,-g)
+ifneq ($(CONFIG_DEBUG),y)
+CFLAGS += $(call cc-option,-Os,)
+else
+CFLAGS += $(call cc-option,-g,)
+ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
+CFLAGS += $(call cc-option,-O0,)
+else
+CFLAGS += $(call cc-option,-Os,)
 endif
+endif
 
 # If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)...
 ARCH_FPIC ?= -fpic




More information about the busybox-cvs mailing list