From 88667baf24e71481f0002c0452b94a1d53116725 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 25 Apr 2014 17:00:20 +0100 Subject: [PATCH] This fixes a compile time warning which is being treated as an error. Older versions of gcc complain about part of a conditional expression always evaluating to false because of the size of the operands involved, even when the entire expression is already known to be false. * peXXigen.c (_bfd_XXi_swap_sym_out): Another fix for building on a 342-bit host. This time for older versions of gcc. --- bfd/ChangeLog | 6 ++++++ bfd/peXXigen.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f22dc907f80..ccff4ced2b7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2014-04-25 Nick Clifton + + PR ld/16821 + * peXXigen.c (_bfd_XXi_swap_sym_out): Another fix for building on + a 342-bit host. This time for older versions of gcc. + 2014-04-24 Nick Clifton * peXXigen.c (rsrc_print_section): Fix compile time warning for diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index d462753c17e..dc45daf5732 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -236,7 +236,15 @@ _bfd_XXi_swap_sym_out (bfd * abfd, void * inp, void * extp) reduce the absolute value to < 1^32, and then transforming the symbol into a section relative symbol. This of course is a hack. */ if (sizeof (in->n_value) > 4 + /* GCC 4.6.x erroneously complains about the next test always being + false when compiled on a 32-bit host. (The sizeof test above + should have made the warning unnecessary). Hence we have to + predicate the test. It should not matter if the test is omitted + since the worst that can happen is that some absolute symbols + are needlessly converted to equivalent section relative symbols. */ +#if defined BFD64 || ! defined __GNUC__ || __GNUC__ > 4 || __GNUC_MINOR__ > 6 && in->n_value > ((1ULL << 32) - 1) +#endif && in->n_scnum == -1) { asection * sec; @@ -248,7 +256,7 @@ _bfd_XXi_swap_sym_out (bfd * abfd, void * inp, void * extp) in->n_scnum = sec->target_index; } /* else: FIXME: The value is outside the range of any section. This - happens for __image_base__ and __ImageBase__ and maybe some other + happens for __image_base__ and __ImageBase and maybe some other symbols as well. We should find a way to handle these values. */ } -- 2.30.2