From 246b7c9bc05d8dfebb4ce3c0a99cb8d1d89de794 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 10 Oct 1997 21:14:29 +0000 Subject: [PATCH] * objcopy.c, objcopy.1, binutils.texi: "localize" is a better name than "privatize". Update all references. --- binutils/ChangeLog | 5 +++++ binutils/binutils.texi | 6 +++--- binutils/objcopy.1 | 4 ++-- binutils/objcopy.c | 18 +++++++++--------- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 65b584ef1e..b2ef214aff 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 10 14:13:09 1997 Ricahrd Henderson + + * objcopy.c, objcopy.1, binutils.texi: "localize" is a better name + than "privatize". Update all references. + Thu Oct 9 15:57:29 1997 Ian Lance Taylor * binutils.texi (strip): Remove duplicate --target. From Marty diff --git a/binutils/binutils.texi b/binutils/binutils.texi index 900891fcdd..d117dc2e55 100644 --- a/binutils/binutils.texi +++ b/binutils/binutils.texi @@ -816,7 +816,7 @@ objcopy [ -F @var{bfdname} | --target=@var{bfdname} ] [ -S | --strip-all ] [ -g | --strip-debug ] [ -K @var{symbolname} | --keep-symbol=@var{symbolname} ] [ -N @var{symbolname} | --strip-symbol=@var{symbolname} ] - [ -P @var{symbolname} | --privatize-symbol=@var{symbolname} ] + [ -L @var{symbolname} | --localize-symbol=@var{symbolname} ] [ -W @var{symbolname} | --weaken-symbol=@var{symbolname} ] [ -x | --discard-all ] [ -X | --discard-locals ] [ -b @var{byte} | --byte=@var{byte} ] @@ -914,8 +914,8 @@ be given more than once. Do not copy symbol @var{symbolname} from the source file. This option may be given more than once. -@item -P @var{symbolname} -@itemx --privatize-symbol=@var{symbolname} +@item -L @var{symbolname} +@itemx --localize-symbol=@var{symbolname} Make symbol @var{symbolname} local to the file, so that it is not visible externally. This option may be given more than once. diff --git a/binutils/objcopy.1 b/binutils/objcopy.1 index dd5cf68be5..07c52ece2c 100644 --- a/binutils/objcopy.1 +++ b/binutils/objcopy.1 @@ -24,7 +24,7 @@ objcopy \- copy and translate object files .RB "[\|" \-\-strip\-unneeded\fR "\|]" .RB "[\|" \-K\ \fIsymbolname\fR\ |\ \fB\-\-keep\-symbol=\fIsymbolname\fR "\|]" .RB "[\|" \-N\ \fIsymbolname\fR\ |\ \fB\-\-strip\-symbol=\fIsymbolname\fR "\|]" -.RB "[\|" \-P\ \fIsymbolname\fR\ |\ \fB\-\-privatize\-symbol=\fIsymbolname\fR "\|]" +.RB "[\|" \-L\ \fIsymbolname\fR\ |\ \fB\-\-localize\-symbol=\fIsymbolname\fR "\|]" .RB "[\|" \-W\ \fIsymbolname\fR\ |\ \fB\-\-weaken\-symbol=\fIsymbolname\fR "\|]" .RB "[\|" \-x\fR\ |\ \fB\-\-discard\-all\fR "\|]" .RB "[\|" \-X\fR\ |\ \fB\-\-discard\-locals\fR "\|]" @@ -143,7 +143,7 @@ may be given more than once. Do not copy symbol \fIsymbolname\fP from the source file. This option may be given more than once. .TP -.B \-P \fIsymbolname\fR, \fB\-\-privatize\-symbol=\fIsymbolname +.B \-L \fIsymbolname\fR, \fB\-\-localize\-symbol=\fIsymbolname Make symbol \fIsymbolname\fP local to the file, so that it is not visible externally. This option may be given more than once. .TP diff --git a/binutils/objcopy.c b/binutils/objcopy.c index 324a0402b2..3483f200cb 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -235,7 +235,7 @@ static struct option copy_options[] = {"output-target", required_argument, 0, 'O'}, {"pad-to", required_argument, 0, OPTION_PAD_TO}, {"preserve-dates", no_argument, 0, 'p'}, - {"privatize-symbol", required_argument, 0, 'P'}, + {"localize-symbol", required_argument, 0, 'L'}, {"remove-leading-char", no_argument, 0, OPTION_REMOVE_LEADING_CHAR}, {"remove-section", required_argument, 0, 'R'}, {"set-section-flags", required_argument, 0, OPTION_SET_SECTION_FLAGS}, @@ -280,7 +280,7 @@ Usage: %s [-vVSpgxX] [-I bfdname] [-O bfdname] [-F bfdname] [-b byte]\n\ [--adjust-warnings] [--no-adjust-warnings]\n\ [--set-section-flags=section=flags] [--add-section=sectionname=filename]\n\ [--keep-symbol symbol] [-K symbol] [--strip-symbol symbol] [-N symbol]\n\ - [--privatize-symbol symbol] [-P symbol] [--weaken-symbol symbol]\n\ + [--localize-symbol symbol] [-L symbol] [--weaken-symbol symbol]\n\ [-W symbol] [--change-leading-char] [--remove-leading-char] [--weaken]\n\ [--verbose] [--version] [--help] in-file [out-file]\n"); list_supported_targets (program_name, stream); @@ -390,11 +390,11 @@ struct symlist struct symlist *next; }; -/* List of symbols to strip, keep, privatize, and weaken. */ +/* List of symbols to strip, keep, localize, and weaken. */ static struct symlist *strip_specific_list = NULL; static struct symlist *keep_specific_list = NULL; -static struct symlist *privatize_specific_list = NULL; +static struct symlist *localize_specific_list = NULL; static struct symlist *weaken_specific_list = NULL; /* If this is true, we weaken global symbols (set BSF_WEAK). */ @@ -539,7 +539,7 @@ filter_symbols (abfd, obfd, osyms, isyms, symcount) sym->flags |= BSF_WEAK; } if (keep && (flags & (BSF_GLOBAL | BSF_WEAK)) - && is_specified_symbol (name, privatize_specific_list)) + && is_specified_symbol (name, localize_specific_list)) { sym->flags &= ~(BSF_GLOBAL | BSF_WEAK); sym->flags |= BSF_LOCAL; @@ -791,7 +791,7 @@ copy_object (ibfd, obfd) || discard_locals != locals_undef || strip_specific_list != NULL || keep_specific_list != NULL - || privatize_specific_list != NULL + || localize_specific_list != NULL || weaken_specific_list != NULL || sections_removed || convert_debugging @@ -1756,7 +1756,7 @@ copy_main (argc, argv) struct section_list *p; struct stat statbuf; - while ((c = getopt_long (argc, argv, "b:i:I:K:N:s:O:d:F:P:R:SpgxXVvW:", + while ((c = getopt_long (argc, argv, "b:i:I:K:N:s:O:d:F:L:R:SpgxXVvW:", copy_options, (int *) 0)) != EOF) { switch (c) @@ -1810,8 +1810,8 @@ copy_main (argc, argv) case 'N': add_specific_symbol (optarg, &strip_specific_list); break; - case 'P': - add_specific_symbol (optarg, &privatize_specific_list); + case 'L': + add_specific_symbol (optarg, &localize_specific_list); break; case 'W': add_specific_symbol (optarg, &weaken_specific_list);