yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ar: Add --thin for creating thin archives

Browse Source 
In many ar implementations (FreeBSD, elfutils, etc), -T has the X/Open
System Interface specified semantics. Therefore -T for thin archives is
not recommended for portability. -T is deprecated without diagnostics.

    PR binutils/28759
    * ar.c (long_options): Add --thin.
    (usage) Add --thin. Deprecate -T without diagnostics.
    * doc/binutils.texi: Add doc.
    * NEWS: Mention --thin.
    * binutils/testsuite/binutils-all/ar.exp: Add tests.
This commit is contained in:
Fangrui Song 2022-01-11 08:59:40 -08:00
parent c4a8df19ba
commit d1b69c506f
5 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binutils/ChangeLog
View File

@ -1,3 +1,12 @@
2022-01-11 Fangrui Song <maskray@google.com>
PR binutils/28759
* ar.c (long_options): Add --thin.
(usage) Add --thin. Deprecate -T without diagnostics.
* doc/binutils.texi: Add doc.
* NEWS: Mention --thin.
* binutils/testsuite/binutils-all/ar.exp: Add tests.
2022-01-11 Martin Storsjö <martin@martin.st>
* dlltool.c (main): If a prefix has not been provided, attempt to

4
binutils/NEWS
View File

@ -18,6 +18,10 @@
* Support for efi-app-aarch64, efi-rtdrv-aarch64 and efi-bsdrv-aarch64 has been
added to objcopy in order to enable UEFI development using binutils.
* ar: Add --thin for creating thin archives. -T is a deprecated alias without
diagnostics. In many ar implementations -T has a different meaning, as
specified by X/Open System Interface.
Changes in 2.37:
* The readelf tool has a new command line option which can be used to specify

4
binutils/ar.c
View File

@ -172,6 +172,7 @@ static struct option long_options[] =
{"version", no_argument, &show_version, 1},
{"output", required_argument, NULL, OPTION_OUTPUT},
{"record-libdeps", required_argument, NULL, 'l'},
{"thin", no_argument, NULL, 'T'},
{NULL, no_argument, NULL, 0}
};
@ -337,13 +338,14 @@ usage (int help)
fprintf (s, _(" [s] - create an archive index (cf. ranlib)\n"));
fprintf (s, _(" [l <text> ] - specify the dependencies of this library\n"));
fprintf (s, _(" [S] - do not build a symbol table\n"));
fprintf (s, _(" [T] - make a thin archive\n"));
fprintf (s, _(" [T] - deprecated, use --thin instead\n"));
fprintf (s, _(" [v] - be verbose\n"));
fprintf (s, _(" [V] - display the version number\n"));
fprintf (s, _(" @<file> - read options from <file>\n"));
fprintf (s, _(" --target=BFDNAME - specify the target object format as BFDNAME\n"));
fprintf (s, _(" --output=DIRNAME - specify the output directory for extraction operations\n"));
fprintf (s, _(" --record-libdeps=<text> - specify the dependencies of this library\n"));
fprintf (s, _(" --thin - make a thin archive\n"));
#if BFD_SUPPORTS_PLUGINS
fprintf (s, _(" optional:\n"));
fprintf (s, _(" --plugin <p> - load the specified plugin\n"));

15
binutils/doc/binutils.texi
View File

@ -256,7 +256,7 @@ program.
@smallexample
@c man begin SYNOPSIS ar
ar [@option{-X32_64}] [@option{-}]@var{p}[@var{mod}] [@option{--plugin} @var{name}] [@option{--target} @var{bfdname}] [@option{--output} @var{dirname}] [@option{--record-libdeps} @var{libdeps}] [@var{relpos}] [@var{count}] @var{archive} [@var{member}@dots{}]
ar [@option{-X32_64}] [@option{-}]@var{p}[@var{mod}] [@option{--plugin} @var{name}] [@option{--target} @var{bfdname}] [@option{--output} @var{dirname}] [@option{--record-libdeps} @var{libdeps}] [@option{--thin}] [@var{relpos}] [@var{count}] @var{archive} [@var{member}@dots{}]
@c man end
@end smallexample
@ -507,10 +507,9 @@ with the linker. In order to build a symbol table, you must omit the
@samp{ranlib} on the archive.
@item T
@cindex creating thin archive
Make the specified @var{archive} a @emph{thin} archive. If it already
exists and is a regular archive, the existing members must be present
in the same directory as @var{archive}.
Deprecated alias for @option{--thin}. @option{T} is not recommended because in
many ar implementations @option{T} has a different meaning, as specified by
X/Open System Interface.
@item u
@cindex updating an archive
@ -603,6 +602,12 @@ line.
The @option{--record-libdeps} option is identical to the @option{l} modifier,
just handled in long form.
@item --thin
@cindex creating thin archive
Make the specified @var{archive} a @emph{thin} archive. If it already
exists and is a regular archive, the existing members must be present
in the same directory as @var{archive}.
@end table
@c man end

17
binutils/testsuite/binutils-all/ar.exp
View File

@ -309,11 +309,13 @@ proc thin_archive_with_nested { bfdtests } {
if [is_remote host] {
set archive artest.a
set archive2 artest2.a
set archive3 artest3.a
set objfile [remote_download host tmpdir/bintest.${obj}]
remote_file host delete $archive
} else {
set archive tmpdir/artest.a
set archive2 tmpdir/artest2.a
set archive3 tmpdir/artest3.a
set objfile tmpdir/bintest.${obj}
}
@ -333,6 +335,14 @@ proc thin_archive_with_nested { bfdtests } {
return
}
remote_file build delete tmpdir/artest3.a
set got [binutils_run $AR "rc --thin $archive3 ${archive}"]
if ![string match "" $got] {
fail $testname
return
}
foreach bfdtest $bfdtests {
set exec_output [binutils_run "$base_dir/$bfdtest" "$archive"]
if ![string match "" $exec_output] {
@ -347,6 +357,13 @@ proc thin_archive_with_nested { bfdtests } {
fail "$testname ($bfdtest)"
return
}
set exec_output [binutils_run "$base_dir/$bfdtest" "$archive3"]
if ![string match "" $exec_output] {
verbose -log $exec_output
fail "$testname ($bfdtest)"
return
}
}
set got [binutils_run $NM "--print-armap $archive"]