diff --git a/libraries/AP_Common/AP_Common.h b/libraries/AP_Common/AP_Common.h
index 662b274216..0c585f4c7a 100644
--- a/libraries/AP_Common/AP_Common.h
+++ b/libraries/AP_Common/AP_Common.h
@@ -59,7 +59,7 @@ typedef struct {
 // these slide, we force them to become errors so that the
 // developer has to find a safer alternative.
 //
-#pragma GCC diagnostic error "-Wfloat-equal"
+//#pragma GCC diagnostic error "-Wfloat-equal"
 
 // The following is strictly for type-checking arguments to printf_P calls
 // in conjunction with a suitably modified Arduino IDE; never define for
diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk
index bc4e85c578..3485b2b763 100644
--- a/libraries/AP_Common/Arduino.mk
+++ b/libraries/AP_Common/Arduino.mk
@@ -170,7 +170,7 @@ ASOPTS			=	-assembler-with-cpp
 CXXFLAGS		=	-g -mmcu=$(MCU) $(DEFINES) $(OPTFLAGS) $(DEPFLAGS) $(CXXOPTS)
 CFLAGS			=	-g -mmcu=$(MCU) $(DEFINES) $(OPTFLAGS) $(DEPFLAGS) $(COPTS)
 ASFLAGS			=	-g -mmcu=$(MCU) $(DEFINES) $(DEPFLAGS) $(ASOPTS)
-LDFLAGS			=	-g -mmcu=$(MCU) $(OPTFLAGS) -Wl,--gc-sections
+LDFLAGS			=	-g -mmcu=$(MCU) $(OPTFLAGS) -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP)
 
 LIBS			=	-lm
 
@@ -303,6 +303,9 @@ SKETCHHEX		=	$(BUILDROOT)/$(SKETCH).hex
 # EEP file
 SKETCHEEP		=	$(BUILDROOT)/$(SKETCH).eep
 
+# Map file
+SKETCHMAP		=	$(BUILDROOT)/$(SKETCH).map
+
 # The core library
 CORELIB			=	$(BUILDROOT)/$(HARDWARE)/core.a