diff options
48 files changed, 261 insertions, 209 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index c0396548b8..74ef2b8515 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,55 @@ +2010-08-25 Nick Clifton <nickc@redhat.com> + + * archive.cc: Formatting fixes: Remove whitespace between + typename and following asterisk. Remove whitespace between + function name and opening parenthesis. + * archive.h: Likewise. + * arm.cc: Likewise. + * attributes.cc: Likewise. + * attributes.h: Likewise. + * common.cc: Likewise. + * copy-relocs.cc: Likewise. + * dirsearch.h: Likewise. + * dynobj.cc: Likewise. + * ehframe.cc: Likewise. + * ehframe.h: Likewise. + * expression.cc: Likewise. + * fileread.cc: Likewise. + * fileread.h: Likewise. + * gc.h: Likewise. + * gold-threads.cc: Likewise. + * gold.cc: Likewise. + * i386.cc: Likewise. + * icf.h: Likewise. + * incremental-dump.cc: Likewise. + * incremental.cc: Likewise. + * layout.cc: Likewise. + * layout.h: Likewise. + * main.cc: Likewise. + * merge.cc: Likewise. + * merge.h: Likewise. + * object.cc: Likewise. + * object.h: Likewise. + * options.cc: Likewise. + * options.h: Likewise. + * output.cc: Likewise. + * output.h: Likewise. + * plugin.cc: Likewise. + * plugin.h: Likewise. + * powerpc.cc: Likewise. + * reloc.cc: Likewise. + * script-c.h: Likewise. + * script-sections.cc: Likewise. + * script.cc: Likewise. + * stringpool.cc: Likewise. + * symtab.cc: Likewise. + * symtab.h: Likewise. + * target.cc: Likewise. + * timer.cc: Likewise. + * timer.h: Likewise. + * version.cc: Likewise. + * x86_64.cc: Likewise. + 2010-08-24 Nick Clifton <nickc@redhat.com> PR 11899 diff --git a/gold/archive.cc b/gold/archive.cc index dade0430de..541a49456a 100644 --- a/gold/archive.cc +++ b/gold/archive.cc @@ -566,7 +566,7 @@ Archive::get_elf_object_for_member(off_t off, bool* punconfigured) return NULL; } - Object *obj = make_elf_object((std::string(this->input_file_->filename()) + Object* obj = make_elf_object((std::string(this->input_file_->filename()) + "(" + member_name + ")"), input_file, memoff, ehdr, read_size, punconfigured); @@ -844,9 +844,9 @@ Archive::include_member(Symbol_table* symtab, Layout* layout, std::map<off_t, Archive_member>::const_iterator p = this->members_.find(off); if (p != this->members_.end()) { - Object *obj = p->second.obj_; + Object* obj = p->second.obj_; - Read_symbols_data *sd = p->second.sd_; + Read_symbols_data* sd = p->second.sd_; if (mapfile != NULL) mapfile->report_include_archive_member(obj->name(), sym, why); if (input_objects->add_object(obj)) @@ -1031,7 +1031,7 @@ Lib_group::add_symbols(Symbol_table* symtab, Layout* layout, while (i < this->members_.size()) { const Archive_member& member = this->members_[i]; - Object *obj = member.obj_; + Object* obj = member.obj_; std::string why; // Skip files with no symbols. Plugin objects have diff --git a/gold/archive.h b/gold/archive.h index 1cc5ea8c03..f687a4fe10 100644 --- a/gold/archive.h +++ b/gold/archive.h @@ -381,7 +381,7 @@ class Archive // The directory search path. Dirsearch* dirpath_; // The task reading this archive. - Task *task_; + Task* task_; // Number of members in this archive; unsigned int num_members_; // True if we exclude this library archive from automatic export. @@ -481,7 +481,7 @@ class Lib_group // For reading the files. const Input_file_lib* lib_; // The task reading this lib group. - Task *task_; + Task* task_; // Table of the objects in the group. std::vector<Archive_member> members_; }; @@ -531,7 +531,7 @@ class Add_lib_group_symbols : public Task Symbol_table* symtab_; Layout* layout_; Input_objects* input_objects_; - Lib_group * lib_; + Lib_group* lib_; Task_token* readsyms_blocker_; Task_token* this_blocker_; Task_token* next_blocker_; diff --git a/gold/arm.cc b/gold/arm.cc index 123f896e9d..4353489d31 100644 --- a/gold/arm.cc +++ b/gold/arm.cc @@ -126,7 +126,7 @@ const size_t ARM_TCB_SIZE = 8; // compilation time and generate a representation of it in PODs only. That // way we can avoid initialization when the linker starts. -Arm_reloc_property_table *arm_reloc_property_table = NULL; +Arm_reloc_property_table* arm_reloc_property_table = NULL; // Instruction template class. This class is similar to the insn_sequence // struct in bfd/elf32-arm.c. @@ -1653,18 +1653,18 @@ class Arm_relobj : public Sized_relobj<32, big_endian> bool section_needs_reloc_stub_scanning(const elfcpp::Shdr<32, big_endian>&, const Relobj::Output_sections&, - const Symbol_table *, const unsigned char*); + const Symbol_table*, const unsigned char*); // Whether a section is a scannable text section. bool section_is_scannable(const elfcpp::Shdr<32, big_endian>&, unsigned int, - const Output_section*, const Symbol_table *); + const Output_section*, const Symbol_table*); // Whether a section needs to be scanned for the Cortex-A8 erratum. bool section_needs_cortex_a8_stub_scanning(const elfcpp::Shdr<32, big_endian>&, unsigned int, Output_section*, - const Symbol_table *); + const Symbol_table*); // Scan a section for the Cortex-A8 erratum. void @@ -2371,7 +2371,7 @@ class Target_arm : public Sized_target<32, big_endian> // Map platform-specific reloc types static unsigned int - get_real_reloc_type (unsigned int r_type); + get_real_reloc_type(unsigned int r_type); // // Methods to support stub-generations. @@ -2626,7 +2626,7 @@ class Target_arm : public Sized_target<32, big_endian> // reloc. This means the relocation type accesses a symbol not via // GOT or PLT. static inline bool - reloc_is_non_pic (unsigned int r_type) + reloc_is_non_pic(unsigned int r_type) { switch (r_type) { @@ -3073,14 +3073,14 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // Handle ARM long branches. static typename This::Status arm_branch_common(unsigned int, const Relocate_info<32, big_endian>*, - unsigned char *, const Sized_symbol<32>*, + unsigned char*, const Sized_symbol<32>*, const Arm_relobj<big_endian>*, unsigned int, const Symbol_value<32>*, Arm_address, Arm_address, bool); // Handle THUMB long branches. static typename This::Status thumb_branch_common(unsigned int, const Relocate_info<32, big_endian>*, - unsigned char *, const Sized_symbol<32>*, + unsigned char*, const Sized_symbol<32>*, const Arm_relobj<big_endian>*, unsigned int, const Symbol_value<32>*, Arm_address, Arm_address, bool); @@ -3168,7 +3168,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_ABS8: S + A static inline typename This::Status - abs8(unsigned char *view, + abs8(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval) { @@ -3190,7 +3190,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_THM_ABS5: S + A static inline typename This::Status - thm_abs5(unsigned char *view, + thm_abs5(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval) { @@ -3212,7 +3212,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_ABS12: S + A static inline typename This::Status - abs12(unsigned char *view, + abs12(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval) { @@ -3231,7 +3231,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_ABS16: S + A static inline typename This::Status - abs16(unsigned char *view, + abs16(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval) { @@ -3250,7 +3250,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_ABS32: (S + A) | T static inline typename This::Status - abs32(unsigned char *view, + abs32(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval, Arm_address thumb_bit) @@ -3265,7 +3265,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_REL32: (S + A) | T - P static inline typename This::Status - rel32(unsigned char *view, + rel32(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval, Arm_address address, @@ -3281,13 +3281,13 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_THM_JUMP24: (S + A) | T - P static typename This::Status - thm_jump19(unsigned char *view, const Arm_relobj<big_endian>* object, + thm_jump19(unsigned char* view, const Arm_relobj<big_endian>* object, const Symbol_value<32>* psymval, Arm_address address, Arm_address thumb_bit); // R_ARM_THM_JUMP6: S + A – P static inline typename This::Status - thm_jump6(unsigned char *view, + thm_jump6(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval, Arm_address address) @@ -3309,7 +3309,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_THM_JUMP8: S + A – P static inline typename This::Status - thm_jump8(unsigned char *view, + thm_jump8(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval, Arm_address address) @@ -3328,7 +3328,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_THM_JUMP11: S + A – P static inline typename This::Status - thm_jump11(unsigned char *view, + thm_jump11(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval, Arm_address address) @@ -3375,7 +3375,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_GOT_PREL: GOT(S) + A - P static inline typename This::Status - got_prel(unsigned char *view, + got_prel(unsigned char* view, Arm_address got_entry, Arm_address address) { @@ -3385,7 +3385,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_PREL: (S + A) | T - P static inline typename This::Status - prel31(unsigned char *view, + prel31(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval, Arm_address address, @@ -3452,7 +3452,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_THM_MOVW_BREL_NC: ((S + A) | T) - B(S) // R_ARM_THM_MOVW_BREL: ((S + A) | T) - B(S) static inline typename This::Status - thm_movw(unsigned char *view, + thm_movw(unsigned char* view, const Sized_relobj<32, big_endian>* object, const Symbol_value<32>* psymval, Arm_address relative_address_base, @@ -3609,7 +3609,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian> // R_ARM_V4BX static inline typename This::Status v4bx(const Relocate_info<32, big_endian>* relinfo, - unsigned char *view, + unsigned char* view, const Arm_relobj<big_endian>* object, const Arm_address address, const bool is_interworking) @@ -3836,7 +3836,7 @@ typename Arm_relocate_functions<big_endian>::Status Arm_relocate_functions<big_endian>::arm_branch_common( unsigned int r_type, const Relocate_info<32, big_endian>* relinfo, - unsigned char *view, + unsigned char* view, const Sized_symbol<32>* gsym, const Arm_relobj<big_endian>* object, unsigned int r_sym, @@ -3964,7 +3964,7 @@ typename Arm_relocate_functions<big_endian>::Status Arm_relocate_functions<big_endian>::thumb_branch_common( unsigned int r_type, const Relocate_info<32, big_endian>* relinfo, - unsigned char *view, + unsigned char* view, const Sized_symbol<32>* gsym, const Arm_relobj<big_endian>* object, unsigned int r_sym, @@ -4128,7 +4128,7 @@ Arm_relocate_functions<big_endian>::thumb_branch_common( template<bool big_endian> typename Arm_relocate_functions<big_endian>::Status Arm_relocate_functions<big_endian>::thm_jump19( - unsigned char *view, + unsigned char* view, const Arm_relobj<big_endian>* object, const Symbol_value<32>* psymval, Arm_address address, @@ -5942,7 +5942,7 @@ Arm_relobj<big_endian>::section_is_scannable( const elfcpp::Shdr<32, big_endian>& shdr, unsigned int shndx, const Output_section* os, - const Symbol_table *symtab) + const Symbol_table* symtab) { // Skip any empty sections, unallocated sections or sections whose // type are not SHT_PROGBITS. @@ -5977,7 +5977,7 @@ bool Arm_relobj<big_endian>::section_needs_reloc_stub_scanning( const elfcpp::Shdr<32, big_endian>& shdr, const Relobj::Output_sections& out_sections, - const Symbol_table *symtab, + const Symbol_table* symtab, const unsigned char* pshdrs) { unsigned int sh_type = shdr.get_sh_type(); @@ -6614,7 +6614,7 @@ Arm_relobj<big_endian>::do_read_symbols(Read_symbols_data* sd) std::vector<unsigned int> deferred_exidx_sections; const size_t shdr_size = elfcpp::Elf_sizes<32>::shdr_size; const unsigned char* pshdrs = sd->section_headers->data(); - const unsigned char *ps = pshdrs + shdr_size; + const unsigned char* ps = pshdrs + shdr_size; bool must_merge_flags_and_attributes = false; for (unsigned int i = 1; i < this->shnum(); ++i, ps += shdr_size) { @@ -6890,7 +6890,7 @@ Arm_dynobj<big_endian>::do_read_symbols(Read_symbols_data* sd) // We read from the end because gas seems to put it near the end of // the section headers. const size_t shdr_size = elfcpp::Elf_sizes<32>::shdr_size; - const unsigned char *ps = + const unsigned char* ps = sd->section_headers->data() + shdr_size * (this->shnum() - 1); for (unsigned int i = this->shnum(); i > 0; --i, ps -= shdr_size) { @@ -8526,7 +8526,7 @@ inline bool Target_arm<big_endian>::Relocate::relocate( const Relocate_info<32, big_endian>* relinfo, Target_arm* target, - Output_section *output_section, + Output_section* output_section, size_t relnum, const elfcpp::Rel<32, big_endian>& rel, unsigned int r_type, @@ -9630,7 +9630,7 @@ Target_arm<big_endian>::do_dynsym_value(const Symbol* gsym) const // template<bool big_endian> unsigned int -Target_arm<big_endian>::get_real_reloc_type (unsigned int r_type) +Target_arm<big_endian>::get_real_reloc_type(unsigned int r_type) { switch (r_type) { @@ -9782,7 +9782,7 @@ int Target_arm<big_endian>::get_secondary_compatible_arch( const Attributes_section_data* pasd) { - const Object_attribute *known_attributes = + const Object_attribute* known_attributes = pasd->known_attributes(Object_attribute::OBJ_ATTR_PROC); // Note: the tag and its argument below are uleb128 values, though @@ -9808,7 +9808,7 @@ Target_arm<big_endian>::set_secondary_compatible_arch( Attributes_section_data* pasd, int arch) { - Object_attribute *known_attributes = + Object_attribute* known_attributes = pasd->known_attributes(Object_attribute::OBJ_ATTR_PROC); if (arch == -1) @@ -9947,7 +9947,7 @@ Target_arm<big_endian>::tag_cpu_arch_combine( T(V7E_M), // V7E_M. T(V4T_PLUS_V6_M) // V4T plus V6_M. }; - static const int *comb[] = + static const int* comb[] = { v6t2, v6k, @@ -10015,7 +10015,7 @@ template<bool big_endian> std::string Target_arm<big_endian>::aeabi_enum_name(unsigned int value) { - static const char *aeabi_enum_names[] = + static const char* aeabi_enum_names[] = { "", "variable-size", "32-bit", "" }; const size_t aeabi_enum_names_size = sizeof(aeabi_enum_names) / sizeof(aeabi_enum_names[0]); @@ -10036,7 +10036,7 @@ template<bool big_endian> std::string Target_arm<big_endian>::tag_cpu_name_value(unsigned int value) { - static const char *name_table[] = { + static const char* name_table[] = { // These aren't real CPU names, but we can't guess // that from the architecture version alone. "Pre v4", @@ -11644,7 +11644,7 @@ Target_arm<big_endian>::fix_exidx_coverage( if (!exidx_input_section->has_errors()) { unsigned int text_shndx = exidx_input_section->link(); - Output_section *os = arm_relobj->output_section(text_shndx); + Output_section* os = arm_relobj->output_section(text_shndx); if (os != NULL && (os->flags() & elfcpp::SHF_ALLOC) != 0) sorted_output_sections.insert(os); } diff --git a/gold/attributes.cc b/gold/attributes.cc index b9b36089e3..45ab5a0c49 100644 --- a/gold/attributes.cc +++ b/gold/attributes.cc @@ -276,7 +276,7 @@ Attributes_section_data::Attributes_section_data( this->vendor_object_attributes_[vendor] = new Vendor_object_attributes(vendor); - const unsigned char *p = view; + const unsigned char* p = view; p = view; if (size > 0 && p != NULL && *(p++) == 'A') { @@ -296,7 +296,7 @@ Attributes_section_data::Attributes_section_data( section_size -= section_name_size + 4; int vendor; - const char *std_section = parameters->target().attributes_vendor(); + const char* std_section = parameters->target().attributes_vendor(); if (std_section != NULL && strcmp(section_name, std_section) == 0) vendor = Object_attribute::OBJ_ATTR_PROC; else if (strcmp(section_name, "gnu") == 0) diff --git a/gold/attributes.h b/gold/attributes.h index 7c4baf4b95..d11f5d859b 100644 --- a/gold/attributes.h +++ b/gold/attributes.h @@ -163,7 +163,7 @@ class Object_attribute // Determine what arguments an attribute tag takes. static int - arg_type (int vendor, int tag) + arg_type(int vendor, int tag) { switch (vendor) { @@ -180,7 +180,7 @@ class Object_attribute // Determine whether a GNU object attribute tag takes an integer, a // string or both. */ static int - gnu_arg_type (int tag) + gnu_arg_type(int tag) { // Except for Tag_compatibility, for GNU attributes we follow the // same rule ARM ones > 32 follow: odd-numbered tags take strings diff --git a/gold/common.cc b/gold/common.cc index 8d122fa03f..6acd2b5bd7 100644 --- a/gold/common.cc +++ b/gold/common.cc @@ -286,8 +286,8 @@ Symbol_table::do_allocate_commons_list( gold_unreachable(); } - Output_data_space *poc = new Output_data_space(addralign, ds_name); - Output_section *os = layout->add_output_section_data(name, + Output_data_space* poc = new Output_data_space(addralign, ds_name); + Output_section* os = layout->add_output_section_data(name, elfcpp::SHT_NOBITS, flags, poc, ORDER_INVALID, diff --git a/gold/copy-relocs.cc b/gold/copy-relocs.cc index 9544c811e1..ed8002fff6 100644 --- a/gold/copy-relocs.cc +++ b/gold/copy-relocs.cc @@ -60,7 +60,7 @@ Copy_relocs<sh_type, size, big_endian>::copy_reloc( Sized_symbol<size>* sym, Sized_relobj<size, big_endian>* object, unsigned int shndx, - Output_section *output_section, + Output_section* output_section, const Reloc& rel, Output_data_reloc<sh_type, true, size, big_endian>* reloc_section) { diff --git a/gold/dirsearch.h b/gold/dirsearch.h index f14b5ed7d1..986d3891eb 100644 --- a/gold/dirsearch.h +++ b/gold/dirsearch.h @@ -59,7 +59,7 @@ class Dirsearch // and that value plus one may be used to find the next file with // the same name(s). std::string - find(const std::string&, const std::string& n2, bool *is_in_sysroot, + find(const std::string&, const std::string& n2, bool* is_in_sysroot, int* pindex) const; // Return the blocker token which controls access. diff --git a/gold/dynobj.cc b/gold/dynobj.cc index e4a976dcba..d2ba8aec27 100644 --- a/gold/dynobj.cc +++ b/gold/dynobj.cc @@ -1731,8 +1731,8 @@ Versions::def_section_contents(const Stringpool* dynpool, template<int size, bool big_endian> void Versions::need_section_contents(const Stringpool* dynpool, - unsigned char** pp, unsigned int *psize, - unsigned int *pentries) const + unsigned char** pp, unsigned int* psize, + unsigned int* pentries) const { gold_assert(this->is_finalized_); gold_assert(!this->needs_.empty()); diff --git a/gold/ehframe.cc b/gold/ehframe.cc index 333e665c1e..290940536d 100644 --- a/gold/ehframe.cc +++ b/gold/ehframe.cc @@ -683,7 +683,7 @@ Eh_frame::read_cie(Sized_relobj<size, big_endian>* object, section_size_type symbol_names_size, const unsigned char* pcontents, const unsigned char* pcie, - const unsigned char *pcieend, + const unsigned char* pcieend, Track_relocs<size, big_endian>* relocs, Offsets_to_cie* cies, New_cies* new_cies) @@ -936,7 +936,7 @@ Eh_frame::read_fde(Sized_relobj<size, big_endian>* object, const unsigned char* pcontents, unsigned int offset, const unsigned char* pfde, - const unsigned char *pfdeend, + const unsigned char* pfdeend, Track_relocs<size, big_endian>* relocs, Offsets_to_cie* cies) { diff --git a/gold/ehframe.h b/gold/ehframe.h index 4726ffc436..16902454dd 100644 --- a/gold/ehframe.h +++ b/gold/ehframe.h @@ -405,7 +405,7 @@ class Eh_frame : public Output_section_data section_size_type symbol_names_size, const unsigned char* pcontents, const unsigned char* pcie, - const unsigned char *pcieend, + const unsigned char* pcieend, Track_relocs<size, big_endian>* relocs, Offsets_to_cie* cies, New_cies* new_cies); @@ -420,7 +420,7 @@ class Eh_frame : public Output_section_data const unsigned char* pcontents, unsigned int offset, const unsigned char* pfde, - const unsigned char *pfdeend, + const unsigned char* pfdeend, Track_relocs<size, big_endian>* relocs, Offsets_to_cie* cies); diff --git a/gold/expression.cc b/gold/expression.cc index 134b0fa2a2..6d18679971 100644 --- a/gold/expression.cc +++ b/gold/expression.cc @@ -362,7 +362,7 @@ class Binary_expression : public Expression // This is a call to function FUNCTION_NAME. Print it. This is for // debugging. void - print_function(FILE* f, const char *function_name) const + print_function(FILE* f, const char* function_name) const { fprintf(f, "%s(", function_name); this->left_print(f); diff --git a/gold/fileread.cc b/gold/fileread.cc index 0c3cb9504b..f626028fb5 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -971,7 +971,7 @@ Input_file::find_file(const Dirsearch& dirpath, int* pindex, // Open the file. bool -Input_file::open(const Dirsearch& dirpath, const Task* task, int *pindex) +Input_file::open(const Dirsearch& dirpath, const Task* task, int* pindex) { std::string name; if (!Input_file::find_file(dirpath, pindex, this->input_argument_, diff --git a/gold/fileread.h b/gold/fileread.h index 3a8f93289e..6d0db78d3a 100644 --- a/gold/fileread.h +++ b/gold/fileread.h @@ -515,7 +515,7 @@ class Input_file // restarted to find the next file with a matching name by // incrementing the result and calling this again. bool - open(const Dirsearch&, const Task*, int *pindex); + open(const Dirsearch&, const Task*, int* pindex); // Return the name given by the user. For -lc this will return "c". const char* @@ -187,7 +187,7 @@ gc_process_relocs( size_t local_count, const unsigned char* plocal_syms) { - Object *dst_obj; + Object* dst_obj; unsigned int dst_indx; Scan scan; diff --git a/gold/gold-threads.cc b/gold/gold-threads.cc index ef5b6922e3..c984dd0475 100644 --- a/gold/gold-threads.cc +++ b/gold/gold-threads.cc @@ -107,7 +107,7 @@ Lock_impl_threads::Lock_impl_threads() gold_fatal(_("pthread_mutextattr_settype failed: %s"), strerror(err)); #endif - err = pthread_mutex_init (&this->mutex_, &attr); + err = pthread_mutex_init(&this->mutex_, &attr); if (err != 0) gold_fatal(_("pthread_mutex_init failed: %s"), strerror(err)); diff --git a/gold/gold.cc b/gold/gold.cc index 541d177be5..74294d7692 100644 --- a/gold/gold.cc +++ b/gold/gold.cc @@ -379,7 +379,7 @@ queue_middle_tasks(const General_options& options, ++p) { // Update the value of output_section stored in rd. - Read_relocs_data *rd = (*p)->get_relocs_data(); + Read_relocs_data* rd = (*p)->get_relocs_data(); for (Read_relocs_data::Relocs_list::iterator q = rd->relocs.begin(); q != rd->relocs.end(); ++q) @@ -655,7 +655,7 @@ queue_final_tasks(const General_options& options, } else { - Task_token *new_final_blocker = new Task_token(true); + Task_token* new_final_blocker = new Task_token(true); new_final_blocker->add_blocker(); Task* t = new Write_after_input_sections_task(layout, of, final_blocker, diff --git a/gold/i386.cc b/gold/i386.cc index 56d405bc8a..009f217799 100644 --- a/gold/i386.cc +++ b/gold/i386.cc @@ -2140,7 +2140,7 @@ Target_i386::Relocate::should_apply_static_reloc(const Sized_symbol<32>* gsym, inline bool Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo, Target_i386* target, - Output_section *output_section, + Output_section* output_section, size_t relnum, const elfcpp::Rel<32, false>& rel, unsigned int r_type, diff --git a/gold/icf.h b/gold/icf.h index 1a4d1be962..396dda0331 100644 --- a/gold/icf.h +++ b/gold/icf.h @@ -105,7 +105,7 @@ class Icf // Given an object and a section index, this returns true if the // pointer of the function defined in this section is taken. bool - section_has_function_pointers(Object *obj, unsigned int shndx) + section_has_function_pointers(Object* obj, unsigned int shndx) { return (this->fptr_section_id_.find(Section_id(obj, shndx)) != this->fptr_section_id_.end()); @@ -114,7 +114,7 @@ class Icf // Records that a pointer of the function defined in this section // is taken. void - set_section_has_function_pointers(Object *obj, unsigned int shndx) + set_section_has_function_pointers(Object* obj, unsigned int shndx) { this->fptr_section_id_.insert(Section_id(obj, shndx)); } diff --git a/gold/incremental-dump.cc b/gold/incremental-dump.cc index 68fba5ca1e..348e795fc6 100644 --- a/gold/incremental-dump.cc +++ b/gold/incremental-dump.cc @@ -95,7 +95,7 @@ dump_incremental_inputs(const char* argv0, const char* filename, { fprintf(stderr, "%s: %s: no .gnu_incremental_inputs section\n", argv0, filename); - exit (1); + exit(1); } elfcpp::Elf_file<size, big_endian, Incremental_binary> elf_file(inc); @@ -276,7 +276,7 @@ dump_incremental_inputs(const char* argv0, const char* filename, if (symtab_shndx == elfcpp::SHN_UNDEF) // Not found. { fprintf(stderr, "%s: %s: no symbol table section\n", argv0, filename); - exit (1); + exit(1); } Location symtab_location(elf_file.section_contents(symtab_shndx)); View symtab_view(inc->view(symtab_location)); @@ -289,7 +289,7 @@ dump_incremental_inputs(const char* argv0, const char* filename, || elf_file.section_type(strtab_shndx) != elfcpp::SHT_STRTAB) { fprintf(stderr, "%s: %s: no string table section\n", argv0, filename); - exit (1); + exit(1); } Location strtab_location(elf_file.section_contents(strtab_shndx)); View strtab_view(inc->view(strtab_location)); diff --git a/gold/incremental.cc b/gold/incremental.cc index 5a1d3d9006..6a98ca240d 100644 --- a/gold/incremental.cc +++ b/gold/incremental.cc @@ -622,7 +622,7 @@ Output_section_incremental_inputs<size, big_endian>::set_final_data_size() case INCREMENTAL_INPUT_OBJECT: case INCREMENTAL_INPUT_ARCHIVE_MEMBER: { - Incremental_object_entry *entry = (*p)->object_entry(); + Incremental_object_entry* entry = (*p)->object_entry(); gold_assert(entry != NULL); (*p)->set_info_offset(info_offset); // Input section count + global symbol count. @@ -637,7 +637,7 @@ Output_section_incremental_inputs<size, big_endian>::set_final_data_size() break; case INCREMENTAL_INPUT_SHARED_LIBRARY: { - Incremental_object_entry *entry = (*p)->object_entry(); + Incremental_object_entry* entry = (*p)->object_entry(); gold_assert(entry != NULL); (*p)->set_info_offset(info_offset); // Global symbol count. @@ -650,7 +650,7 @@ Output_section_incremental_inputs<size, big_endian>::set_final_data_size() break; case INCREMENTAL_INPUT_ARCHIVE: { - Incremental_archive_entry *entry = (*p)->archive_entry(); + Incremental_archive_entry* entry = (*p)->archive_entry(); gold_assert(entry != NULL); (*p)->set_info_offset(info_offset); // Member count + unused global symbol count. diff --git a/gold/layout.cc b/gold/layout.cc index 3040bf6235..5edba48aae 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -2099,7 +2099,7 @@ Layout::create_gold_note() std::string desc = std::string("gold ") + gold::get_version_string(); size_t trailing_padding; - Output_section *os = this->create_note("GNU", elfcpp::NT_GNU_GOLD_VERSION, + Output_section* os = this->create_note("GNU", elfcpp::NT_GNU_GOLD_VERSION, ".note.gnu.gold-version", desc.size(), false, &trailing_padding); if (os == NULL) @@ -2314,7 +2314,7 @@ Layout::create_incremental_info_sections(Symbol_table* symtab) incr->create_data_sections(symtab); // Add the .gnu_incremental_inputs section. - const char *incremental_inputs_name = + const char* incremental_inputs_name = this->namepool_.add(".gnu_incremental_inputs", false, NULL); Output_section* incremental_inputs_os = this->make_output_section(incremental_inputs_name, @@ -2323,7 +2323,7 @@ Layout::create_incremental_info_sections(Symbol_table* symtab) incremental_inputs_os->add_output_section_data(incr->inputs_section()); // Add the .gnu_incremental_symtab section. - const char *incremental_symtab_name = + const char* incremental_symtab_name = this->namepool_.add(".gnu_incremental_symtab", false, NULL); Output_section* incremental_symtab_os = this->make_output_section(incremental_symtab_name, @@ -2333,7 +2333,7 @@ Layout::create_incremental_info_sections(Symbol_table* symtab) incremental_symtab_os->set_entsize(4); // Add the .gnu_incremental_relocs section. - const char *incremental_relocs_name = + const char* incremental_relocs_name = this->namepool_.add(".gnu_incremental_relocs", false, NULL); Output_section* incremental_relocs_os = this->make_output_section(incremental_relocs_name, @@ -2343,7 +2343,7 @@ Layout::create_incremental_info_sections(Symbol_table* symtab) incremental_relocs_os->set_entsize(incr->relocs_entsize()); // Add the .gnu_incremental_got_plt section. - const char *incremental_got_plt_name = + const char* incremental_got_plt_name = this->namepool_.add(".gnu_incremental_got_plt", false, NULL); Output_section* incremental_got_plt_os = this->make_output_section(incremental_got_plt_name, @@ -2352,7 +2352,7 @@ Layout::create_incremental_info_sections(Symbol_table* symtab) incremental_got_plt_os->add_output_section_data(incr->got_plt_section()); // Add the .gnu_incremental_strtab section. - const char *incremental_strtab_name = + const char* incremental_strtab_name = this->namepool_.add(".gnu_incremental_strtab", false, NULL); Output_section* incremental_strtab_os = this->make_output_section(incremental_strtab_name, elfcpp::SHT_STRTAB, 0, @@ -2523,7 +2523,7 @@ align_file_offset(off_t off, uint64_t addr, uint64_t abi_pagesize) off_t Layout::set_segment_offsets(const Target* target, Output_segment* load_seg, - unsigned int *pshndx) + unsigned int* pshndx) { // Sort them into the final order. std::sort(this->segment_list_.begin(), this->segment_list_.end(), @@ -2730,7 +2730,7 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg, off_t Layout::set_relocatable_section_offsets(Output_data* file_header, - unsigned int *pshndx) + unsigned int* pshndx) { off_t off = 0; @@ -3118,7 +3118,7 @@ Layout::allocated_output_section_count() const void Layout::create_dynamic_symtab(const Input_objects* input_objects, Symbol_table* symtab, - Output_section **pdynstr, + Output_section** pdynstr, unsigned int* plocal_dynamic_count, std::vector<Symbol*>* pdynamic_symbols, Versions* pversions) @@ -3913,7 +3913,7 @@ Layout::output_section_name(const char* name, size_t* plen) if (is_compressed_debug_section(name)) { size_t len = strlen(name); - char *uncompressed_name = new char[len]; + char* uncompressed_name = new char[len]; uncompressed_name[0] = '.'; gold_assert(name[0] == '.' && name[1] == 'z'); strncpy(&uncompressed_name[1], &name[2], len - 2); diff --git a/gold/layout.h b/gold/layout.h index 87ee09ed96..6e817cacd3 100644 --- a/gold/layout.h +++ b/gold/layout.h @@ -215,8 +215,8 @@ class Kept_section // Look for a section name in the group list, and return whether it // was found. If found, returns the section index and size. bool - find_comdat_section(const std::string& name, unsigned int *pshndx, - uint64_t *psize) const + find_comdat_section(const std::string& name, unsigned int* pshndx, + uint64_t* psize) const { gold_assert(this->is_comdat_); Comdat_group::const_iterator p = this->u_.group_sections->find(name); @@ -230,7 +230,7 @@ class Kept_section // If there is only one section in the group list, return true, and // return the section index and size. bool - find_single_comdat_section(unsigned int *pshndx, uint64_t *psize) const + find_single_comdat_section(unsigned int* pshndx, uint64_t* psize) const { gold_assert(this->is_comdat_); if (this->u_.group_sections->size() != 1) @@ -779,7 +779,7 @@ class Layout // Create a note section, filling in the header. Output_section* - create_note(const char* name, int note_type, const char *section_name, + create_note(const char* name, int note_type, const char* section_name, size_t descsz, bool allocate, size_t* trailing_padding); // Create a note section for gold version. diff --git a/gold/main.cc b/gold/main.cc index 91d5193369..30db238c03 100644 --- a/gold/main.cc +++ b/gold/main.cc @@ -136,13 +136,13 @@ int main(int argc, char** argv) { #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) - setlocale (LC_MESSAGES, ""); + setlocale(LC_MESSAGES, ""); #endif #if defined (HAVE_SETLOCALE) - setlocale (LC_CTYPE, ""); + setlocale(LC_CTYPE, ""); #endif - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); program_name = argv[0]; diff --git a/gold/merge.cc b/gold/merge.cc index 9fb5845a7a..4fcbc1092a 100644 --- a/gold/merge.cc +++ b/gold/merge.cc @@ -145,7 +145,7 @@ bool Object_merge_map::get_output_offset(const Merge_map* merge_map, unsigned int shndx, section_offset_type input_offset, - section_offset_type *output_offset) + section_offset_type* output_offset) { Input_merge_map* map = this->get_input_merge_map(shndx); if (map == NULL diff --git a/gold/merge.h b/gold/merge.h index 675739e24e..7f7335bddf 100644 --- a/gold/merge.h +++ b/gold/merge.h @@ -70,7 +70,7 @@ class Object_merge_map 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 @@ -200,7 +200,7 @@ class Merge_map 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 diff --git a/gold/object.cc b/gold/object.cc index 5250fa3c2c..bdeb1414bd 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -1493,7 +1493,7 @@ Sized_relobj<size, big_endian>::do_layout(Symbol_table* symtab, gold_assert(external_symbols_offset != 0); unsigned int i = *p; - const unsigned char *pshdr; + const unsigned char* pshdr; pshdr = section_headers_data + i * This::shdr_size; typename This::Shdr shdr(pshdr); @@ -1932,7 +1932,7 @@ Sized_relobj<size, big_endian>::do_finalize_local_symbols(unsigned int index, Address secoffset = out_offsets[shndx]; if (symtab->is_section_folded(this, shndx)) { - gold_assert (os == NULL && secoffset == invalid_address); + gold_assert(os == NULL && secoffset == invalid_address); // Get the os of the section it is folded onto. Section_id folded = symtab->icf()->get_folded_section(this, shndx); @@ -2095,7 +2095,7 @@ uint64_t Sized_relobj<size, big_endian>::do_section_entsize(unsigned int shndx) { Symbols_data* sd = this->get_symbols_data(); - gold_assert (sd != NULL); + gold_assert(sd != NULL); const unsigned char* pshdrs = sd->section_headers_data + This::shdr_size * shndx; @@ -2597,7 +2597,7 @@ namespace gold bool is_elf_object(Input_file* input_file, off_t offset, - const unsigned char** start, int *read_size) + const unsigned char** start, int* read_size) { off_t filesize = input_file->file().filesize(); int want = elfcpp::Elf_recognizer::max_header_size; diff --git a/gold/object.h b/gold/object.h index 3412aec781..1f79e27232 100644 --- a/gold/object.h +++ b/gold/object.h @@ -746,7 +746,7 @@ class Relobj : public Object // Decides which section names have to be included in the worklist // as roots. bool - is_section_name_included(const char *name); + is_section_name_included(const char* name); void copy_symbols_data(Symbols_data* gc_sd, Read_symbols_data* sd, @@ -1043,7 +1043,7 @@ class Relobj : public Object // Used to store the symbols data computed by the Read_symbols pass. // Again used during garbage collection when laying out referenced // sections. - gold::Symbols_data *sd_; + gold::Symbols_data* sd_; // Per-symbol counts of relocations, for incremental links. unsigned int* reloc_counts_; // Per-symbol base indexes of relocations, for incremental links. @@ -2006,7 +2006,7 @@ class Sized_relobj : public Relobj // Whether to include a section group in the link. bool include_section_group(Symbol_table*, Layout*, unsigned int, const char*, - const unsigned char*, const char *, section_size_type, + const unsigned char*, const char*, section_size_type, std::vector<bool>*); // Whether to include a linkonce section in the link. @@ -2388,7 +2388,7 @@ struct Const_section_id_hash extern bool is_elf_object(Input_file* input_file, off_t offset, - const unsigned char** start, int *read_size); + const unsigned char** start, int* read_size); // Return an Object appropriate for the input file. P is BYTES long, // and holds the ELF header. If PUNCONFIGURED is not NULL, then if diff --git a/gold/options.cc b/gold/options.cc index b209f85e30..eb26726fc0 100644 --- a/gold/options.cc +++ b/gold/options.cc @@ -205,7 +205,7 @@ parse_int(const char* option_name, const char* arg, int* retval) } void -parse_uint64(const char* option_name, const char* arg, uint64_t *retval) +parse_uint64(const char* option_name, const char* arg, uint64_t* retval) { char* endptr; *retval = strtoull(arg, &endptr, 0); @@ -345,7 +345,7 @@ General_options::parse_library(const char*, const char* arg, Command_line* cmdline) { Input_file_argument::Input_file_type type; - const char *name; + const char* name; if (arg[0] == ':') { type = Input_file_argument::INPUT_FILE_TYPE_SEARCHED_FILE; @@ -522,7 +522,7 @@ void General_options::parse_exclude_libs(const char*, const char* arg, Command_line*) { - const char *p = arg; + const char* p = arg; while (*p != '\0') { @@ -542,7 +542,7 @@ General_options::parse_exclude_libs(const char*, const char* arg, // wild-card and matches any given name. bool -General_options::check_excluded_libs (const std::string &name) const +General_options::check_excluded_libs(const std::string &name) const { Unordered_set<std::string>::const_iterator p; @@ -556,7 +556,7 @@ General_options::check_excluded_libs (const std::string &name) const return true; // First strip off any directories in name. - const char *basename = lbasename(name.c_str()); + const char* basename = lbasename(name.c_str()); // Try finding an exact match. p = excluded_libs_.find(std::string(basename)); @@ -641,7 +641,7 @@ usage() } void -usage(const char* msg, const char *opt) +usage(const char* msg, const char* opt) { fprintf(stderr, _("%s: %s: %s\n"), @@ -1356,7 +1356,7 @@ Command_line::version_script() this->options_.finalize_dynamic_list(); Version_script_info* vsi = this->script_options_.version_script_info(); vsi->finalize(); - return *vsi; + return* vsi; } } // End namespace gold. diff --git a/gold/options.h b/gold/options.h index efd9e90fcb..c5e24cc1bd 100644 --- a/gold/options.h +++ b/gold/options.h @@ -1269,7 +1269,7 @@ class General_options // Return true if S is the name of a library excluded from automatic // symbol export. bool - check_excluded_libs (const std::string &s) const; + check_excluded_libs(const std::string &s) const; // If an explicit start address was given for section SECNAME with // the --section-start option, return true and set *PADDR to the @@ -1355,7 +1355,7 @@ class General_options // Add a plugin and its arguments to the list of plugins. void - add_plugin(const char *filename); + add_plugin(const char* filename); // Add a plugin option. void diff --git a/gold/output.cc b/gold/output.cc index 5cb63fb772..ffc5d69109 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -1884,7 +1884,7 @@ Output_section::Input_section::output_offset( const Relobj* object, unsigned int shndx, section_offset_type offset, - section_offset_type *poutput) const + section_offset_type* poutput) const { if (!this->is_input_section()) return this->u2_.posd->output_offset(object, shndx, offset, poutput); @@ -4089,7 +4089,7 @@ unsigned char* Output_segment::write_section_headers(const Layout* layout, const Stringpool* secnamepool, unsigned char* v, - unsigned int *pshndx) const + unsigned int* pshndx) const { // Every section that is attached to a segment must be attached to a // PT_LOAD segment, so we only write out section headers for PT_LOAD diff --git a/gold/output.h b/gold/output.h index 1670704474..40d8d3fe98 100644 --- a/gold/output.h +++ b/gold/output.h @@ -632,7 +632,7 @@ class Output_section_data : public Output_data bool output_offset(const Relobj* object, unsigned int shndx, section_offset_type offset, - section_offset_type *poutput) const + section_offset_type* poutput) const { return this->do_output_offset(object, shndx, offset, poutput); } // Return whether this is the merge section for the input section @@ -1373,7 +1373,7 @@ class Output_data_reloc_base : public Output_data_reloc_generic // Set the entry size and the link. void - do_adjust_output_section(Output_section *os); + do_adjust_output_section(Output_section* os); // Write to a map file. void @@ -1387,7 +1387,7 @@ class Output_data_reloc_base : public Output_data_reloc_generic // Add a relocation entry. void - add(Output_data *od, const Output_reloc_type& reloc) + add(Output_data* od, const Output_reloc_type& reloc) { this->relocs_.push_back(reloc); this->set_current_data_size(this->relocs_.size() * reloc_size); @@ -2534,7 +2534,7 @@ class Output_section : public Output_data template<int size, bool big_endian> off_t add_input_section(Layout* layout, Sized_relobj<size, big_endian>* object, - unsigned int shndx, const char *name, + unsigned int shndx, const char* name, const elfcpp::Shdr<size, big_endian>& shdr, unsigned int reloc_shndx, bool have_sections_script); @@ -2985,7 +2985,7 @@ class Output_section : public Output_data } // For a relaxed input section. - Input_section(Output_relaxed_input_section *psection) + Input_section(Output_relaxed_input_section* psection) : shndx_(RELAXED_INPUT_SECTION_CODE), p2align_(0), section_order_index_(0) { @@ -3117,7 +3117,7 @@ class Output_section : public Output_data set_output_section(Output_section* os) { gold_assert(!this->is_input_section()); - Output_section_data *posd = + Output_section_data* posd = this->is_relaxed_input_section() ? this->u2_.poris : this->u2_.posd; posd->set_output_section(os); } @@ -3156,7 +3156,7 @@ class Output_section : public Output_data bool output_offset(const Relobj* object, unsigned int shndx, section_offset_type offset, - section_offset_type *poutput) const; + section_offset_type* poutput) const; // Return whether this is the merge section for the input section // SHNDX in OBJECT. diff --git a/gold/plugin.cc b/gold/plugin.cc index 468006701d..2b11cd3dcf 100644 --- a/gold/plugin.cc +++ b/gold/plugin.cc @@ -132,7 +132,7 @@ Plugin::load() // Allocate and populate a transfer vector. const int tv_fixed_size = 16; int tv_size = this->args_.size() + tv_fixed_size; - ld_plugin_tv *tv = new ld_plugin_tv[tv_size]; + ld_plugin_tv* tv = new ld_plugin_tv[tv_size]; // Put LDPT_MESSAGE at the front of the list so the plugin can use it // while processing subsequent entries. @@ -224,7 +224,7 @@ Plugin::load() // Call the plugin claim-file handler. inline bool -Plugin::claim_file(struct ld_plugin_input_file *plugin_input_file) +Plugin::claim_file(struct ld_plugin_input_file* plugin_input_file) { int claimed = 0; @@ -397,7 +397,7 @@ Plugin_manager::make_plugin_object(unsigned int handle) ld_plugin_status Plugin_manager::get_input_file(unsigned int handle, - struct ld_plugin_input_file *file) + struct ld_plugin_input_file* file) { Pluginobj* obj = this->object(handle); if (obj == NULL) @@ -428,7 +428,7 @@ Plugin_manager::release_input_file(unsigned int handle) // Add a new library path. ld_plugin_status -Plugin_manager::set_extra_library_path(const char *path) +Plugin_manager::set_extra_library_path(const char* path) { this->extra_search_path_ = std::string(path); return LDPS_OK; @@ -437,7 +437,7 @@ Plugin_manager::set_extra_library_path(const char *path) // Add a new input file. ld_plugin_status -Plugin_manager::add_input_file(const char *pathname, bool is_lib) +Plugin_manager::add_input_file(const char* pathname, bool is_lib) { Input_file_argument file(pathname, (is_lib @@ -505,7 +505,7 @@ Pluginobj::get_symbol_resolution_info(int nsyms, ld_plugin_symbol* syms) const { // We never decided to include this object. We mark all symbols as // preempted. - gold_assert (this->symbols_.size() == 0); + gold_assert(this->symbols_.size() == 0); for (int i = 0; i < nsyms; i++) syms[i].resolution = LDPR_PREEMPTED_REG; return LDPS_OK; @@ -626,7 +626,7 @@ Sized_pluginobj<size, big_endian>::do_add_symbols(Symbol_table* symtab, for (int i = 0; i < this->nsyms_; ++i) { - const struct ld_plugin_symbol *isym = &this->syms_[i]; + const struct ld_plugin_symbol* isym = &this->syms_[i]; const char* name = isym->name; const char* ver = isym->version; elfcpp::Elf_Half shndx; @@ -1000,7 +1000,7 @@ register_cleanup(ld_plugin_cleanup_handler handler) // Add symbols from a plugin-claimed input file. static enum ld_plugin_status -add_symbols(void* handle, int nsyms, const ld_plugin_symbol *syms) +add_symbols(void* handle, int nsyms, const ld_plugin_symbol* syms) { gold_assert(parameters->options().has_plugins()); Pluginobj* obj = parameters->options().plugins()->make_plugin_object( @@ -1015,7 +1015,7 @@ add_symbols(void* handle, int nsyms, const ld_plugin_symbol *syms) // file descriptor. static enum ld_plugin_status -get_input_file(const void *handle, struct ld_plugin_input_file *file) +get_input_file(const void* handle, struct ld_plugin_input_file* file) { gold_assert(parameters->options().has_plugins()); unsigned int obj_index = @@ -1026,7 +1026,7 @@ get_input_file(const void *handle, struct ld_plugin_input_file *file) // Release the input file. static enum ld_plugin_status -release_input_file(const void *handle) +release_input_file(const void* handle) { gold_assert(parameters->options().has_plugins()); unsigned int obj_index = @@ -1037,7 +1037,7 @@ release_input_file(const void *handle) // Get the symbol resolution info for a plugin-claimed input file. static enum ld_plugin_status -get_symbols(const void * handle, int nsyms, ld_plugin_symbol* syms) +get_symbols(const void* handle, int nsyms, ld_plugin_symbol* syms) { gold_assert(parameters->options().has_plugins()); Pluginobj* obj = parameters->options().plugins()->object( @@ -1050,7 +1050,7 @@ get_symbols(const void * handle, int nsyms, ld_plugin_symbol* syms) // Add a new (real) input file generated by a plugin. static enum ld_plugin_status -add_input_file(const char *pathname) +add_input_file(const char* pathname) { gold_assert(parameters->options().has_plugins()); return parameters->options().plugins()->add_input_file(pathname, false); @@ -1059,7 +1059,7 @@ add_input_file(const char *pathname) // Add a new (real) library required by a plugin. static enum ld_plugin_status -add_input_library(const char *pathname) +add_input_library(const char* pathname) { gold_assert(parameters->options().has_plugins()); return parameters->options().plugins()->add_input_file(pathname, true); @@ -1069,7 +1069,7 @@ add_input_library(const char *pathname) // add_input_library static enum ld_plugin_status -set_extra_library_path(const char *path) +set_extra_library_path(const char* path) { gold_assert(parameters->options().has_plugins()); return parameters->options().plugins()->set_extra_library_path(path); @@ -1078,7 +1078,7 @@ set_extra_library_path(const char *path) // Issue a diagnostic message from a plugin. static enum ld_plugin_status -message(int level, const char * format, ...) +message(int level, const char* format, ...) { va_list args; va_start(args, format); diff --git a/gold/plugin.h b/gold/plugin.h index 47e634e7a1..32f1bb7678 100644 --- a/gold/plugin.h +++ b/gold/plugin.h @@ -67,7 +67,7 @@ class Plugin // Call the claim-file handler. bool - claim_file(struct ld_plugin_input_file *plugin_input_file); + claim_file(struct ld_plugin_input_file* plugin_input_file); // Call the all-symbols-read handler. void @@ -94,7 +94,7 @@ class Plugin // Add an argument void - add_option(const char *arg) + add_option(const char* arg) { this->args_.push_back(arg); } @@ -151,7 +151,7 @@ class Plugin_manager // Call the plugin claim-file handlers in turn to see if any claim the file. Pluginobj* - claim_file(Input_file *input_file, off_t offset, off_t filesize); + claim_file(Input_file* input_file, off_t offset, off_t filesize); // Call the all-symbols-read handlers. void @@ -222,7 +222,7 @@ class Plugin_manager // Get input file information with an open (possibly re-opened) // file descriptor. ld_plugin_status - get_input_file(unsigned int handle, struct ld_plugin_input_file *file); + get_input_file(unsigned int handle, struct ld_plugin_input_file* file); // Release an input file. ld_plugin_status @@ -230,11 +230,11 @@ class Plugin_manager // Add a new input file. ld_plugin_status - add_input_file(const char *pathname, bool is_lib); + add_input_file(const char* pathname, bool is_lib); // Set the extra library path. ld_plugin_status - set_extra_library_path(const char *path); + set_extra_library_path(const char* path); // Return TRUE if we are in the replacement phase. bool diff --git a/gold/powerpc.cc b/gold/powerpc.cc index aca75f286d..49af65f8fe 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -291,7 +291,7 @@ class Target_powerpc : public Sized_target<size, big_endian> Output_data_space* got2_section() const { - gold_assert (this->got2_ != NULL); + gold_assert(this->got2_ != NULL); return this->got2_; } @@ -299,7 +299,7 @@ class Target_powerpc : public Sized_target<size, big_endian> Output_data_space* toc_section() const { - gold_assert (this->toc_ != NULL); + gold_assert(this->toc_ != NULL); return this->toc_; } diff --git a/gold/reloc.cc b/gold/reloc.cc index 89389888c3..6f2ede7024 100644 --- a/gold/reloc.cc +++ b/gold/reloc.cc @@ -64,7 +64,7 @@ Read_relocs::locks(Task_locker* tl) void Read_relocs::run(Workqueue* workqueue) { - Read_relocs_data *rd = new Read_relocs_data; + Read_relocs_data* rd = new Read_relocs_data; this->object_->read_relocs(rd); this->object_->set_relocs_data(rd); this->object_->release(); @@ -265,11 +265,11 @@ Sized_relobj<size, big_endian>::do_read_relocs(Read_relocs_data* rd) const Output_sections& out_sections(this->output_sections()); const std::vector<Address>& out_offsets(this->section_offsets_); - const unsigned char *pshdrs = this->get_view(this->elf_file_.shoff(), + const unsigned char* pshdrs = this->get_view(this->elf_file_.shoff(), shnum * This::shdr_size, true, true); // Skip the first, dummy, section. - const unsigned char *ps = pshdrs + This::shdr_size; + const unsigned char* ps = pshdrs + This::shdr_size; for (unsigned int i = 1; i < shnum; ++i, ps += This::shdr_size) { typename This::Shdr shdr(ps); diff --git a/gold/script-c.h b/gold/script-c.h index 1f79eacdd9..d1148e4d91 100644 --- a/gold/script-c.h +++ b/gold/script-c.h @@ -512,27 +512,27 @@ extern void script_register_vers_node(void* closure, const char* tag, int taglen, - struct Version_tree *, - struct Version_dependency_list *); + struct Version_tree*, + struct Version_dependency_list*); -extern struct Version_dependency_list * +extern struct Version_dependency_list* script_add_vers_depend(void* closure, - struct Version_dependency_list *existing_dependencies, - const char *depend_to_add, int deplen); + struct Version_dependency_list* existing_dependencies, + const char* depend_to_add, int deplen); -extern struct Version_expression_list * +extern struct Version_expression_list* script_new_vers_pattern(void* closure, - struct Version_expression_list *, - const char *, int, int); + struct Version_expression_list*, + const char*, int, int); -extern struct Version_expression_list * -script_merge_expressions(struct Version_expression_list *a, - struct Version_expression_list *b); +extern struct Version_expression_list* +script_merge_expressions(struct Version_expression_list* a, + struct Version_expression_list* b); -extern struct Version_tree * +extern struct Version_tree* script_new_vers_node(void* closure, - struct Version_expression_list *global, - struct Version_expression_list *local); + struct Version_expression_list* global, + struct Version_expression_list* local); extern void version_script_push_lang(void* closure, const char* lang, int langlen); diff --git a/gold/script-sections.cc b/gold/script-sections.cc index 978f84dbc2..f7ed68200e 100644 --- a/gold/script-sections.cc +++ b/gold/script-sections.cc @@ -1894,7 +1894,7 @@ Output_section_definition::output_section_name( const char* file_name, const char* section_name, Output_section*** slot, - Script_sections::Section_type *psection_type) + Script_sections::Section_type* psection_type) { // Ask each element whether it matches NAME. for (Output_section_elements::const_iterator p = this->elements_.begin(); @@ -2309,7 +2309,7 @@ Output_section_definition::section_type() const // Return the name of a script section type. const char* -Output_section_definition::script_section_type_name ( +Output_section_definition::script_section_type_name( Script_section_type script_section_type) { switch (script_section_type) @@ -2681,7 +2681,7 @@ void Script_sections::start_output_section( const char* name, size_t namelen, - const Parser_output_section_header *header) + const Parser_output_section_header* header) { Output_section_definition* posd = new Output_section_definition(name, namelen, @@ -2813,7 +2813,7 @@ Script_sections::output_section_name( const char* file_name, const char* section_name, Output_section*** output_section_slot, - Script_sections::Section_type *psection_type) + Script_sections::Section_type* psection_type) { for (Sections_elements::const_iterator p = this->sections_elements_->begin(); p != this->sections_elements_->end(); @@ -2945,7 +2945,7 @@ Script_sections::set_section_addresses(Symbol_table* symtab, Layout* layout) p != this->sections_elements_->end(); ++p) { - Output_section *os = (*p)->get_output_section(); + Output_section* os = (*p)->get_output_section(); if (os != NULL && (os->flags() & elfcpp::SHF_TLS) != 0) { if (first_tls == NULL) diff --git a/gold/script.cc b/gold/script.cc index d09781a80b..d5983f6e5f 100644 --- a/gold/script.cc +++ b/gold/script.cc @@ -700,7 +700,7 @@ Lex::gather_token(Token::Classification classification, const char* (Lex::*can_continue_fn)(const char*), const char* start, const char* match, - const char **pp) + const char** pp) { const char* new_match = NULL; while ((new_match = (this->*can_continue_fn)(match))) @@ -1883,12 +1883,12 @@ class Lazy_demangler private: // The symbol to demangle. - const char *symbol_; + const char* symbol_; // Option flags to pass to cplus_demagle. const int options_; // The cached demangled value, or NULL if demangling didn't happen yet or // failed. - char *demangled_; + char* demangled_; // Whether we already called cplus_demangle bool did_demangle_; }; @@ -2118,7 +2118,7 @@ void Version_script_info::add_exact_match(const std::string& match, const Version_tree* v, bool is_global, const Version_expression* ve, - Exact *pe) + Exact* pe) { std::pair<Exact::iterator, bool> ins = pe->insert(std::make_pair(match, Version_tree_match(v, is_global, ve))); @@ -2597,7 +2597,7 @@ script_add_file(void* closurev, const char* name, size_t length) { // In addition to checking the normal library search path, we // also want to check in the script-directory. - const char *slash = strrchr(closure->filename(), '/'); + const char* slash = strrchr(closure->filename(), '/'); if (slash != NULL) { script_directory.assign(closure->filename(), @@ -2702,7 +2702,7 @@ script_set_common_allocation(void* closurev, int set) // Called by the bison parser to refer to a symbol. extern "C" Expression* -script_symbol(void *closurev, const char* name, size_t length) +script_symbol(void* closurev, const char* name, size_t length) { Parser_closure* closure = static_cast<Parser_closure*>(closurev); if (length != 1 || name[0] != '.') @@ -2869,8 +2869,8 @@ extern "C" void script_register_vers_node(void*, const char* tag, int taglen, - struct Version_tree *tree, - struct Version_dependency_list *deps) + struct Version_tree* tree, + struct Version_dependency_list* deps) { gold_assert(tree != NULL); tree->dependencies = deps; @@ -2881,10 +2881,10 @@ script_register_vers_node(void*, // Add a dependencies to the list of existing dependencies, if any, // and return the expanded list. -extern "C" struct Version_dependency_list * +extern "C" struct Version_dependency_list* script_add_vers_depend(void* closurev, - struct Version_dependency_list *all_deps, - const char *depend_to_add, int deplen) + struct Version_dependency_list* all_deps, + const char* depend_to_add, int deplen) { Parser_closure* closure = static_cast<Parser_closure*>(closurev); if (all_deps == NULL) @@ -2895,10 +2895,10 @@ script_add_vers_depend(void* closurev, // Add a pattern expression to an existing list of expressions, if any. -extern "C" struct Version_expression_list * +extern "C" struct Version_expression_list* script_new_vers_pattern(void* closurev, - struct Version_expression_list *expressions, - const char *pattern, int patlen, int exact_match) + struct Version_expression_list* expressions, + const char* pattern, int patlen, int exact_match) { Parser_closure* closure = static_cast<Parser_closure*>(closurev); if (expressions == NULL) @@ -2913,8 +2913,8 @@ script_new_vers_pattern(void* closurev, // Attaches b to the end of a, and clears b. So a = a + b and b = {}. extern "C" struct Version_expression_list* -script_merge_expressions(struct Version_expression_list *a, - struct Version_expression_list *b) +script_merge_expressions(struct Version_expression_list* a, + struct Version_expression_list* b) { a->expressions.insert(a->expressions.end(), b->expressions.begin(), b->expressions.end()); @@ -2926,10 +2926,10 @@ script_merge_expressions(struct Version_expression_list *a, // Combine the global and local expressions into a a Version_tree. -extern "C" struct Version_tree * +extern "C" struct Version_tree* script_new_vers_node(void* closurev, - struct Version_expression_list *global, - struct Version_expression_list *local) + struct Version_expression_list* global, + struct Version_expression_list* local) { Parser_closure* closure = static_cast<Parser_closure*>(closurev); Version_tree* tree = closure->version_script()->allocate_version_tree(); diff --git a/gold/stringpool.cc b/gold/stringpool.cc index 4ddba8d6a7..434b2d6256 100644 --- a/gold/stringpool.cc +++ b/gold/stringpool.cc @@ -169,7 +169,7 @@ Stringpool_template<Stringpool_char>::add_string(const Stringpool_char* s, alc = sizeof(Stringdata) + buffer_size; else { - Stringdata *psd = this->strings_.front(); + Stringdata* psd = this->strings_.front(); if (len > psd->alc - psd->len) alc = sizeof(Stringdata) + buffer_size; else @@ -185,7 +185,7 @@ Stringpool_template<Stringpool_char>::add_string(const Stringpool_char* s, } } - Stringdata *psd = reinterpret_cast<Stringdata*>(new char[alc]); + Stringdata* psd = reinterpret_cast<Stringdata*>(new char[alc]); psd->alc = alc - sizeof(Stringdata); memcpy(psd->data, s, len - sizeof(Stringpool_char)); memset(psd->data + len - sizeof(Stringpool_char), 0, diff --git a/gold/symtab.cc b/gold/symtab.cc index 5a59f4c843..d8cda2d105 100644 --- a/gold/symtab.cc +++ b/gold/symtab.cc @@ -539,7 +539,7 @@ Symbol_table::gc_mark_undef_symbols(Layout* layout) { const char* name = p->c_str(); Symbol* sym = this->lookup(name); - gold_assert (sym != NULL); + gold_assert(sym != NULL); if (sym->source() == Symbol::FROM_OBJECT && !sym->object()->is_dynamic()) { @@ -602,7 +602,7 @@ Symbol_table::gc_mark_dyn_syms(Symbol* sym) if (sym->in_dyn() && sym->source() == Symbol::FROM_OBJECT && !sym->object()->is_dynamic()) { - Relobj *obj = static_cast<Relobj*>(sym->object()); + Relobj* obj = static_cast<Relobj*>(sym->object()); bool is_ordinary; unsigned int shndx = sym->shndx(&is_ordinary); if (is_ordinary && shndx != elfcpp::SHN_UNDEF) @@ -863,9 +863,9 @@ Symbol_table::define_default_version(Sized_symbol<size>* sym, template<int size, bool big_endian> Sized_symbol<size>* Symbol_table::add_from_object(Object* object, - const char *name, + const char* name, Stringpool::Key name_key, - const char *version, + const char* version, Stringpool::Key version_key, bool is_default_version, const elfcpp::Sym<size, big_endian>& sym, @@ -1053,7 +1053,7 @@ Symbol_table::add_from_relobj( const char* sym_names, size_t sym_name_size, typename Sized_relobj<size, big_endian>::Symbols* sympointers, - size_t *defined) + size_t* defined) { *defined = 0; @@ -1581,7 +1581,7 @@ Sized_symbol<size>* Symbol_table::define_special_symbol(const char** pname, const char** pversion, bool only_if_ref, Sized_symbol<size>** poldsym, - bool *resolve_oldsym) + bool* resolve_oldsym) { *resolve_oldsym = false; @@ -2324,7 +2324,7 @@ Symbol_table::set_dynsym_indexes(unsigned int index, off_t Symbol_table::finalize(off_t off, off_t dynoff, size_t dyn_global_index, size_t dyncount, Stringpool* pool, - unsigned int *plocal_symcount) + unsigned int* plocal_symcount) { off_t ret; @@ -2927,7 +2927,7 @@ Symbol_table::warn_about_undefined_dynobj_symbol(Symbol* sym) const // Write out a section symbol. Return the update offset. void -Symbol_table::write_section_symbol(const Output_section *os, +Symbol_table::write_section_symbol(const Output_section* os, Output_symtab_xindex* symtab_xindex, Output_file* of, off_t offset) const diff --git a/gold/symtab.h b/gold/symtab.h index b9e34852e4..e64fa1ac05 100644 --- a/gold/symtab.h +++ b/gold/symtab.h @@ -821,7 +821,7 @@ class Symbol // index rather than a special code. template<int size, bool big_endian> void - init_base_object(const char *name, const char* version, Object* object, + init_base_object(const char* name, const char* version, Object* object, const elfcpp::Sym<size, big_endian>&, unsigned int st_shndx, bool is_ordinary); @@ -1012,7 +1012,7 @@ class Sized_symbol : public Symbol // index rather than a special code. template<bool big_endian> void - init_object(const char *name, const char* version, Object* object, + init_object(const char* name, const char* version, Object* object, const elfcpp::Sym<size, big_endian>&, unsigned int st_shndx, bool is_ordinary); @@ -1467,7 +1467,7 @@ class Symbol_table // local symbols. off_t finalize(off_t off, off_t dynoff, size_t dyn_global_index, size_t dyncount, - Stringpool* pool, unsigned int *plocal_symcount); + Stringpool* pool, unsigned int* plocal_symcount); // Status code of Symbol_table::compute_final_value. enum Compute_final_value_status @@ -1566,8 +1566,8 @@ class Symbol_table // Add a symbol. template<int size, bool big_endian> Sized_symbol<size>* - add_from_object(Object*, const char *name, Stringpool::Key name_key, - const char *version, Stringpool::Key version_key, + add_from_object(Object*, const char* name, Stringpool::Key name_key, + const char* version, Stringpool::Key version_key, bool def, const elfcpp::Sym<size, big_endian>& sym, unsigned int st_shndx, bool is_ordinary, unsigned int orig_st_shndx); diff --git a/gold/target.cc b/gold/target.cc index 776c50afbc..185b67ccba 100644 --- a/gold/target.cc +++ b/gold/target.cc @@ -36,7 +36,7 @@ namespace gold // in _bfd_elf_is_local_label_name(). bool -Target::do_is_local_label_name (const char* name) const +Target::do_is_local_label_name(const char* name) const { // Normal local symbols start with ``.L''. if (name[0] == '.' && name[1] == 'L') diff --git a/gold/timer.cc b/gold/timer.cc index 29eaa5561a..bfccbd9cb7 100644 --- a/gold/timer.cc +++ b/gold/timer.cc @@ -44,7 +44,7 @@ Timer::Timer() // Start couting the time. void -Timer::start () +Timer::start() { this->get_time(&this->start_time_); } @@ -79,7 +79,7 @@ Timer_init timer_init; // Write the current time infortamion. void -Timer::get_time (TimeStats *now) +Timer::get_time(TimeStats *now) { #ifdef HAVE_TIMES tms t; @@ -95,7 +95,7 @@ Timer::get_time (TimeStats *now) // Return the stats since start was called. Timer::TimeStats -Timer::get_elapsed_time () +Timer::get_elapsed_time() { TimeStats now; this->get_time(&now); diff --git a/gold/timer.h b/gold/timer.h index ea360c2f21..1600948c2d 100644 --- a/gold/timer.h +++ b/gold/timer.h @@ -59,7 +59,7 @@ class Timer // Write the current time infortamion. static void - get_time(TimeStats *now); + get_time(TimeStats* now); // The time of the last call to start. TimeStats start_time_; diff --git a/gold/version.cc b/gold/version.cc index 31753f7e53..a4f5263f5f 100644 --- a/gold/version.cc +++ b/gold/version.cc @@ -63,8 +63,8 @@ print_version(bool print_short) if (!print_short) { // This output is intended to follow the GNU standards. - printf (_("Copyright 2010 Free Software Foundation, Inc.\n")); - printf (_("\ + printf(_("Copyright 2010 Free Software Foundation, Inc.\n")); + printf(_("\ This program is free software; you may redistribute it under the terms of\n\ the GNU General Public License version 3 or (at your option) a later version.\n\ This program has absolutely no warranty.\n")); diff --git a/gold/x86_64.cc b/gold/x86_64.cc index b137db3c2d..4fec45ce6b 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -692,7 +692,7 @@ const Target::Target_info Target_x86_64::x86_64_info = // we handle the SHF_X86_64_LARGE. void -Target_x86_64::do_new_output_section(Output_section *os) const +Target_x86_64::do_new_output_section(Output_section* os) const { if ((os->flags() & elfcpp::SHF_X86_64_LARGE) != 0) os->set_is_large_section(); @@ -2017,7 +2017,7 @@ Target_x86_64::Scan::global(Symbol_table* symtab, // the section has been created. target->got_section(symtab, layout); Output_data_got<64, false>* got = target->got_tlsdesc_section(); - Reloc_section *rt = target->rela_tlsdesc_section(layout); + Reloc_section* rt = target->rela_tlsdesc_section(layout); got->add_global_pair_with_rela(gsym, GOT_TYPE_TLS_DESC, rt, elfcpp::R_X86_64_TLSDESC, 0); } |