diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-12-14 19:03:30 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-12-14 19:03:30 +0000 |
| commit | 9b547ce6834ed6367db2e76b2c4c2e99b188fc9b (patch) | |
| tree | 9d1a7bf787d52e5db2427d72aada95ce53d93ff1 /gold/merge.h | |
| parent | b6c882c7846b7bfb3cf84dad05615cff8ee35579 (diff) | |
| download | fsf-binutils-gdb-9b547ce6834ed6367db2e76b2c4c2e99b188fc9b.zip fsf-binutils-gdb-9b547ce6834ed6367db2e76b2c4c2e99b188fc9b.tar.gz fsf-binutils-gdb-9b547ce6834ed6367db2e76b2c4c2e99b188fc9b.tar.bz2 | |
Fix typos in gold.
gold/:
* dwarf_reader.cc: Remove outdated comment.
* gold-threads.cc: Fix typo in error message.
* archive.cc: Fix typos in comments.
* archive.h: Likewise.
* arm-reloc-property.cc: Likewise.
* arm-reloc-property.h: Likewise.
* arm-reloc.def: Likewise.
* arm.cc: Likewise.
* attributes.h: Likewise.
* cref.cc: Likewise.
* ehframe.cc: Likewise.
* fileread.h: Likewise.
* gold.h: Likewise.
* i386.cc: Likewise.
* icf.cc: Likewise.
* incremental.h: Likewise.
* int_encoding.cc: Likewise.
* layout.h: Likewise.
* main.cc: Likewise.
* merge.h: Likewise.
* object.cc: Likewise.
* object.h: Likewise.
* options.cc: Likewise.
* readsyms.cc: Likewise.
* reduced_debug_output.cc: Likewise.
* reloc.cc: Likewise.
* script-sections.cc: Likewise.
* sparc.cc: Likewise.
* symtab.h: Likewise.
* target-reloc.h: Likewise.
* target.cc: Likewise.
* target.h: Likewise.
* timer.cc: Likewise.
* timer.h: Likewise.
* x86_64.cc: Likewise.
Diffstat (limited to 'gold/merge.h')
| -rw-r--r-- | gold/merge.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gold/merge.h b/gold/merge.h index 7f7335b..625d731 100644 --- a/gold/merge.h +++ b/gold/merge.h @@ -1,6 +1,6 @@ // merge.h -- handle section merging for gold -*- C++ -*- -// Copyright 2006, 2007, 2008 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2010 Free Software Foundation, Inc. // Written by Ian Lance Taylor <iant@google.com>. // This file is part of gold. @@ -152,7 +152,7 @@ class Object_merge_map Input_merge_map* get_input_merge_map(unsigned int shndx); - // Get or make the the Input_merge_map to use for the section SHNDX + // Get or make the Input_merge_map to use for the section SHNDX // with MERGE_MAP. Input_merge_map* get_or_make_input_merge_map(const Merge_map* merge_map, unsigned int shndx); @@ -300,7 +300,7 @@ class Output_merge_base : public Output_section_data this->merge_map_.add_mapping(object, shndx, offset, length, output_offset); } - // This may be overriden by the child class. + // This may be overridden by the child class. virtual bool do_is_string() { return false; } |