From 6d71b17c420d407c834a2c6a3d745fdb933c5a8d Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Fri, 6 Mar 2009 23:12:37 +0000 Subject: [PATCH] * options.cc (parse_short_option): Keep dash_z from registering itself. --- gold/ChangeLog | 4 ++++ gold/options.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 1a7705f..9daeafe 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,7 @@ +2009-03-06 Cary Coutant + + * options.cc (parse_short_option): Keep dash_z from registering itself. + 2009-03-03 Ian Lance Taylor PR 9918 diff --git a/gold/options.cc b/gold/options.cc index 3f6fbfa..a62c6e1 100644 --- a/gold/options.cc +++ b/gold/options.cc @@ -587,7 +587,7 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i, // We handle -z as a special case. static gold::options::One_option dash_z("", gold::options::DASH_Z, - 'z', "", "-z", "Z-OPTION", false, + 'z', "", NULL, "Z-OPTION", false, NULL); gold::options::One_option* retval = NULL; if (this_argv[pos_in_argv_i] == 'z') -- 2.7.4