[svn-commits] trunk r32434 - in /trunk: Makefile build_tools/cflags.xml

[svn-commits at lists.digium.com]

Author: russell
Date: Mon Jun  5 19:25:23 2006
New Revision: 32434

URL: http://svn.digium.com/view/asterisk?rev=32434&view=rev
Log:
add the ability to do the same thing as "make dont-optimize" by enabling the
option in menuselect.  This is very useful for developers if you want to ensure
that all of your builds are done without optimizations.

Modified:
    trunk/Makefile
    trunk/build_tools/cflags.xml

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jun  5 19:25:23 2006
@@ -36,22 +36,6 @@
 
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
-
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions.  This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.  
-#K6OPT  = -DK6OPT
-
-# Tell gcc to optimize the code
-OPTIMIZE+=-O6
-else
-  # Stack backtraces, while useful for debugging, are incompatible with optimizations
-  ifeq (${OSARCH},Linux)
-    CFLAGS+=-DSTACK_BACKTRACES
-  endif
-endif
 
 # Overwite config files on "make samples"
 OVERWRITE=y
@@ -147,6 +131,29 @@
 MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
 OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
 
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
+  ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
+# More GSM codec optimization
+# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+# which support MMX instructions.  This should be newer pentiums,
+# ppro's, etc, as well as the AMD K6 and K7.  
+#K6OPT  = -DK6OPT
+
+# Tell gcc to optimize the code
+OPTIMIZE+=-O6
+  else
+    # Stack backtraces, while useful for debugging, are incompatible with optimizations
+    ifeq (${OSARCH},Linux)
+      CFLAGS+=-DSTACK_BACKTRACES
+    endif
+  endif
+else
+  # Stack backtraces, while useful for debugging, are incompatible with optimizations
+  ifeq (${OSARCH},Linux)
+    CFLAGS+=-DSTACK_BACKTRACES
+  endif
+endif
+
 #   *CLI> show memory allocations [filename]
 #   *CLI> show memory summary [filename]
 ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)

Modified: trunk/build_tools/cflags.xml
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/cflags.xml?rev=32434&r1=32433&r2=32434&view=diff
==============================================================================
--- trunk/build_tools/cflags.xml (original)
+++ trunk/build_tools/cflags.xml Mon Jun  5 19:25:23 2006
@@ -6,6 +6,8 @@
 		<member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
 		</member>
 		<member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
+		</member>
+		<member name="DONT_OPTIMIZE" displayname="Disable Optimizations from the Compiler">
 		</member>
 		<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
 		</member>