bfd

[deliverable/binutils-gdb.git] / bfd / elf32-frv.c

diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
index aad8253bbc1e1c0c9a4d838b8581e3ecd9079952..a0bee3ade310e94fc41e462d5bf602691d33be5e 100644 (file)
--- a/bfd/elf32-frv.c
+++ b/bfd/elf32-frv.c
@@ -1,5 +1,5 @@
 /* FRV-specific support for 32-bit ELF.
 /* FRV-specific support for 32-bit ELF.

-   Copyright 2002, 2003, 2004, 2005, 2006, 2007
+   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008

    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -24,7 +24,7 @@
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/frv.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/frv.h"

-#include "elf/dwarf2.h"
+#include "dwarf2.h"

 #include "hashtab.h"
 
 /* Forward declarations.  */
 #include "hashtab.h"
 
 /* Forward declarations.  */


@@ -5738,6 +5738,10 @@ elf32_frvfdpic_relax_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
 {
   struct _frvfdpic_dynamic_got_plt_info gpinfo;
 
 {
   struct _frvfdpic_dynamic_got_plt_info gpinfo;
 

+  if (info->relocatable)
+    (*info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+

   /* If we return early, we didn't change anything.  */
   *again = FALSE;
 
   /* If we return early, we didn't change anything.  */
   *again = FALSE;
 


@@ -6838,7 +6842,7 @@ frv_elf_print_private_bfd_data (abfd, ptr)
   _bfd_elf_print_private_bfd_data (abfd, ptr);
 
   flags = elf_elfheader (abfd)->e_flags;
   _bfd_elf_print_private_bfd_data (abfd, ptr);
 
   flags = elf_elfheader (abfd)->e_flags;

-  fprintf (file, _("private flags = 0x%lx:"), (long)flags);
+  fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags);

 
   switch (flags & EF_FRV_CPU_MASK)
     {
 
   switch (flags & EF_FRV_CPU_MASK)
     {