diff --git a/ld/ChangeLog b/ld/ChangeLog
index f46bd9b017..6f5921bf69 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* lexsup.c (ld_options): Add --[no-]map-whole-files for gold
+	option compatibility.
+
 2015-02-11  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* plugin.c (message): Output "warning:" for LDPL_WARNING. Output
diff --git a/ld/lexsup.c b/ld/lexsup.c
index e23f1e7bd6..db74ff8426 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -176,6 +176,12 @@ static const struct ld_option ld_options[] =
   { {"fuse-ld=", required_argument, NULL, OPTION_IGNORE},
     '\0', NULL, N_("Ignored for GCC linker option compatibility"),
     ONE_DASH },
+  { {"map-whole-files", optional_argument, NULL, OPTION_IGNORE},
+    '\0', NULL, N_("Ignored for gold option compatibility"),
+    TWO_DASHES },
+  { {"no-map-whole-files", optional_argument, NULL, OPTION_IGNORE},
+    '\0', NULL, N_("Ignored for gold option compatibility"),
+    TWO_DASHES },
   { {"Qy", no_argument, NULL, OPTION_IGNORE},
     '\0', NULL, N_("Ignored for SVR4 compatibility"), ONE_DASH },
   { {"emit-relocs", no_argument, NULL, 'q'},