* tc.h (struct relax_type, relax_typeS): Move from here..

[deliverable/binutils-gdb.git] / gas / config / tc-vax.c

diff --git a/gas/config/tc-vax.c b/gas/config/tc-vax.c
index 4d44302f7c8315ef3793763fb59b056d0c4917f0..4cf9e15d9804a46c1641688fbaa2d8cbee57cfe1 100644 (file)
--- a/gas/config/tc-vax.c
+++ b/gas/config/tc-vax.c
@@ -1,5 +1,6 @@
 /* tc-vax.c - vax-specific -
-   Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1998, 2000, 2001, 2002
+   Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1998, 2000, 2001, 2002,
+   2003, 2004, 2005
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -29,6 +30,10 @@
 #include "elf/vax.h"
 #endif
 
+#if defined (OBJ_AOUT) && !defined (BFD_ASSEMBLER) && defined (TE_NetBSD)
+#include <netinet/in.h>
+#endif
+
 /* These chars start a comment anywhere in a source file (except inside
    another comment */
 const char comment_chars[] = "#";
@@ -3214,8 +3219,8 @@ mumble (text, value)
 
 /* end: vip_op.c */
 
-const int md_short_jump_size = 3;
-const int md_long_jump_size = 6;
+int md_short_jump_size = 3;
+int md_long_jump_size = 6;
 const int md_reloc_size = 8;   /* Size of relocation record */
 
 void
@@ -3257,7 +3262,7 @@ md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
 #ifdef OBJ_VMS
 const char *md_shortopts = "d:STt:V+1h:Hv::";
 #elif defined(OBJ_ELF)
-const char *md_shortopts = "d:STt:VkK";
+const char *md_shortopts = "d:STt:VkKQ:";
 #else
 const char *md_shortopts = "d:STt:V";
 #endif
@@ -3333,6 +3338,11 @@ md_parse_option (c, arg)
     case 'k':
       flag_want_pic = 1;
       break;                   /* -pic, Position Independent Code */
+
+     /* -Qy, -Qn: SVR4 arguments controlling whether a .comment
+       section should be emitted or not.  FIXME: Not implemented.  */
+    case 'Q':
+      break;
 #endif
 
     default:
@@ -3402,7 +3412,7 @@ tc_headers_hook(headers)
 {
 #ifdef TE_NetBSD
   N_SET_INFO(headers->header, OMAGIC, M_VAX4K_NETBSD, 0);
-  headers->header.a_info = htonl(headers->header.a_info);
+  headers->header.a_info = htonl (headers->header.a_info);
 #endif
 }
 #endif /* !BFD_ASSEMBLER */