diff --git a/cpp.mk b/cpp.mk
index 1694a89f..cb1f14d3 100644
--- a/cpp.mk
+++ b/cpp.mk
@@ -3,9 +3,9 @@ AS=x86_64-elf-as
 OC=x86_64-elf-objcopy
 AR=x86_64-elf-ar
 
-OPTIMIZATION_LEVEL=-Os
+OPTIMIZATION_LEVEL=-g -Os
 WARNING_FLAGS=-Wall -Wextra -pedantic -Wold-style-cast
-COMMON_CPP_FLAGS=$(OPTIMIZATION_LEVEL) -masm=intel -I../../tstl/include/ -I../printf/include/ -I../tstl/include/ -I../tlib/include/ -Iinclude/ -nostdlib -g -Os -std=c++11 -fno-stack-protector -fno-exceptions -funsigned-char -fno-rtti -ffreestanding -fomit-frame-pointer -mno-red-zone -mno-3dnow -mno-mmx -fno-asynchronous-unwind-tables
+COMMON_CPP_FLAGS=$(OPTIMIZATION_LEVEL) -masm=intel -I../../tstl/include/ -I../printf/include/ -I../tstl/include/ -I../tlib/include/ -Iinclude/ -nostdlib -std=c++11 -fno-stack-protector -fno-exceptions -funsigned-char -fno-rtti -ffreestanding -fomit-frame-pointer -mno-red-zone -mno-3dnow -mno-mmx -fno-asynchronous-unwind-tables
 
 DISABLE_SSE_FLAGS=-mno-sse -mno-sse2 -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2
 ENABLE_SSE_FLAGS=-msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2