This commit was manufactured by cvs2svn to create branch 'gdb_7_0-branch'.

[external/binutils.git] / bfd / vms.c

diff --git a/bfd/vms.c b/bfd/vms.c
index 8111d49..61f485e 100644 (file)
--- a/bfd/vms.c
+++ b/bfd/vms.c
@@ -24,6 +24,7 @@
 
 #ifdef VMS
 #include <rms.h>
+#include <unixlib.h>
 #include <starlet.h>
 #define RME$C_SETRFM 0x00000001
 #include <unistd.h>
@@ -129,9 +130,7 @@ static bfd_boolean vms_bfd_final_link (bfd *abfd,
                                       struct bfd_link_info *link_info);
 static bfd_boolean vms_bfd_link_split_section (bfd *abfd, asection *section);
 static long vms_get_dynamic_symtab_upper_bound (bfd *abfd);
-static long vms_canonicalize_dynamic_symtab
-  (bfd *abfd, asymbol **symbols);
-#define vms_get_synthetic_symtab _bfd_nodynamic_get_synthetic_symtab
+static long vms_canonicalize_dynamic_symtab (bfd *abfd, asymbol **symbols);
 static long vms_get_dynamic_reloc_upper_bound (bfd *abfd);
 static long vms_canonicalize_dynamic_reloc
   (bfd *abfd, arelent **arel, asymbol **symbols);
@@ -144,6 +143,7 @@ static bfd_boolean vms_bfd_set_private_flags (bfd *abfd, flagword flags);
 #define vms_bfd_is_group_section          bfd_generic_is_group_section
 #define vms_bfd_discard_group             bfd_generic_discard_group
 #define vms_section_already_linked        _bfd_generic_section_already_linked
+#define vms_bfd_define_common_symbol      bfd_generic_define_common_symbol
 #define vms_bfd_copy_private_header_data  _bfd_generic_bfd_copy_private_header_data
 #define vms_get_synthetic_symtab          _bfd_nodynamic_get_synthetic_symtab
 
@@ -1913,6 +1913,10 @@ vms_bfd_relax_section (bfd * abfd ATTRIBUTE_UNUSED,
                       struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
                       bfd_boolean *again ATTRIBUTE_UNUSED)
 {
+  if (link_info->relocatable)
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
 #if VMS_DEBUG
   vms_debug (1, "vms_bfd_relax_section (%p, %s, %p, <ret>)\n",
             abfd, section->name, link_info);