diff options
| author | Pedro Alves <palves@redhat.com> | 2017-02-17 01:26:12 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2017-02-17 01:26:12 +0000 |
| commit | 4bc26c69597fea658dc9ce020b27e8d2ecdbe1a3 (patch) | |
| tree | 557c323e7a1ae695e8da36b8349316ca67241de5 /binutils | |
| parent | 7ec22e0f1e08e96718ac27ea57a1dca0707a8b02 (diff) | |
| download | fsf-binutils-gdb-4bc26c69597fea658dc9ce020b27e8d2ecdbe1a3.zip fsf-binutils-gdb-4bc26c69597fea658dc9ce020b27e8d2ecdbe1a3.tar.gz fsf-binutils-gdb-4bc26c69597fea658dc9ce020b27e8d2ecdbe1a3.tar.bz2 | |
bfd: Rename Chunk and S3Forced
The direct references in objcopy kind of look like a hack to me, so
I'm calling these symbols internal too. Certainly they aren't named
and documented as a public BFD symbol today anyway.
So ... give these bfd-internal symbols with external linkage a _bfd_
prefix to avoid collisions in the global symbol namespace.
While at it, give them names that more closely match the corresponding
option name that toggles them.
Also while at it, fix a few related comment typos.
gdb/ChangeLog:
2017-02-17 Pedro Alves <palves@redhat.com>
* srec.c (Chunk): Rename to ...
(_bfd_srec_len): ... this.
(S3Forced): Rename to ...
(_bfd_srec_forceS3): ... this.
* objcopy.c: Adjust all references.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/objcopy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/binutils/objcopy.c b/binutils/objcopy.c index 2636ab4..9291b3a 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -491,14 +491,14 @@ extern char *program_name; -1 means if we should use argv[0] to decide. */ extern int is_strip; -/* The maximum length of an S record. This variable is declared in srec.c +/* The maximum length of an S record. This variable is defined in srec.c and can be modified by the --srec-len parameter. */ -extern unsigned int Chunk; +extern unsigned int _bfd_srec_len; /* Restrict the generation of Srecords to type S3 only. - This variable is declare in bfd/srec.c and can be toggled + This variable is defined in bfd/srec.c and can be toggled on by the --srec-forceS3 command line switch. */ -extern bfd_boolean S3Forced; +extern bfd_boolean _bfd_srec_forceS3; /* Forward declarations. */ static void setup_section (bfd *, asection *, void *); @@ -4509,11 +4509,11 @@ copy_main (int argc, char *argv[]) break; case OPTION_SREC_LEN: - Chunk = parse_vma (optarg, "--srec-len"); + _bfd_srec_len = parse_vma (optarg, "--srec-len"); break; case OPTION_SREC_FORCES3: - S3Forced = TRUE; + _bfd_srec_forceS3 = TRUE; break; case OPTION_STRIP_SYMBOLS: |