diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b165df44921c4bcb82cb0cfcb8af7b99c1affe6..8c36c0e1750131f527929ed00050e40db64e97b4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-15 Bernhard Fischer <aldot@gcc.gnu.org>
+
+ * final.c: Update Copyright year. Commentary typo fix. Fix whitespace
+
2006-10-14 Uros Bizjak <uros@kss-loka.si>
* config/i386/athlon.md (athlon_fist): Add fisttp.
diff --git a/gcc/final.c b/gcc/final.c
index 80b3913cbf40e339820cda42e50ea73fee2181e1..d64f0c3e2281f53bd886ffc6368fcd50523cbac6 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -1,6 +1,6 @@
/* Convert RTL to assembler code and output it, for GNU compiler.
Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
This file is part of GCC.
@@ -137,7 +137,7 @@ static const char *last_filename;
/* Whether to force emission of a line note before the next insn. */
static bool force_source_line = false;
-
+
extern const int length_unit_log; /* This is defined in insn-attrtab.c. */
/* Nonzero while outputting an `asm' with operands.
@@ -816,7 +816,7 @@ shorten_branches (rtx first ATTRIBUTE_UNUSED)
/* Free uid_shuid before reallocating it. */
free (uid_shuid);
-
+
uid_shuid = XNEWVEC (int, max_uid);
if (max_labelno != max_label_num ())
@@ -857,7 +857,7 @@ shorten_branches (rtx first ATTRIBUTE_UNUSED)
INSN_SHUID (insn) = i++;
if (INSN_P (insn))
continue;
-
+
if (LABEL_P (insn))
{
rtx next;
@@ -1707,9 +1707,8 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED,
(*debug_hooks->switch_text_section) ();
switch_to_section (current_function_section ());
break;
-
+
case NOTE_INSN_BASIC_BLOCK:
-
#ifdef TARGET_UNWIND_INFO
targetm.asm_out.unwind_emit (asm_out_file, insn);
#endif
@@ -3051,7 +3050,7 @@ output_asm_insn (const char *template, rtx *operands)
int letter = *p++;
unsigned long opnum;
char *endptr;
-
+
opnum = strtoul (p, &endptr, 10);
if (endptr == p)
@@ -3096,7 +3095,7 @@ output_asm_insn (const char *template, rtx *operands)
{
unsigned long opnum;
char *endptr;
-
+
opnum = strtoul (p, &endptr, 10);
if (this_is_asm_operands && opnum >= insn_noperands)
output_operand_lossage ("operand number out of range");
@@ -3670,7 +3669,7 @@ int
final_forward_branch_p (rtx insn)
{
int insn_id, label_id;
-
+
gcc_assert (uid_shuid);
insn_id = INSN_SHUID (insn);
label_id = INSN_SHUID (JUMP_LABEL (insn));
@@ -3846,7 +3845,7 @@ debug_flush_symbol_queue (void)
for (i = 0; i < symbol_queue_index; ++i)
{
- /* If we pushed queued symbols then such symbols are must be
+ /* If we pushed queued symbols then such symbols must be
output no matter what anyone else says. Specifically,
we need to make sure dbxout_symbol() thinks the symbol was
used and also we need to override TYPE_DECL_SUPPRESS_DEBUG
@@ -3981,7 +3980,7 @@ rest_of_handle_shorten_branches (void)
shorten_branches (get_insns ());
return 0;
}
-
+
struct tree_opt_pass pass_shorten_branches =
{
"shorten", /* name */