diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index e04d8c34aa..793b4588bc 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -403,11 +403,6 @@ HAIKU_KERNEL_WARNING_C++FLAGS = -Wall -Wno-trigraphs -Wno-multichar ;
 # debug flags
 HAIKU_DEBUG_FLAGS ?= -ggdb ;
 
-# TODO: remove once Debugger properly supports gcc4 .eh_frames
-if $(HAIKU_GCC_VERSION[1]) >= 4 {
-	HAIKU_DEBUG_FLAGS += -fno-dwarf2-cfi-asm ;
-}
-
 # debug 0: suppress asserts
 HAIKU_DEBUG_0_CCFLAGS = [ FDefines NDEBUG=$(NDEBUG) ] ;
 HAIKU_DEBUG_0_C++FLAGS = [ FDefines NDEBUG=$(NDEBUG) ] ;