Index: common/Makefile
@@ -47,9 +47,9 @@
 ifeq ($(ARCH), x86_64)
 COMMON_CFLAGS+=-mno-red-zone
 endif
-CFLAGS=$(COMMON_CFLAGS)
+CFLAGS=$(COMMON_CFLAGS) ${DEBUG_FLAGS}
 MON_CFLAGS=$(COMMON_CFLAGS)
-KERNEL_CFLAGS=$(COMMON_CFLAGS)
+KERNEL_CFLAGS=$(COMMON_CFLAGS) ${DEBUG_FLAGS}
 
 # Disable SSP if GCC supports it
 MON_CFLAGS+=$(call cc-option,$(MON_CC),-fno-stack-protector,)
@@ -119,7 +119,7 @@
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c -o $@ $<
 
 %.o: %.S
-	$(CC) $(DEFINES) $(INCLUDES) -D__ASSEMBLY__ -c -o $@ $<
+	$(CC) ${DEBUG_FLAGS} $(DEFINES) $(INCLUDES) -D__ASSEMBLY__ -c -o $@ $<
 
 clean:
 	rm -f *.o *~ monitor-image.h genoffsets genmon monitor_def.h \