8047734: Backout use of -Og
Reviewed-by: iveresov
This commit is contained in:
parent
a03d25366a
commit
f312adb9c5
@ -280,16 +280,7 @@ endif
|
|||||||
|
|
||||||
# optimization control flags (Used by fastdebug and release variants)
|
# optimization control flags (Used by fastdebug and release variants)
|
||||||
OPT_CFLAGS/NOOPT=-O0
|
OPT_CFLAGS/NOOPT=-O0
|
||||||
ifeq ($(USE_CLANG), true)
|
|
||||||
# Clang does not support -Og
|
|
||||||
OPT_CFLAGS/DEBUG=-O0
|
OPT_CFLAGS/DEBUG=-O0
|
||||||
else ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
|
|
||||||
# Allow basic optimizations which don't distrupt debugging. (Principally dead code elimination)
|
|
||||||
OPT_CFLAGS/DEBUG=-Og
|
|
||||||
else
|
|
||||||
# Allow no optimizations.
|
|
||||||
OPT_CFLAGS/DEBUG=-O0
|
|
||||||
endif
|
|
||||||
OPT_CFLAGS/SIZE=-Os
|
OPT_CFLAGS/SIZE=-Os
|
||||||
OPT_CFLAGS/SPEED=-O3
|
OPT_CFLAGS/SPEED=-O3
|
||||||
|
|
||||||
@ -457,16 +448,8 @@ ifeq ($(USE_CLANG), true)
|
|||||||
CFLAGS += -flimit-debug-info
|
CFLAGS += -flimit-debug-info
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_CLANG), true)
|
|
||||||
# Clang does not support -Og
|
|
||||||
DEBUG_CFLAGS=-O0
|
|
||||||
else ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
|
|
||||||
# Allow basic optimizations which don't distrupt debugging. (Principally dead code elimination)
|
|
||||||
DEBUG_CFLAGS=-Og
|
|
||||||
else
|
|
||||||
# Allow no optimizations.
|
# Allow no optimizations.
|
||||||
DEBUG_CFLAGS=-O0
|
DEBUG_CFLAGS=-O0
|
||||||
endif
|
|
||||||
|
|
||||||
# DEBUG_BINARIES uses full -g debug information for all configs
|
# DEBUG_BINARIES uses full -g debug information for all configs
|
||||||
ifeq ($(DEBUG_BINARIES), true)
|
ifeq ($(DEBUG_BINARIES), true)
|
||||||
|
@ -231,13 +231,7 @@ CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
|
|||||||
|
|
||||||
# optimization control flags (Used by fastdebug and release variants)
|
# optimization control flags (Used by fastdebug and release variants)
|
||||||
OPT_CFLAGS/NOOPT=-O0
|
OPT_CFLAGS/NOOPT=-O0
|
||||||
ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
|
|
||||||
# Allow basic optimizations which don't distrupt debugging. (Principally dead code elimination)
|
|
||||||
OPT_CFLAGS/DEBUG=-Og
|
|
||||||
else
|
|
||||||
# Allow no optimizations.
|
|
||||||
OPT_CFLAGS/DEBUG=-O0
|
OPT_CFLAGS/DEBUG=-O0
|
||||||
endif
|
|
||||||
OPT_CFLAGS/SIZE=-Os
|
OPT_CFLAGS/SIZE=-Os
|
||||||
OPT_CFLAGS/SPEED=-O3
|
OPT_CFLAGS/SPEED=-O3
|
||||||
|
|
||||||
@ -344,13 +338,8 @@ ifeq ($(USE_CLANG), true)
|
|||||||
CFLAGS += -flimit-debug-info
|
CFLAGS += -flimit-debug-info
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
|
|
||||||
# Allow basic optimizations which don't distrupt debugging. (Principally dead code elimination)
|
|
||||||
DEBUG_CFLAGS=-Og
|
|
||||||
else
|
|
||||||
# Allow no optimizations.
|
# Allow no optimizations.
|
||||||
DEBUG_CFLAGS=-O0
|
DEBUG_CFLAGS=-O0
|
||||||
endif
|
|
||||||
|
|
||||||
# DEBUG_BINARIES uses full -g debug information for all configs
|
# DEBUG_BINARIES uses full -g debug information for all configs
|
||||||
ifeq ($(DEBUG_BINARIES), true)
|
ifeq ($(DEBUG_BINARIES), true)
|
||||||
|
@ -127,13 +127,7 @@ CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
|
|||||||
|
|
||||||
# optimization control flags (Used by fastdebug and release variants)
|
# optimization control flags (Used by fastdebug and release variants)
|
||||||
OPT_CFLAGS/NOOPT=-O0
|
OPT_CFLAGS/NOOPT=-O0
|
||||||
ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
|
|
||||||
# Allow basic optimizations which don't distrupt debugging. (Principally dead code elimination)
|
|
||||||
OPT_CFLAGS/DEBUG=-Og
|
|
||||||
+else
|
|
||||||
# Allow no optimizations.
|
|
||||||
OPT_CFLAGS/DEBUG=-O0
|
OPT_CFLAGS/DEBUG=-O0
|
||||||
endif
|
|
||||||
OPT_CFLAGS/SIZE=-Os
|
OPT_CFLAGS/SIZE=-Os
|
||||||
OPT_CFLAGS/SPEED=-O3
|
OPT_CFLAGS/SPEED=-O3
|
||||||
|
|
||||||
@ -229,14 +223,8 @@ SHARED_FLAG = -shared
|
|||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
# Debug flags
|
# Debug flags
|
||||||
|
|
||||||
ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
|
|
||||||
# Allow basic optimizations which don't distrupt debugging. (Principally dead code elimination)
|
|
||||||
DEBUG_CFLAGS=-Og
|
|
||||||
else
|
|
||||||
# Allow no optimizations.
|
# Allow no optimizations.
|
||||||
DEBUG_CFLAGS=-O0
|
DEBUG_CFLAGS=-O0
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
# Use the stabs format for debugging information (this is the default
|
# Use the stabs format for debugging information (this is the default
|
||||||
# on gcc-2.91). It's good enough, has all the information about line
|
# on gcc-2.91). It's good enough, has all the information about line
|
||||||
|
Loading…
x
Reference in New Issue
Block a user