This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH: Check -Bsymbolic, -Bsymbolic-functions and --dynamic-list*
- From: "H. J. Lu" <hjl at lucon dot org>
- To: binutils at sources dot redhat dot com
- Date: Tue, 16 Jan 2007 11:13:03 -0800
- Subject: PATCH: Check -Bsymbolic, -Bsymbolic-functions and --dynamic-list*
On linker command line, we may have -Bsymbolic, -Bsymbolic-functions,
--dynamic-list-data, --dynamic-list-cpp-new,
--dynamic-list-cpp-typeinfo and --dynamic-list FILE. But -Bsymbolic
and -Bsymbolic-functions are only for shared libraries. -Bsymbolic
overrides all others and vice versa.
This patch limits -Bsymbolic and -Bsymbolic-functions to DSO and
checks if -Bsymbolic will override others and vice versa.
H.J.
----
ld/
2007-01-16 H.J. Lu <hongjiu.lu@intel.com>
* ld.h (args_type): Add a new bind field.
* ldmain.c (main): Initialize command_line.bind to bind_unset.
Check -Bsymbolic, -Bsymbolic-functions and --dynamic-list*
before setting link_info.symbolic, link_info.dynamic,
link_info.dynamic_data and link_info.dynamic_list.
* lexsup.c (option_values): Add OPTION_SYMBOLIC_FUNCTIONS.
(ld_options): Use OPTION_SYMBOLIC_FUNCTIONS with
-Bsymbolic-functions.
(set_bind): New.
(parse_args): Handle -Bsymbolic-functions. Don't set
link_info.dynamic/link_info.symbolic here. Call set_bind for
-Bsymbolic, --dynamic-list-data, --dynamic-list-cpp-new,
--dynamic-list-cpp-typeinfo and --dynamic-list.
ld/testsuite/
2007-01-16 H.J. Lu <hongjiu.lu@intel.com>
* ld-elf/dl6.c: New file.
* ld-elf/dl6a.out: Likewise.
* ld-elf/dl6amain.c: Likewise.
* ld-elf/dl6b.out: Likewise.
* ld-elf/dl6bmain.c: Likewise.
* ld-elf/dl6cmain.c: Likewise.
* ld-elf/dl6dmain.c: Likewise.
* ld-elf/shared.exp: Add new tests for -Bsymbolic,
-Bsymbolic-functions, --dynamic-list-data and
--dynamic-list-cpp-new.
--- ld/ld.h.symbolic 2006-10-30 15:25:51.000000000 -0800
+++ ld/ld.h 2007-01-16 09:36:44.000000000 -0800
@@ -200,6 +200,17 @@ typedef struct {
behaviour of the linker. The new default behaviour is to reject such
input files. */
bfd_boolean accept_unknown_input_arch;
+
+ /* -Bsymbolic, -Bsymbolic-functions, --dynamic-list, as set on command
+ line. */
+ enum
+ {
+ bind_unset = 0,
+ symbolic,
+ symbolic_functions,
+ dynamic_list,
+ symbolic_functions_dynamic_list
+ } bind;
} args_type;
extern args_type command_line;
--- ld/ldmain.c.symbolic 2007-01-16 08:34:54.000000000 -0800
+++ ld/ldmain.c 2007-01-16 09:53:29.000000000 -0800
@@ -256,6 +256,7 @@ main (int argc, char **argv)
command_line.warn_mismatch = TRUE;
command_line.check_section_addresses = TRUE;
command_line.accept_unknown_input_arch = FALSE;
+ command_line.bind = bind_unset;
sort_section = none;
@@ -363,6 +364,39 @@ main (int argc, char **argv)
einfo (_("%P%F: -r and -shared may not be used together\n"));
}
+ /* We may have -Bsymbolic, -Bsymbolic-functions, --dynamic-list-data,
+ --dynamic-list-cpp-new, --dynamic-list-cpp-typeinfo and
+ --dynamic-list FILE. -Bsymbolic and -Bsymbolic-functions are
+ for shared libraries. -Bsymbolic overrides all others and vice
+ versa. */
+ switch (command_line.bind)
+ {
+ case bind_unset:
+ break;
+ case symbolic:
+ /* -Bsymbolic is for shared library only. */
+ if (link_info.shared)
+ {
+ link_info.symbolic = TRUE;
+ link_info.dynamic_data = FALSE;
+ /* Should we free the unused memory? */
+ link_info.dynamic_list = NULL;
+ }
+ break;
+ case symbolic_functions:
+ /* -Bsymbolic-functions is for shared library only. */
+ if (link_info.shared)
+ {
+ link_info.dynamic = TRUE;
+ link_info.dynamic_data = TRUE;
+ }
+ break;
+ case dynamic_list:
+ case symbolic_functions_dynamic_list:
+ link_info.dynamic = TRUE;
+ break;
+ }
+
if (! link_info.shared)
{
if (command_line.filter_shlib)
--- ld/lexsup.c.symbolic 2007-01-16 08:34:54.000000000 -0800
+++ ld/lexsup.c 2007-01-16 09:52:08.000000000 -0800
@@ -97,6 +97,7 @@ enum option_values
OPTION_SORT_SECTION,
OPTION_STATS,
OPTION_SYMBOLIC,
+ OPTION_SYMBOLIC_FUNCTIONS,
OPTION_TASK_LINK,
OPTION_TBSS,
OPTION_TDATA,
@@ -348,7 +349,7 @@ static const struct ld_option ld_options
'\0', NULL, NULL, ONE_DASH },
{ {"Bsymbolic", no_argument, NULL, OPTION_SYMBOLIC},
'\0', NULL, N_("Bind global references locally"), ONE_DASH },
- { {"Bsymbolic-functions", no_argument, NULL, OPTION_DYNAMIC_LIST_DATA},
+ { {"Bsymbolic-functions", no_argument, NULL, OPTION_SYMBOLIC_FUNCTIONS},
'\0', NULL, N_("Bind global function references locally"), ONE_DASH },
{ {"check-sections", no_argument, NULL, OPTION_CHECK_SECTIONS},
'\0', NULL, N_("Check section addresses for overlaps (default)"),
@@ -545,6 +546,55 @@ static const struct ld_option ld_options
#define OPTION_COUNT ARRAY_SIZE (ld_options)
+static void
+set_bind (int optc)
+{
+ switch (optc)
+ {
+ case OPTION_SYMBOLIC:
+ command_line.bind = symbolic;
+ break;
+
+ case OPTION_SYMBOLIC_FUNCTIONS:
+ switch (command_line.bind)
+ {
+ case symbolic_functions:
+ case symbolic_functions_dynamic_list:
+ break;
+ case bind_unset:
+ case symbolic:
+ command_line.bind = symbolic_functions;
+ break;
+ case dynamic_list:
+ command_line.bind = symbolic_functions_dynamic_list;
+ break;
+ }
+ break;
+
+ case OPTION_DYNAMIC_LIST_DATA:
+ case OPTION_DYNAMIC_LIST_CPP_TYPEINFO:
+ case OPTION_DYNAMIC_LIST_CPP_NEW:
+ case OPTION_DYNAMIC_LIST:
+ switch (command_line.bind)
+ {
+ case dynamic_list:
+ case symbolic_functions_dynamic_list:
+ break;
+ case bind_unset:
+ case symbolic:
+ command_line.bind = dynamic_list;
+ break;
+ case symbolic_functions:
+ command_line.bind = symbolic_functions_dynamic_list;
+ break;
+ }
+ break;
+
+ default:
+ abort ();
+ }
+}
+
void
parse_args (unsigned argc, char **argv)
{
@@ -1139,7 +1189,8 @@ parse_args (unsigned argc, char **argv)
config.stats = TRUE;
break;
case OPTION_SYMBOLIC:
- link_info.symbolic = TRUE;
+ case OPTION_SYMBOLIC_FUNCTIONS:
+ set_bind (optc);
break;
case 't':
trace_files = TRUE;
@@ -1254,15 +1305,15 @@ parse_args (unsigned argc, char **argv)
break;
case OPTION_DYNAMIC_LIST_DATA:
link_info.dynamic_data = TRUE;
- link_info.dynamic = TRUE;
+ set_bind (optc);
break;
case OPTION_DYNAMIC_LIST_CPP_TYPEINFO:
lang_append_dynamic_list_cpp_typeinfo ();
- link_info.dynamic = TRUE;
+ set_bind (optc);
break;
case OPTION_DYNAMIC_LIST_CPP_NEW:
lang_append_dynamic_list_cpp_new ();
- link_info.dynamic = TRUE;
+ set_bind (optc);
break;
case OPTION_DYNAMIC_LIST:
/* This option indicates a small script that only specifies
@@ -1277,7 +1328,7 @@ parse_args (unsigned argc, char **argv)
parser_input = input_dynamic_list;
yyparse ();
}
- link_info.dynamic = TRUE;
+ set_bind (optc);
break;
case OPTION_WARN_COMMON:
config.warn_common = TRUE;
--- ld/testsuite/ld-elf/dl6.c.symbolic 2007-01-16 10:12:28.000000000 -0800
+++ ld/testsuite/ld-elf/dl6.c 2007-01-16 10:08:25.000000000 -0800
@@ -0,0 +1,14 @@
+#include <stdio.h>
+
+int bar = 10;
+
+void
+foo (void)
+{
+ if (bar == 10)
+ printf ("bar is in DSO.\n");
+ else if (bar == -20)
+ printf ("bar is in main.\n");
+ else
+ printf ("FAIL\n");
+}
--- ld/testsuite/ld-elf/dl6a.out.symbolic 2007-01-16 10:12:28.000000000 -0800
+++ ld/testsuite/ld-elf/dl6a.out 2007-01-16 10:09:14.000000000 -0800
@@ -0,0 +1 @@
+bar is in main.
--- ld/testsuite/ld-elf/dl6amain.c.symbolic 2007-01-16 10:12:28.000000000 -0800
+++ ld/testsuite/ld-elf/dl6amain.c 2007-01-16 10:19:41.000000000 -0800
@@ -0,0 +1,33 @@
+#include <stdio.h>
+#include <dlfcn.h>
+
+int bar = -20;
+
+int
+main (void)
+{
+ int ret = 0;
+ void *handle;
+ void (*fcn) (void);
+
+ handle = dlopen("./tmpdir/libdl6a.so", RTLD_GLOBAL|RTLD_LAZY);
+ if (!handle)
+ {
+ printf("dlopen ./tmpdir/libdl6a.so: %s\n", dlerror ());
+ return 1;
+ }
+
+ fcn = (void (*)(void)) dlsym(handle, "foo");
+ if (!fcn)
+ {
+ printf("dlsym foo: %s\n", dlerror ());
+ ret += 1;
+ }
+ else
+ {
+ (*fcn) ();
+ }
+
+ dlclose (handle);
+ return ret;
+}
--- ld/testsuite/ld-elf/dl6b.out.symbolic 2007-01-16 10:12:28.000000000 -0800
+++ ld/testsuite/ld-elf/dl6b.out 2007-01-16 10:09:06.000000000 -0800
@@ -0,0 +1 @@
+bar is in DSO.
--- ld/testsuite/ld-elf/dl6bmain.c.symbolic 2007-01-16 10:22:01.000000000 -0800
+++ ld/testsuite/ld-elf/dl6bmain.c 2007-01-16 10:22:10.000000000 -0800
@@ -0,0 +1,33 @@
+#include <stdio.h>
+#include <dlfcn.h>
+
+int bar = -20;
+
+int
+main (void)
+{
+ int ret = 0;
+ void *handle;
+ void (*fcn) (void);
+
+ handle = dlopen("./tmpdir/libdl6b.so", RTLD_GLOBAL|RTLD_LAZY);
+ if (!handle)
+ {
+ printf("dlopen ./tmpdir/libdl6b.so: %s\n", dlerror ());
+ return 1;
+ }
+
+ fcn = (void (*)(void)) dlsym(handle, "foo");
+ if (!fcn)
+ {
+ printf("dlsym foo: %s\n", dlerror ());
+ ret += 1;
+ }
+ else
+ {
+ (*fcn) ();
+ }
+
+ dlclose (handle);
+ return ret;
+}
--- ld/testsuite/ld-elf/dl6cmain.c.symbolic 2007-01-16 10:31:42.000000000 -0800
+++ ld/testsuite/ld-elf/dl6cmain.c 2007-01-16 10:31:55.000000000 -0800
@@ -0,0 +1,33 @@
+#include <stdio.h>
+#include <dlfcn.h>
+
+int bar = -20;
+
+int
+main (void)
+{
+ int ret = 0;
+ void *handle;
+ void (*fcn) (void);
+
+ handle = dlopen("./tmpdir/libdl6c.so", RTLD_GLOBAL|RTLD_LAZY);
+ if (!handle)
+ {
+ printf("dlopen ./tmpdir/libdl6c.so: %s\n", dlerror ());
+ return 1;
+ }
+
+ fcn = (void (*)(void)) dlsym(handle, "foo");
+ if (!fcn)
+ {
+ printf("dlsym foo: %s\n", dlerror ());
+ ret += 1;
+ }
+ else
+ {
+ (*fcn) ();
+ }
+
+ dlclose (handle);
+ return ret;
+}
--- ld/testsuite/ld-elf/dl6dmain.c.symbolic 2007-01-16 10:33:17.000000000 -0800
+++ ld/testsuite/ld-elf/dl6dmain.c 2007-01-16 10:33:34.000000000 -0800
@@ -0,0 +1,33 @@
+#include <stdio.h>
+#include <dlfcn.h>
+
+int bar = -20;
+
+int
+main (void)
+{
+ int ret = 0;
+ void *handle;
+ void (*fcn) (void);
+
+ handle = dlopen("./tmpdir/libdl6d.so", RTLD_GLOBAL|RTLD_LAZY);
+ if (!handle)
+ {
+ printf("dlopen ./tmpdir/libdl6d.so: %s\n", dlerror ());
+ return 1;
+ }
+
+ fcn = (void (*)(void)) dlsym(handle, "foo");
+ if (!fcn)
+ {
+ printf("dlsym foo: %s\n", dlerror ());
+ ret += 1;
+ }
+ else
+ {
+ (*fcn) ();
+ }
+
+ dlclose (handle);
+ return ret;
+}
--- ld/testsuite/ld-elf/shared.exp.symbolic 2007-01-16 08:34:54.000000000 -0800
+++ ld/testsuite/ld-elf/shared.exp 2007-01-16 10:46:14.000000000 -0800
@@ -93,6 +93,18 @@ set build_tests {
{"Build libdl4b.so with --dynamic-list-data and dl4xxx.list"
"-shared -Wl,--dynamic-list-data,--dynamic-list=dl4xxx.list" "-fPIC"
{dl4.c dl4xxx.c} {} "libdl4b.so"}
+ {"Build libdl6a.so"
+ "-shared" "-fPIC"
+ {dl6.c} {} "libdl6a.so"}
+ {"Build libdl6b.so with -Bsymbolic --dynamic-list-data"
+ "-shared -Wl,-Bsymbolic,--dynamic-list-data" "-fPIC"
+ {dl6.c} {} "libdl6b.so"}
+ {"Build libdl6c.so with -Bsymbolic"
+ "-shared -Wl,-Bsymbolic" "-fPIC"
+ {dl6.c} {} "libdl6c.so"}
+ {"Build libdl6d.so with --dynamic-list-data -Bsymbolic"
+ "-shared -Wl,--dynamic-list-data,-Bsymbolic" "-fPIC"
+ {dl6.c} {} "libdl6d.so"}
}
set run_tests {
@@ -132,12 +144,12 @@ set run_tests {
{"Run hidden libbar.so with versioned libfoo.so"
"tmpdir/libbarhfoov.so tmpdir/libfoov.so" ""
{main.c} "hidden" "hidden.out"}
- {"Run dl1 with --dynamic-list=dl1.list and dlopen on libdl1.so"
+ {"Run dl1a with --dynamic-list=dl1.list and dlopen on libdl1.so"
"--dynamic-list=dl1.list -ldl" ""
- {dl1main.c} "dl1" "dl1.out"}
- {"Run dl1 with --dynamic-list-data and dlopen on libdl1.so"
+ {dl1main.c} "dl1a" "dl1.out"}
+ {"Run dl1b with --dynamic-list-data and dlopen on libdl1.so"
"--dynamic-list-data -ldl" ""
- {dl1main.c} "dl1" "dl1.out"}
+ {dl1main.c} "dl1b" "dl1.out"}
{"Run with libdl2a.so"
"tmpdir/libdl2a.so" ""
{dl2main.c} "dl2a" "dl2a.out"}
@@ -150,6 +162,33 @@ set run_tests {
{"Run with libdl4b.so"
"tmpdir/libdl4b.so" ""
{dl4main.c} "dl4b" "dl4b.out"}
+ {"Run dl6a1 with --dynamic-list-data and dlopen on libdl6a.so"
+ "--dynamic-list-data -ldl" ""
+ {dl6amain.c} "dl6a1" "dl6a.out"}
+ {"Run dl6a2 with -Bsymbolic-functions and dlopen on libdl6a.so"
+ "-Bsymbolic-functions -ldl" ""
+ {dl6amain.c} "dl6a2" "dl6b.out"}
+ {"Run dl6a3 with -Bsymbolic and dlopen on libdl6a.so"
+ "-Bsymbolic -ldl" ""
+ {dl6amain.c} "dl6a3" "dl6b.out"}
+ {"Run dl6a4 with -Bsymbolic --dynamic-list-data and dlopen on libdl6a.so"
+ "-Bsymbolic --dynamic-list-data -ldl" ""
+ {dl6amain.c} "dl6a4" "dl6a.out"}
+ {"Run dl6a5 with --dynamic-list-data -Bsymbolic and dlopen on libdl6a.so"
+ "--dynamic-list-data -Bsymbolic -ldl" ""
+ {dl6amain.c} "dl6a5" "dl6b.out"}
+ {"Run dl6b1 with --dynamic-list-data and dlopen on libdl6b.so"
+ "--dynamic-list-data -ldl" ""
+ {dl6bmain.c} "dl6b1" "dl6a.out"}
+ {"Run dl6b2 with dlopen on libdl6b.so"
+ "-ldl" ""
+ {dl6bmain.c} "dl6b2" "dl6b.out"}
+ {"Run dl6c1 with --dynamic-list-data and dlopen on libdl6c.so"
+ "--dynamic-list-data -ldl" ""
+ {dl6cmain.c} "dl6c1" "dl6b.out"}
+ {"Run dl6d1 with --dynamic-list-data and dlopen on libdl6d.so"
+ "--dynamic-list-data -ldl" ""
+ {dl6dmain.c} "dl6d1" "dl6b.out"}
}
run_cc_link_tests $build_tests
@@ -171,9 +210,12 @@ set build_cxx_tests {
{"Build libdl3a.so with --dynamic-list-cpp-typeinfo"
"-shared -Wl,--dynamic-list-cpp-typeinfo" "-fPIC"
{dl3.cc} {} "libdl3c.so" "c++"}
- {"Build libdnew.so with -Bsymbolic-functions -dynamic-list-cpp-new"
+ {"Build libdnew1a.so with --Bsymbolic-functions --dynamic-list-cpp-new"
"-shared -Wl,-Bsymbolic-functions,--dynamic-list-cpp-new" "-fPIC"
- {del.cc new.cc} {} "libnew.so" "c++"}
+ {del.cc new.cc} {} "libnew1a.so" "c++"}
+ {"Build libdnew1b.so with --dynamic-list-data --dynamic-list-cpp-new"
+ "-shared -Wl,--dynamic-list-data,--dynamic-list-cpp-new" "-fPIC"
+ {del.cc new.cc} {} "libnew1b.so" "c++"}
}
set run_cxx_tests {
@@ -186,9 +228,12 @@ set run_cxx_tests {
{"Run with libdl3c.so"
"tmpdir/libdl3c.so" ""
{dl3main.cc} "dl3c" "dl3a.out" "" "c++"}
- {"Run with libnew.so"
- "tmpdir/libnew.so" ""
- {dl5.cc} "dl5" "dl5.out" "" "c++"}
+ {"Run with libnew1a.so"
+ "tmpdir/libnew1a.so" ""
+ {dl5.cc} "dl5a" "dl5.out" "" "c++"}
+ {"Run with libnew1b.so"
+ "tmpdir/libnew1b.so" ""
+ {dl5.cc} "dl5b" "dl5.out" "" "c++"}
}
run_cc_link_tests $build_cxx_tests