diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-06-06 00:25:23 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-06-06 00:25:23 +0000 |
| commit | 06b381a54da1f50edf3c1664d0ea09ef471f6db0 (patch) | |
| tree | 98e33e8c86ed09ad4010914ec5069746f49ce243 | |
| parent | e856010714a91f3cf784fb3a951fdbc348e05f32 (diff) | |
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.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | Makefile | 39 | ||||
| -rw-r--r-- | build_tools/cflags.xml | 2 |
2 files changed, 25 insertions, 16 deletions
@@ -37,22 +37,6 @@ PWD=$(shell pwd) # 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 @@ TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude 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)),) diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index 0b53a299e..dedc45814 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -7,6 +7,8 @@ </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> <member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage"> |