diff --git a/make/defs.mk b/make/defs.mk
index c5f24553..4585f262 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -762,13 +762,13 @@ ifeq ($(USE_STACK_CHECK),true)
 endif
 
 ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
-	BUILD_CFLAGS+= -g3 -ggdb
-	BUILD_CPPFLAGS    += -g3 -ggdb
-	BUILD_LDFLAGS     += -g3 -ggdb
+	BUILD_CFLAGS      += -gdwarf-2 -g3 -ggdb
+	BUILD_CPPFLAGS    += -gdwarf-2 -g3 -ggdb
+	BUILD_LDFLAGS     += -gdwarf-2 -g3 -ggdb
 endif
 
 ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
-	BUILD_CFLAGS+= -funroll-loops -O2
+	BUILD_CFLAGS      += -funroll-loops -O2
 	BUILD_CPPFLAGS    += -funroll-loops -O2
 else
 	NO_OPT_FLAGS = \