aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog4
-rw-r--r--gold/options.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 162e73f..7eb0554 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-24 Cary Coutant <ccoutant@google.com>
+
+ (General_options::no_keep_memory): Remove incorrect short option.
+
2009-08-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (am__skiplex, am__skipyacc): New.
diff --git a/gold/options.h b/gold/options.h
index 8d444ca..359866e 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -799,8 +799,9 @@ class General_options
DEFINE_bool(strip_lto_sections, options::TWO_DASHES, '\0', true,
N_("Strip LTO intermediate code sections"), NULL);
- DEFINE_bool(no_keep_memory, options::TWO_DASHES, 's', false,
- N_("Use less memory and more disk I/O (included only for compatibility with GNU ld)"), NULL);
+ DEFINE_bool(no_keep_memory, options::TWO_DASHES, '\0', false,
+ N_("Use less memory and more disk I/O "
+ "(included only for compatibility with GNU ld)"), NULL);
DEFINE_bool(shared, options::ONE_DASH, '\0', false,
N_("Generate shared library"), NULL);