From 0903fc77dc546e5911d9f854f996fd7f01c083ca Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Wed, 7 Dec 2016 23:34:55 +0100 Subject: various build fixes for Debian Stretch Signed-off-by: Wolfgang Wiedmeyer --- binutils-2.25/gas/config/tc-arm.c | 4 ---- binutils-2.25/gas/read.c | 2 +- binutils-2.25/gold/arm.cc | 35 ----------------------------------- binutils-2.25/gold/dirsearch.cc | 8 -------- binutils-2.25/gold/dwarf_reader.cc | 2 +- binutils-2.25/opcodes/arm-dis.c | 2 +- 6 files changed, 3 insertions(+), 50 deletions(-) diff --git a/binutils-2.25/gas/config/tc-arm.c b/binutils-2.25/gas/config/tc-arm.c index a3d0321b..b5130fc3 100644 --- a/binutils-2.25/gas/config/tc-arm.c +++ b/binutils-2.25/gas/config/tc-arm.c @@ -155,10 +155,7 @@ static const arm_feature_set *object_arch = NULL; /* Constants for known architecture features. */ static const arm_feature_set fpu_default = FPU_DEFAULT; -static const arm_feature_set fpu_arch_vfp_v1 = FPU_ARCH_VFP_V1; static const arm_feature_set fpu_arch_vfp_v2 = FPU_ARCH_VFP_V2; -static const arm_feature_set fpu_arch_vfp_v3 = FPU_ARCH_VFP_V3; -static const arm_feature_set fpu_arch_neon_v1 = FPU_ARCH_NEON_V1; static const arm_feature_set fpu_arch_fpa = FPU_ARCH_FPA; static const arm_feature_set fpu_any_hard = FPU_ANY_HARD; static const arm_feature_set fpu_arch_maverick = FPU_ARCH_MAVERICK; @@ -205,7 +202,6 @@ static const arm_feature_set arm_ext_adiv = ARM_FEATURE (ARM_EXT_ADIV, 0); static const arm_feature_set arm_ext_virt = ARM_FEATURE (ARM_EXT_VIRT, 0); static const arm_feature_set arm_arch_any = ARM_ANY; -static const arm_feature_set arm_arch_full = ARM_FEATURE (-1, -1); static const arm_feature_set arm_arch_t2 = ARM_ARCH_THUMB2; static const arm_feature_set arm_arch_none = ARM_ARCH_NONE; static const arm_feature_set arm_arch_v6m_only = ARM_ARCH_V6M_ONLY; diff --git a/binutils-2.25/gas/read.c b/binutils-2.25/gas/read.c index 29b0456d..5cab1f27 100644 --- a/binutils-2.25/gas/read.c +++ b/binutils-2.25/gas/read.c @@ -5063,7 +5063,7 @@ output_big_sleb128 (char *p, LITTLENUM_TYPE *bignum, int size) { /* Sign-extend VAL. */ if (val & (1 << (loaded - 1))) - val |= ~0 << loaded; + val |= ~0u << loaded; if (orig) *p = val & 0x7f; p++; diff --git a/binutils-2.25/gold/arm.cc b/binutils-2.25/gold/arm.cc index 94149d61..4879acbd 100644 --- a/binutils-2.25/gold/arm.cc +++ b/binutils-2.25/gold/arm.cc @@ -4497,41 +4497,6 @@ Stub::do_fixed_endian_write(unsigned char* view, section_size_type view_size) gold_assert(static_cast(pov - view) == view_size); } -// Reloc_stub::Key methods. - -// Dump a Key as a string for debugging. - -std::string -Reloc_stub::Key::name() const -{ - if (this->r_sym_ == invalid_index) - { - // Global symbol key name - // ::. - const std::string sym_name = this->u_.symbol->name(); - // We need to print two hex number and two colons. So just add 100 bytes - // to the symbol name size. - size_t len = sym_name.size() + 100; - char* buffer = new char[len]; - int c = snprintf(buffer, len, "%d:%s:%x", this->stub_type_, - sym_name.c_str(), this->addend_); - gold_assert(c > 0 && c < static_cast(len)); - delete[] buffer; - return std::string(buffer); - } - else - { - // local symbol key name - // :::. - const size_t len = 200; - char buffer[len]; - int c = snprintf(buffer, len, "%d:%p:%u:%x", this->stub_type_, - this->u_.relobj, this->r_sym_, this->addend_); - gold_assert(c > 0 && c < static_cast(len)); - return std::string(buffer); - } -} - // Reloc_stub methods. // Determine the type of stub needed, if any, for a relocation of R_TYPE at diff --git a/binutils-2.25/gold/dirsearch.cc b/binutils-2.25/gold/dirsearch.cc index e9e2fa12..bf25fe67 100644 --- a/binutils-2.25/gold/dirsearch.cc +++ b/binutils-2.25/gold/dirsearch.cc @@ -122,14 +122,6 @@ class Dir_caches Cache_hash caches_; }; -Dir_caches::~Dir_caches() -{ - for (Cache_hash::iterator p = this->caches_.begin(); - p != this->caches_.end(); - ++p) - delete p->second; -} - void Dir_caches::add(const char* dirname) { diff --git a/binutils-2.25/gold/dwarf_reader.cc b/binutils-2.25/gold/dwarf_reader.cc index f5ca7cd7..dd5635c0 100644 --- a/binutils-2.25/gold/dwarf_reader.cc +++ b/binutils-2.25/gold/dwarf_reader.cc @@ -1961,7 +1961,7 @@ Sized_dwarf_line_info::read_header_tables_v5( } gold_debug(DEBUG_LOCATION, "File %3d: %s", static_cast(file_list.size()), path); - file_list.push_back(std::make_pair(dirindex, path)); + file_list.push_back(std::make_pair(int(dirindex), path)); } delete[] types; diff --git a/binutils-2.25/opcodes/arm-dis.c b/binutils-2.25/opcodes/arm-dis.c index 8f399fbf..0f88149c 100644 --- a/binutils-2.25/opcodes/arm-dis.c +++ b/binutils-2.25/opcodes/arm-dis.c @@ -2105,7 +2105,7 @@ print_insn_coprocessor (bfd_vma pc, /* Is ``imm'' a negative number? */ if (imm & 0x40) - imm |= (-1 << 7); + imm |= (-1u << 7); func (stream, "%d", imm); } -- cgit v1.2.3