diff options
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/gold-threads.h | 4 | ||||
| -rw-r--r-- | gold/icf.cc | 9 |
3 files changed, 18 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index c9e6005..056a506 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,10 @@ +2010-02-22 Doug Kwan <dougkwan@google.com> + + * gold-threads.h (Once::~Once): Explicitly define virtual destructor. + * icf.cc (get_section_contents): Cast snprintf arguments to long long + types to avoid warnings due to different uint64_t implementations + on different hosts. + 2010-02-21 Doug Kwan <dougkwan@google.com> * arm.cc (Arm_relocate_functions::arm_branch_common): Fix bug in diff --git a/gold/gold-threads.h b/gold/gold-threads.h index 78a87b2..622bf32 100644 --- a/gold/gold-threads.h +++ b/gold/gold-threads.h @@ -200,6 +200,10 @@ class Once public: Once(); + virtual + ~Once() + { } + // Call this function to do whatever it is. We pass an argument // even though you have to use a child class because in some uses // setting the argument would itself require a Once class. diff --git a/gold/icf.cc b/gold/icf.cc index 752aa55..ff2058c 100644 --- a/gold/icf.cc +++ b/gold/icf.cc @@ -278,8 +278,13 @@ get_section_contents(bool first_iteration, // where first is the symbol value and second is the // addend. char addend_str[50]; - snprintf(addend_str, sizeof(addend_str), "%llx %llx %lux", - (*it_a).first, (*it_a).second, (*it_o)); + + // It would be nice if we could use format macros in inttypes.h + // here but there are not in ISO/IEC C++ 1998. + snprintf(addend_str, sizeof(addend_str), "%llx %llx %llux", + static_cast<long long>((*it_a).first), + static_cast<long long>((*it_a).second), + static_cast<unsigned long long>(*it_o)); Section_id reloc_secn(it_v->first, it_v->second); // If this reloc turns back and points to the same section, |