This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH COMMITTED: Implement --no-undefined
- From: Ian Lance Taylor <iant at google dot com>
- To: "Andreas Hartmetz" <ahartmetz at gmail dot com>
- Cc: binutils at sourceware dot org
- Date: Tue, 06 May 2008 13:43:25 -0700
- Subject: PATCH COMMITTED: Implement --no-undefined
- References: <f3642e6b0805060139l2e65be68s28b773c657129323@mail.gmail.com>
"Andreas Hartmetz" <ahartmetz@gmail.com> writes:
> + // --no-undefined is an alias for "-z defs"; the special parser function
> + // also modifies the boolean "defs".
>
> + DEFINE_special(no_undefined, options::TWO_DASHES, '\0',
> + N_("Report undefined symbols (even with --shared)"),
> + NULL);
I committed this patch to implement --no-undefined. Rather than use
DEFINE_special, I introduced a new macro DEFINE_bool_alias. This
packs all the ugliness into one place, rather than distributing it
across several options. I actually implemented --undefined, and
allowed --no-undefined to appear as a standard negative option.
Ian
2008-05-06 Ian Lance Taylor <iant@google.com>
* options.h (DEFINE_var): Add set_user_set_##varname__.
(DEFINE_bool_alias): New macro.
(class General_options): Define -Bstatic using DEFINE_bool_alias
rather than DEFINE_special. Add --undefined as an alias for -z
defs.
* options.cc (General_options::parse_Bstatic): Remove.
Index: options.cc
===================================================================
RCS file: /cvs/src/src/gold/options.cc,v
retrieving revision 1.71
diff -p -u -r1.71 options.cc
--- options.cc 17 Apr 2008 22:45:47 -0000 1.71
+++ options.cc 6 May 2008 20:37:41 -0000
@@ -282,12 +282,6 @@ General_options::parse_V(const char*, co
}
void
-General_options::parse_Bstatic(const char*, const char*, Command_line*)
-{
- this->set_Bdynamic(false);
-}
-
-void
General_options::parse_defsym(const char*, const char* arg,
Command_line* cmdline)
{
Index: options.h
===================================================================
RCS file: /cvs/src/src/gold/options.h,v
retrieving revision 1.75
diff -p -u -r1.75 options.h
--- options.h 6 May 2008 18:32:38 -0000 1.75
+++ options.h 6 May 2008 20:37:41 -0000
@@ -239,6 +239,10 @@ struct Struct_special : public Struct_va
user_set_##varname__() const \
{ return this->varname__##_.user_set_via_option; } \
\
+ void \
+ set_user_set_##varname__() \
+ { this->varname__##_.user_set_via_option = true; } \
+ \
private: \
struct Struct_##varname__ : public options::Struct_var \
{ \
@@ -390,6 +394,53 @@ struct Struct_special : public Struct_va
choices, sizeof(choices) / sizeof(*choices)); \
}
+// This is like DEFINE_bool, but VARNAME is the name of a different
+// option. This option becomes an alias for that one. INVERT is true
+// if this option is an inversion of the other one.
+#define DEFINE_bool_alias(option__, varname__, dashes__, shortname__, \
+ helpstring__, no_helpstring__, invert__) \
+ private: \
+ struct Struct_##option__ : public options::Struct_var \
+ { \
+ Struct_##option__() \
+ : option(#option__, dashes__, shortname__, "", helpstring__, \
+ NULL, false, this) \
+ { } \
+ \
+ void \
+ parse_to_value(const char*, const char*, \
+ Command_line*, General_options* options) \
+ { \
+ options->set_##varname__(!invert__); \
+ options->set_user_set_##varname__(); \
+ } \
+ \
+ options::One_option option; \
+ }; \
+ Struct_##option__ option__##_; \
+ \
+ struct Struct_no_##option__ : public options::Struct_var \
+ { \
+ Struct_no_##option__() \
+ : option((dashes__ == options::DASH_Z \
+ ? "no" #option__ \
+ : "no-" #option__), \
+ dashes__, '\0', "", no_helpstring__, \
+ NULL, false, this) \
+ { } \
+ \
+ void \
+ parse_to_value(const char*, const char*, \
+ Command_line*, General_options* options) \
+ { \
+ options->set_##varname__(invert__); \
+ options->set_user_set_##varname__(); \
+ } \
+ \
+ options::One_option option; \
+ }; \
+ Struct_no_##option__ no_##option__##_initializer_
+
// This is used for non-standard flags. It defines no functions; it
// just calls General_options::parse_VARNAME whenever the flag is
// seen. We declare parse_VARNAME as a static member of
@@ -502,10 +553,9 @@ class General_options
DEFINE_bool(Bdynamic, options::ONE_DASH, '\0', true,
N_("-l searches for shared libraries"), NULL);
- // Bstatic affects the same variable as Bdynamic, so we have to use
- // the "special" macro to make that happen.
- DEFINE_special(Bstatic, options::ONE_DASH, '\0',
- N_("-l does not search for shared libraries"), NULL);
+ DEFINE_bool_alias(Bstatic, Bdynamic, options::ONE_DASH, '\0',
+ N_("-l does not search for shared libraries"), NULL,
+ true);
DEFINE_bool(Bsymbolic, options::ONE_DASH, '\0', false,
N_("Bind defined symbols locally"), NULL);
@@ -683,6 +733,11 @@ class General_options
DEFINE_uint64(Ttext, options::ONE_DASH, '\0', -1U,
N_("Set the address of the text segment"), N_("ADDRESS"));
+ DEFINE_bool_alias(undefined, defs, options::TWO_DASHES, '\0',
+ "Allow undefined symbols with --shared",
+ "Report undefined symbols (even with --shared)",
+ true);
+
DEFINE_bool(verbose, options::TWO_DASHES, '\0', false,
N_("Synonym for --debug=files"), NULL);