This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[3/3] Spelling fixes
On Thu, May 26, 2011 at 09:37:00AM +0200, Stephen Kitt wrote:
> Here's the patch for the comments.
And finally the patch for the code.
Regards,
Stephen
diff -urN upstream.comments/bfd/elf32-avr.c upstream.code/bfd/elf32-avr.c
--- upstream.comments/bfd/elf32-avr.c 2011-05-26 07:23:58.170806135 +0200
+++ upstream.code/bfd/elf32-avr.c 2011-05-26 07:25:29.557532873 +0200
@@ -2011,7 +2011,7 @@
this ret. First we need to check for preceding
sbis/sbic/sbrs or cpse "skip" instructions. */
- int there_is_preceeding_non_skip_insn = 1;
+ int there_is_preceding_non_skip_insn = 1;
bfd_vma address_of_ret;
address_of_ret = dot + insn_size;
@@ -2026,36 +2026,36 @@
/* We have to make sure that there is a preceding insn. */
if (irel->r_offset >= 2)
{
- unsigned char preceeding_msb;
- unsigned char preceeding_lsb;
- preceeding_msb =
+ unsigned char preceding_msb;
+ unsigned char preceding_lsb;
+ preceding_msb =
bfd_get_8 (abfd, contents + irel->r_offset - 1);
- preceeding_lsb =
+ preceding_lsb =
bfd_get_8 (abfd, contents + irel->r_offset - 2);
/* sbic. */
- if (0x99 == preceeding_msb)
- there_is_preceeding_non_skip_insn = 0;
+ if (0x99 == preceding_msb)
+ there_is_preceding_non_skip_insn = 0;
/* sbis. */
- if (0x9b == preceeding_msb)
- there_is_preceeding_non_skip_insn = 0;
+ if (0x9b == preceding_msb)
+ there_is_preceding_non_skip_insn = 0;
/* sbrc */
- if ((0xfc == (preceeding_msb & 0xfe)
- && (0x00 == (preceeding_lsb & 0x08))))
- there_is_preceeding_non_skip_insn = 0;
+ if ((0xfc == (preceding_msb & 0xfe)
+ && (0x00 == (preceding_lsb & 0x08))))
+ there_is_preceding_non_skip_insn = 0;
/* sbrs */
- if ((0xfe == (preceeding_msb & 0xfe)
- && (0x00 == (preceeding_lsb & 0x08))))
- there_is_preceeding_non_skip_insn = 0;
+ if ((0xfe == (preceding_msb & 0xfe)
+ && (0x00 == (preceding_lsb & 0x08))))
+ there_is_preceding_non_skip_insn = 0;
/* cpse */
- if (0x10 == (preceeding_msb & 0xfc))
- there_is_preceeding_non_skip_insn = 0;
+ if (0x10 == (preceding_msb & 0xfc))
+ there_is_preceding_non_skip_insn = 0;
- if (there_is_preceeding_non_skip_insn == 0)
+ if (there_is_preceding_non_skip_insn == 0)
if (debug_relax)
printf ("preceding skip insn prevents deletion of"
" ret insn at addr 0x%x in section %s\n",
@@ -2064,10 +2064,10 @@
else
{
/* There is no previous instruction. */
- there_is_preceeding_non_skip_insn = 0;
+ there_is_preceding_non_skip_insn = 0;
}
- if (there_is_preceeding_non_skip_insn)
+ if (there_is_preceding_non_skip_insn)
{
/* We now only have to make sure that there is no
local label defined at the address of the ret
diff -urN upstream.comments/binutils/resres.c upstream.code/binutils/resres.c
--- upstream.comments/binutils/resres.c 2011-04-19 10:03:33.000000000 +0200
+++ upstream.code/binutils/resres.c 2011-05-26 07:25:12.429771536 +0200
@@ -98,7 +98,7 @@
off = 0;
if (! probe_binary (&wrbfd, flen))
- set_windres_bfd_endianess (&wrbfd, ! target_is_bigendian);
+ set_windres_bfd_endianness (&wrbfd, ! target_is_bigendian);
skip_null_resource (&wrbfd, &off, flen);
diff -urN upstream.comments/binutils/windint.h upstream.code/binutils/windint.h
--- upstream.comments/binutils/windint.h 2011-04-19 10:03:33.000000000 +0200
+++ upstream.code/binutils/windint.h 2011-05-26 07:25:12.429771536 +0200
@@ -1083,6 +1083,6 @@
extern rc_uint_type windres_get_32 (windres_bfd *, const void *, rc_uint_type);
extern void set_windres_bfd (windres_bfd *, bfd *, asection *, rc_uint_type);
-extern void set_windres_bfd_endianess (windres_bfd *, int);
+extern void set_windres_bfd_endianness (windres_bfd *, int);
#endif
diff -urN upstream.comments/binutils/windmc.c upstream.code/binutils/windmc.c
--- upstream.comments/binutils/windmc.c 2011-05-26 07:22:57.287662120 +0200
+++ upstream.code/binutils/windmc.c 2011-05-26 07:25:12.429771536 +0200
@@ -231,7 +231,7 @@
}
static void
-set_endianess (bfd *abfd, const char *target)
+set_endianness (bfd *abfd, const char *target)
{
const bfd_target *target_vec;
@@ -1054,7 +1054,7 @@
++optind;
}
- set_endianess (NULL, target);
+ set_endianness (NULL, target);
if (input_filename == NULL)
{
diff -urN upstream.comments/binutils/windres.c upstream.code/binutils/windres.c
--- upstream.comments/binutils/windres.c 2011-05-26 07:22:57.291662063 +0200
+++ upstream.code/binutils/windres.c 2011-05-26 07:25:12.433771481 +0200
@@ -54,7 +54,7 @@
int target_is_bigendian = 0;
const char *def_target_arch;
-static void set_endianess (bfd *, const char *);
+static void set_endianness (bfd *, const char *);
/* An enumeration of format types. */
@@ -1049,7 +1049,7 @@
output_format = format_from_filename (output_filename, 0);
}
- set_endianess (NULL, target);
+ set_endianness (NULL, target);
/* Read the input file. */
switch (input_format)
@@ -1098,7 +1098,7 @@
}
static void
-set_endianess (bfd *abfd, const char *target)
+set_endianness (bfd *abfd, const char *target)
{
const bfd_target *target_vec;
@@ -1127,7 +1127,7 @@
}
void
-set_windres_bfd_endianess (windres_bfd *wrbfd, int is_bigendian)
+set_windres_bfd_endianness (windres_bfd *wrbfd, int is_bigendian)
{
assert (!! wrbfd);
switch (WR_KIND(wrbfd))