// 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.
bool
get_output_offset(const Merge_map*, unsigned int shndx,
section_offset_type offset,
- section_offset_type *output_offset);
+ section_offset_type* output_offset);
// Return whether this is the merge map for section SHNDX.
bool
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);
bool
get_output_offset(const Relobj* object, unsigned int shndx,
section_offset_type offset,
- section_offset_type *output_offset) const;
+ section_offset_type* output_offset) const;
// Return whether this is the merge mapping for section SHNDX in
// OBJECT. This should return true when get_output_offset would
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; }
{
public:
Output_merge_string(uint64_t addralign)
- : Output_merge_base(sizeof(Char_type), addralign), stringpool_(),
+ : Output_merge_base(sizeof(Char_type), addralign), stringpool_(addralign),
merged_strings_lists_(), input_count_(0), input_size_(0)
{
- gold_assert(addralign <= sizeof(Char_type));
this->stringpool_.set_no_zero_null();
}