aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'binutils')
-rw-r--r--binutils/NEWS3
-rw-r--r--binutils/doc/binutils.texi9
-rw-r--r--binutils/objcopy.c51
-rw-r--r--binutils/readelf.c1
-rw-r--r--binutils/testsuite/binutils-all/common-1.s1
-rw-r--r--binutils/testsuite/binutils-all/common-1a.d8
-rw-r--r--binutils/testsuite/binutils-all/common-1b.d8
-rw-r--r--binutils/testsuite/binutils-all/common-1c.d9
-rw-r--r--binutils/testsuite/binutils-all/common-1d.d9
-rw-r--r--binutils/testsuite/binutils-all/common-1e.d9
-rw-r--r--binutils/testsuite/binutils-all/common-1f.d9
-rw-r--r--binutils/testsuite/binutils-all/common-2.s1
-rw-r--r--binutils/testsuite/binutils-all/common-2a.d8
-rw-r--r--binutils/testsuite/binutils-all/common-2b.d8
-rw-r--r--binutils/testsuite/binutils-all/common-2c.d9
-rw-r--r--binutils/testsuite/binutils-all/common-2d.d9
-rw-r--r--binutils/testsuite/binutils-all/common-2e.d9
-rw-r--r--binutils/testsuite/binutils-all/common-2f.d9
-rw-r--r--binutils/testsuite/binutils-all/objcopy.exp18
19 files changed, 182 insertions, 6 deletions
diff --git a/binutils/NEWS b/binutils/NEWS
index 6d68ade..712604b 100644
--- a/binutils/NEWS
+++ b/binutils/NEWS
@@ -1,5 +1,8 @@
-*- text -*-
+* Add --elf-stt-common= option to objcopy for ELF targets to control
+ whether to convert common symbols to the STT_COMMON type.
+
Changes in 2.26:
* Add option to objcopy to insert new symbols into a file:
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 31ef8f2..a60ab66 100644
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -1131,6 +1131,7 @@ objcopy [@option{-F} @var{bfdname}|@option{--target=}@var{bfdname}]
[@option{--decompress-debug-sections}]
[@option{--dwarf-depth=@var{n}}]
[@option{--dwarf-start=@var{n}}]
+ [@option{--elf-stt-common=@var{val}}]
[@option{-v}|@option{--verbose}]
[@option{-V}|@option{--version}]
[@option{--help}] [@option{--info}]
@@ -1886,6 +1887,14 @@ renamed.
Decompress DWARF debug sections using zlib. The original section
names of the compressed sections are restored.
+@item --elf-stt-common=yes
+@itemx --elf-stt-common=no
+For ELF files, these options control whether common symbols should be
+converted to the @code{STT_COMMON} or @code{STT_OBJECT} type.
+@option{--elf-stt-common=yes} converts common symbol type to
+@code{STT_COMMON}. @option{--elf-stt-common=no} converts common symbol
+type to @code{STT_OBJECT}.
+
@item -V
@itemx --version
Show the version number of @command{objcopy}.
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 8185f28..198ba3a 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -220,6 +220,9 @@ static enum
decompress = 1 << 4
} do_debug_sections = nothing;
+/* Whether to generate ELF common symbols with the STT_COMMON type. */
+static enum bfd_link_discard do_elf_stt_common = unchanged;
+
/* Whether to change the leading character in symbol names. */
static bfd_boolean change_leading_char = FALSE;
@@ -294,6 +297,7 @@ enum command_line_switch
OPTION_DEBUGGING,
OPTION_DECOMPRESS_DEBUG_SECTIONS,
OPTION_DUMP_SECTION,
+ OPTION_ELF_STT_COMMON,
OPTION_EXTRACT_DWO,
OPTION_EXTRACT_SYMBOL,
OPTION_FILE_ALIGNMENT,
@@ -403,6 +407,7 @@ static struct option copy_options[] =
{"discard-all", no_argument, 0, 'x'},
{"discard-locals", no_argument, 0, 'X'},
{"dump-section", required_argument, 0, OPTION_DUMP_SECTION},
+ {"elf-stt-common", required_argument, 0, OPTION_ELF_STT_COMMON},
{"enable-deterministic-archives", no_argument, 0, 'D'},
{"extract-dwo", no_argument, 0, OPTION_EXTRACT_DWO},
{"extract-symbol", no_argument, 0, OPTION_EXTRACT_SYMBOL},
@@ -622,6 +627,8 @@ copy_usage (FILE *stream, int exit_status)
--compress-debug-sections[={none|zlib|zlib-gnu|zlib-gabi}]\n\
Compress DWARF debug sections using zlib\n\
--decompress-debug-sections Decompress DWARF debug sections using zlib\n\
+ --elf-stt-common=[yes|no] Generate ELF common symbols with STT_COMMON\n\
+ type\n\
-v --verbose List all object files modified\n\
@<file> Read options from <file>\n\
-V --version Display this program's version number\n\
@@ -1820,13 +1827,22 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
return FALSE;
}
- if ((do_debug_sections & compress) != 0
- && do_debug_sections != compress
- && ibfd->xvec->flavour != bfd_target_elf_flavour)
+ if (ibfd->xvec->flavour != bfd_target_elf_flavour)
{
- non_fatal (_("--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'"),
- bfd_get_archive_filename (ibfd));
- return FALSE;
+ if ((do_debug_sections & compress) != 0
+ && do_debug_sections != compress)
+ {
+ non_fatal (_("--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'"),
+ bfd_get_archive_filename (ibfd));
+ return FALSE;
+ }
+
+ if (do_elf_stt_common)
+ {
+ non_fatal (_("--elf-stt-common=[yes|no] is unsupported on `%s'"),
+ bfd_get_archive_filename (ibfd));
+ return FALSE;
+ }
}
if (verbose)
@@ -2767,6 +2783,19 @@ copy_file (const char *input_filename, const char *output_filename,
break;
}
+ switch (do_elf_stt_common)
+ {
+ case elf_stt_common:
+ ibfd->flags |= BFD_CONVERT_ELF_COMMON | BFD_USE_ELF_STT_COMMON;
+ break;
+ break;
+ case no_elf_stt_common:
+ ibfd->flags |= BFD_CONVERT_ELF_COMMON;
+ break;
+ default:
+ break;
+ }
+
if (bfd_check_format (ibfd, bfd_archive))
{
bfd_boolean force_output_target;
@@ -4246,6 +4275,16 @@ copy_main (int argc, char *argv[])
do_debug_sections = decompress;
break;
+ case OPTION_ELF_STT_COMMON:
+ if (strcasecmp (optarg, "yes") == 0)
+ do_elf_stt_common = elf_stt_common;
+ else if (strcasecmp (optarg, "no") == 0)
+ do_elf_stt_common = no_elf_stt_common;
+ else
+ fatal (_("unrecognized --elf-stt-common= option `%s'"),
+ optarg);
+ break;
+
case OPTION_GAP_FILL:
{
bfd_vma gap_fill_vma;
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 7a755b4..a40453d 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -11982,6 +11982,7 @@ apply_relocations (void * file,
referencing a global array. For an example of this see
the _clz.o binary in libgcc.a. */
if (sym != symtab
+ && ELF_ST_TYPE (sym->st_info) != STT_COMMON
&& ELF_ST_TYPE (sym->st_info) > STT_SECTION)
{
warn (_("skipping unexpected symbol type %s in %ld'th relocation in section %s\n"),
diff --git a/binutils/testsuite/binutils-all/common-1.s b/binutils/testsuite/binutils-all/common-1.s
new file mode 100644
index 0000000..f684da4
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-1.s
@@ -0,0 +1 @@
+ .comm foobar,30,4
diff --git a/binutils/testsuite/binutils-all/common-1a.d b/binutils/testsuite/binutils-all/common-1a.d
new file mode 100644
index 0000000..f8c6fea
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-1a.d
@@ -0,0 +1,8 @@
+#source: common-1.s
+#as: --elf-stt-common=yes
+#PROG: objcopy
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-1b.d b/binutils/testsuite/binutils-all/common-1b.d
new file mode 100644
index 0000000..5a56c6e
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-1b.d
@@ -0,0 +1,8 @@
+#source: common-1.s
+#as: --elf-stt-common=no
+#PROG: objcopy
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-1c.d b/binutils/testsuite/binutils-all/common-1c.d
new file mode 100644
index 0000000..bbdc49e
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-1c.d
@@ -0,0 +1,9 @@
+#source: common-1.s
+#as: --elf-stt-common=yes
+#PROG: objcopy
+#objcopy: --elf-stt-common=no
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-1d.d b/binutils/testsuite/binutils-all/common-1d.d
new file mode 100644
index 0000000..c0df029
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-1d.d
@@ -0,0 +1,9 @@
+#source: common-1.s
+#as: --elf-stt-common=yes
+#PROG: objcopy
+#objcopy: --elf-stt-common=yes
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-1e.d b/binutils/testsuite/binutils-all/common-1e.d
new file mode 100644
index 0000000..9f84955
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-1e.d
@@ -0,0 +1,9 @@
+#source: common-1.s
+#as: --elf-stt-common=no
+#PROG: objcopy
+#objcopy: --elf-stt-common=yes
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-1f.d b/binutils/testsuite/binutils-all/common-1f.d
new file mode 100644
index 0000000..bdbdca5
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-1f.d
@@ -0,0 +1,9 @@
+#source: common-1.s
+#as: --elf-stt-common=no
+#PROG: objcopy
+#objcopy: --elf-stt-common=no
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-2.s b/binutils/testsuite/binutils-all/common-2.s
new file mode 100644
index 0000000..bf2c26c
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-2.s
@@ -0,0 +1 @@
+ .tls_common foobar,30,4
diff --git a/binutils/testsuite/binutils-all/common-2a.d b/binutils/testsuite/binutils-all/common-2a.d
new file mode 100644
index 0000000..75e6217
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-2a.d
@@ -0,0 +1,8 @@
+#source: common-2.s
+#as: --elf-stt-common=yes
+#PROG: objcopy
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-2b.d b/binutils/testsuite/binutils-all/common-2b.d
new file mode 100644
index 0000000..7c7a194
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-2b.d
@@ -0,0 +1,8 @@
+#source: common-2.s
+#as: --elf-stt-common=no
+#PROG: objcopy
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-2c.d b/binutils/testsuite/binutils-all/common-2c.d
new file mode 100644
index 0000000..c203dd2
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-2c.d
@@ -0,0 +1,9 @@
+#source: common-2.s
+#as: --elf-stt-common=yes
+#PROG: objcopy
+#objcopy: --elf-stt-common=yes
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-2d.d b/binutils/testsuite/binutils-all/common-2d.d
new file mode 100644
index 0000000..da221d6
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-2d.d
@@ -0,0 +1,9 @@
+#source: common-2.s
+#as: --elf-stt-common=yes
+#PROG: objcopy
+#objcopy: --elf-stt-common=no
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-2e.d b/binutils/testsuite/binutils-all/common-2e.d
new file mode 100644
index 0000000..04b1faf
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-2e.d
@@ -0,0 +1,9 @@
+#source: common-2.s
+#as: --elf-stt-common=no
+#PROG: objcopy
+#objcopy: --elf-stt-common=yes
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/common-2f.d b/binutils/testsuite/binutils-all/common-2f.d
new file mode 100644
index 0000000..4748e5d
--- /dev/null
+++ b/binutils/testsuite/binutils-all/common-2f.d
@@ -0,0 +1,9 @@
+#source: common-2.s
+#as: --elf-stt-common=no
+#PROG: objcopy
+#objcopy: --elf-stt-common=no
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar
+#pass
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index b2c54ea..c348578 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -1005,6 +1005,23 @@ proc objcopy_test_symbol_manipulation {} {
}
}
+proc objcopy_test_elf_common_symbols {} {
+ global srcdir
+ global subdir
+
+ # hpux has a non-standard common directive.
+ if { [istarget "*-*-hpux*"] } then {
+ return
+ }
+
+ set test_list [lsort [glob -nocomplain $srcdir/$subdir/common-*.d]]
+ foreach t $test_list {
+ # We need to strip the ".d", but can leave the dirname.
+ verbose [file rootname $t]
+ run_dump_test [file rootname $t]
+ }
+}
+
# ia64 specific tests
if { ([istarget "ia64-*-elf*"]
|| [istarget "ia64-*-linux*"]) } {
@@ -1014,6 +1031,7 @@ if { ([istarget "ia64-*-elf*"]
# ELF specific tests
if [is_elf_format] {
objcopy_test_symbol_manipulation
+ objcopy_test_elf_common_symbols
objcopy_test "ELF unknown section type" unknown.s
objcopy_test_readelf "ELF group" group.s
objcopy_test_readelf "ELF group" group-2.s
generated by cgit v1.1 at 2024-12-27 15:40:28 +0000