summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog15
-rw-r--r--bfd/elf.c5
-rw-r--r--bfd/elf32-rx.c4
-rw-r--r--bfd/elf32-xtensa.c2
-rw-r--r--bfd/elflink.c10
-rw-r--r--cpu/ChangeLog4
-rw-r--r--cpu/frv.opc3
-rw-r--r--opcodes/ChangeLog9
-rw-r--r--opcodes/frv-opc.c3
-rw-r--r--opcodes/or32-dis.c20
-rw-r--r--opcodes/or32-opc.c6
11 files changed, 57 insertions, 24 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c21a0f932e1..39a5c98e003 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,18 @@
+2010-10-08 Pierre Muller <muller@ics.u-strasbg.fr>
+ Alan Modra <amodra@gmail.com>
+
+ Fix build with -DDEBUG=7
+ * elf.c (_bfd_elf_symbol_from_bfd_symbol): Remove call
+ to deleted function elf_symbol_flags. Add typecast to avoid warning.
+ * elf32-rx.c (dump_symbol) : Rename to..
+ (rx_dump_symbol): ..this to avoid link errors.
+ * elflink.c (elf_link_input_bfd): Add typecast to avoid warnings.
+ (bfd_elf_perform_complex_relocation): Likewise.
+ * elf32-xtensa.c (print_action_list): Likewise.
+
2010-10-06 Nathan Sidwell <nathan@codesourcery.com>
- * elf32-arm.c (elf32_arm_stub_long_branch_any_arm_pic,
+ * elf32-arm.c (elf32_arm_stub_long_branch_any_arm_pic,
elf32_arm_stub_long_branch_any_arm_pic): Use a consistent name for
ip/r12.
(arm_type_of_stub): Remove superfluous braces.
@@ -240,7 +252,6 @@
2010-09-09 Bernd Schmidt <bernds@codesourcery.com>
- bfd/
* elflink.c (bfd_elf_final_link): Correct calculation of
max_external_reloc_size.
diff --git a/bfd/elf.c b/bfd/elf.c
index 85d4c18eea3..4df0007725a 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -5217,9 +5217,8 @@ _bfd_elf_symbol_from_bfd_symbol (bfd *abfd, asymbol **asym_ptr_ptr)
#if DEBUG & 4
{
fprintf (stderr,
- "elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = 0x%.8lx%s\n",
- (long) asym_ptr, asym_ptr->name, idx, flags,
- elf_symbol_flags (flags));
+ "elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = 0x%.8lx\n",
+ (long) asym_ptr, asym_ptr->name, idx, (long) flags);
fflush (stderr);
}
#endif
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 7d9dbc125f7..4b31a35a778 100644
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -29,7 +29,7 @@
#ifdef DEBUG
char * rx_get_reloc (long);
-void dump_symtab (bfd *, void *, void *);
+void rx_dump_symtab (bfd *, void *, void *);
#endif
#define RXREL(n,sz,bit,shift,complain,pcrel) \
@@ -2962,7 +2962,7 @@ rx_elf_object_p (bfd * abfd)
#ifdef DEBUG
void
-dump_symtab (bfd * abfd, void * internal_syms, void * external_syms)
+rx_dump_symtab (bfd * abfd, void * internal_syms, void * external_syms)
{
size_t locsymcount;
Elf_Internal_Sym * isymbuf;
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index f9ecde5fa80..6cd396a6bcb 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -5710,7 +5710,7 @@ print_action_list (FILE *fp, text_action_list *action_list)
fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
r->sec->owner->filename,
- r->sec->name, r->offset, t, r->removed_bytes);
+ r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
}
}
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 2c4564963b6..cda897ebd87 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -7884,7 +7884,8 @@ bfd_elf_perform_complex_relocation (bfd *input_bfd,
"chunksz %ld, start %ld, len %ld, oplen %ld\n"
" dest: %8.8lx, mask: %8.8lx, reloc: %8.8lx\n",
lsb0_p, signed_p, trunc_p, wordsz, chunksz, start, len,
- oplen, x, mask, relocation);
+ oplen, (unsigned long) x, (unsigned long) mask,
+ (unsigned long) relocation);
#endif
r = bfd_reloc_ok;
@@ -7904,8 +7905,8 @@ bfd_elf_perform_complex_relocation (bfd *input_bfd,
" shifted mask: %8.8lx\n"
" shifted/masked reloc: %8.8lx\n"
" result: %8.8lx\n",
- relocation, (mask << shift),
- ((relocation & mask) << shift), x);
+ (unsigned long) relocation, (unsigned long) (mask << shift),
+ (unsigned long) ((relocation & mask) << shift), (unsigned long) x);
#endif
/* FIXME: octets_per_byte. */
put_value (wordsz, chunksz, input_bfd, x, contents + rel->r_offset);
@@ -9464,7 +9465,8 @@ elf_link_input_bfd (struct elf_final_link_info *finfo, bfd *input_bfd)
#ifdef DEBUG
printf ("Encountered a complex symbol!");
printf (" (input_bfd %s, section %s, reloc %ld\n",
- input_bfd->filename, o->name, rel - internal_relocs);
+ input_bfd->filename, o->name,
+ (long) (rel - internal_relocs));
printf (" symbol: idx %8.8lx, name %s\n",
r_symndx, sym_name);
printf (" reloc : info %8.8lx, addr %8.8lx\n",
diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index 667538ac292..459e07aa633 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-08 Pierre Muller <muller@ics.u-strasbg.fr>
+
+ * frv.opc: #undef DEBUG.
+
2010-07-03 DJ Delorie <dj@delorie.com>
* m32c.cpu (f-dsp-8-s24): Mask high byte after shifting it.
diff --git a/cpu/frv.opc b/cpu/frv.opc
index 3dfadb3b9ba..f81cef0d608 100644
--- a/cpu/frv.opc
+++ b/cpu/frv.opc
@@ -81,6 +81,9 @@ int spr_valid (long);
#include "elf/frv.h"
#include <stdio.h>
+/* DEBUG appears below as argument of OP macro. */
+#undef DEBUG
+
/* Returns TRUE if {MAJOR,MACH} is a major branch of the FRV
development tree. */
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index fe700ede477..b8535afb8ee 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-08 Pierre Muller <muller@ics.u-strasbg.fr>
+
+ Fix build with -DDEBUG=7
+ * frv-opc.c: Regenerate.
+ * or32-dis.c (DEBUG): Don't redefine.
+ (find_bytes_big, or32_extract, or32_opcode_match, or32_print_register):
+ Adapt DEBUG code to some type changes throughout.
+ * or32-opc.c (or32_extract): Likewise.
+
2010-10-07 Bernd Schmidt <bernds@codesourcery.com>
* tic6x-dis.c (print_insn_tic6x): Correct decoding of fstg field
diff --git a/opcodes/frv-opc.c b/opcodes/frv-opc.c
index 3d0d1e0ff83..e7107a8ba2a 100644
--- a/opcodes/frv-opc.c
+++ b/opcodes/frv-opc.c
@@ -34,6 +34,9 @@ This file is part of the GNU Binutils and/or GDB, the GNU debugger.
#include "elf/frv.h"
#include <stdio.h>
+/* DEBUG appears below as argument of OP macro. */
+#undef DEBUG
+
/* Returns TRUE if {MAJOR,MACH} is a major branch of the FRV
development tree. */
diff --git a/opcodes/or32-dis.c b/opcodes/or32-dis.c
index d639fb34aa2..a0dc92a731e 100644
--- a/opcodes/or32-dis.c
+++ b/opcodes/or32-dis.c
@@ -20,7 +20,9 @@
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
MA 02110-1301, USA. */
+#ifndef DEBUG
#define DEBUG 0
+#endif
#include "dis-asm.h"
#include "opcode/or32.h"
@@ -41,7 +43,7 @@ find_bytes_big (unsigned char *insn_ch, unsigned long *insn)
((unsigned long) insn_ch[2] << 8) +
((unsigned long) insn_ch[3]);
#if DEBUG
- printf ("find_bytes_big3: %x\n", *insn);
+ printf ("find_bytes_big3: %lx\n", *insn);
#endif
}
@@ -88,7 +90,7 @@ or32_extract (char param_ch, char *enc_initial, unsigned long insn)
{
unsigned long tmp = strtoul (enc, NULL, 16);
#if DEBUG
- printf (" enc=%s, tmp=%x ", enc, tmp);
+ printf (" enc=%s, tmp=%lx ", enc, tmp);
#endif
if (param_ch == '0')
tmp = 15 - tmp;
@@ -108,7 +110,7 @@ or32_extract (char param_ch, char *enc_initial, unsigned long insn)
opc_pos--;
param_pos--;
#if DEBUG
- printf ("\n ret=%x opc_pos=%x, param_pos=%x\n", ret, opc_pos, param_pos);
+ printf ("\n ret=%lx opc_pos=%x, param_pos=%x\n", ret, opc_pos, param_pos);
#endif
ret += ((insn >> opc_pos) & 0x1) << param_pos;
@@ -117,12 +119,12 @@ or32_extract (char param_ch, char *enc_initial, unsigned long insn)
&& ret >> (letter_range (param_ch) - 1))
{
#if DEBUG
- printf ("\n ret=%x opc_pos=%x, param_pos=%x\n",
+ printf ("\n ret=%lx opc_pos=%x, param_pos=%x\n",
ret, opc_pos, param_pos);
#endif
ret |= 0xffffffff << letter_range(param_ch);
#if DEBUG
- printf ("\n after conversion to signed: ret=%x\n", ret);
+ printf ("\n after conversion to signed: ret=%lx\n", ret);
#endif
}
enc++;
@@ -141,7 +143,7 @@ or32_extract (char param_ch, char *enc_initial, unsigned long insn)
enc++;
#if DEBUG
- printf ("ret=%x\n", ret);
+ printf ("ret=%lx\n", ret);
#endif
return ret;
}
@@ -158,8 +160,8 @@ or32_opcode_match (unsigned long insn, char *encoding)
zeros = or32_extract ('0', encoding, insn);
#if DEBUG
- printf ("ones: %x \n", ones);
- printf ("zeros: %x \n", zeros);
+ printf ("ones: %lx \n", ones);
+ printf ("zeros: %lx \n", zeros);
#endif
if ((insn & ones) != ones)
{
@@ -194,7 +196,7 @@ or32_print_register (char param_ch,
int regnum = or32_extract (param_ch, encoding, insn);
#if DEBUG
- printf ("or32_print_register: %c, %s, %x\n", param_ch, encoding, insn);
+ printf ("or32_print_register: %c, %s, %lx\n", param_ch, encoding, insn);
#endif
if (param_ch == 'A')
(*info->fprintf_func) (info->stream, "r%d", regnum);
diff --git a/opcodes/or32-opc.c b/opcodes/or32-opc.c
index ff624e7a8c0..94a1ace82d6 100644
--- a/opcodes/or32-opc.c
+++ b/opcodes/or32-opc.c
@@ -898,7 +898,7 @@ or32_extract (char param_ch, char *enc_initial, unsigned long insn)
{
unsigned long tmp = strtol (enc, NULL, 16);
#if DEBUG
- printf (" enc=%s, tmp=%x ", enc, tmp);
+ printf (" enc=%s, tmp=%lx ", enc, tmp);
#endif
if (param_ch == '0')
tmp = 15 - tmp;
@@ -918,7 +918,7 @@ or32_extract (char param_ch, char *enc_initial, unsigned long insn)
opc_pos--;
param_pos--;
#if DEBUG
- printf ("\n ret=%x opc_pos=%x, param_pos=%x\n", ret, opc_pos, param_pos);
+ printf ("\n ret=%lx opc_pos=%x, param_pos=%x\n", ret, opc_pos, param_pos);
#endif
if (ISLOWER (param_ch))
ret -= ((insn >> opc_pos) & 0x1) << param_pos;
@@ -940,7 +940,7 @@ or32_extract (char param_ch, char *enc_initial, unsigned long insn)
enc++;
#if DEBUG
- printf ("ret=%x\n", ret);
+ printf ("ret=%lx\n", ret);
#endif
return ret;
}
View Lorry Controller Status