diff options
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/srec.c | 22 | ||||
| -rw-r--r-- | binutils/objcopy.c | 12 |
3 files changed, 25 insertions, 17 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4dfa21f..be8bd68 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,13 @@ 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. + +2017-02-17 Pedro Alves <palves@redhat.com> + * archive.c (bsd_write_armap): Rename to ... (_bfd_bsd_write_armap): ... this. (coff_write_armap): Rename to ... @@ -129,12 +129,12 @@ static const char digs[] = "0123456789ABCDEF"; /* The number of data bytes we actually fit onto a line on output. This variable can be modified by objcopy's --srec-len parameter. For a 0x75 byte record you should set --srec-len=0x70. */ -unsigned int Chunk = DEFAULT_CHUNK; +unsigned int _bfd_srec_len = DEFAULT_CHUNK; /* The type of srec output (free or forced to S3). This variable can be modified by objcopy's --srec-forceS3 parameter. */ -bfd_boolean S3Forced = FALSE; +bfd_boolean _bfd_srec_forceS3 = FALSE; /* When writing an S-record file, the S-records can not be output as they are seen. This structure is used to hold them in memory. */ @@ -904,9 +904,9 @@ srec_set_section_contents (bfd *abfd, return FALSE; memcpy ((void *) data, location, (size_t) bytes_to_do); - /* Ff S3Forced is TRUE then always select S3 records, - regardless of the siez of the addresses. */ - if (S3Forced) + /* If _bfd_srec_forceS3 is TRUE then always select S3 records, + regardless of the size of the addresses. */ + if (_bfd_srec_forceS3) tdata->type = 3; else if ((section->lma + (offset + bytes_to_do) / opb - 1) <= 0xffff) ; /* The default, S1, is OK. */ @@ -1040,18 +1040,18 @@ srec_write_section (bfd *abfd, have three, and S3 (tdata->type == 3) records have four. The total length can't exceed 255, and a zero data length will spin for a long time. */ - if (Chunk == 0) - Chunk = 1; - else if (Chunk > MAXCHUNK - tdata->type - 2) - Chunk = MAXCHUNK - tdata->type - 2; + if (_bfd_srec_len == 0) + _bfd_srec_len = 1; + else if (_bfd_srec_len > MAXCHUNK - tdata->type - 2) + _bfd_srec_len = MAXCHUNK - tdata->type - 2; while (octets_written < list->size) { bfd_vma address; unsigned int octets_this_chunk = list->size - octets_written; - if (octets_this_chunk > Chunk) - octets_this_chunk = Chunk; + if (octets_this_chunk > _bfd_srec_len) + octets_this_chunk = _bfd_srec_len; address = list->where + octets_written / bfd_octets_per_byte (abfd); 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: |