diff --git a/Makefile b/Makefile
index 7b034a53..b8a85e10 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ MW_LD      := $(TOOLS_DIR)/mwccarm/$(MW_VER)/mwldarm.exe
 MW_LICENSE := $(TOOLS_DIR)/mwccarm/license.dat
 
 ASM_FLAGS := -proc arm5te -d $(REGION) -i asm -msgstyle gcc
-CC_FLAGS  := -O2 -enum int -i include -nolink -d $(REGION) -char signed
+CC_FLAGS  := -O4,p -enum int -i include -nolink -d $(REGION) -char signed -lang=c++ -sym on
 LD_FLAGS  := -proc arm946e -nostdlib -interworking -nodead -m Entry -map closure,unused -o main.bin -msgstyle gcc
 
 ifeq ($(NONMATCHING),1)