* alpha-opc.c: Remove ARGSUSED.

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

diff --git a/gas/config/tc-vax.c b/gas/config/tc-vax.c
index a2bae67495799856684920bfb11f827d03e46ad4..4d44302f7c8315ef3793763fb59b056d0c4917f0 100644 (file)
--- a/gas/config/tc-vax.c
+++ b/gas/config/tc-vax.c
@@ -1244,12 +1244,11 @@ md_estimate_size_before_relax (fragP, segment)
          old_fr_fix = fragP->fr_fix;
          p = fragP->fr_literal + old_fr_fix;
 #ifdef OBJ_ELF
-         /*
-          * If this is to undefined symbol, then if it's an indirect
-          * reference indicate that is can mutated into a GLOB_DAT
-          * by the loader.  We restrict ourselves to no offset due to
-          * a limitation in the NetBSD linker.
-          */
+         /* If this is to an undefined symbol, then if it's an indirect
+            reference indicate that is can mutated into a GLOB_DAT or
+            JUMP_SLOT by the loader.  We restrict ourselves to no offset
+            due to a limitation in the NetBSD linker.  */
+
          if (GOT_symbol == NULL)
            GOT_symbol = symbol_find (GLOBAL_OFFSET_TABLE_NAME);
          if (PLT_symbol == NULL)
@@ -1257,6 +1256,7 @@ md_estimate_size_before_relax (fragP, segment)
          if ((GOT_symbol == NULL || fragP->fr_symbol != GOT_symbol)
              && (PLT_symbol == NULL || fragP->fr_symbol != PLT_symbol)
              && fragP->fr_symbol != NULL
+             && flag_want_pic
              && (!S_IS_DEFINED (fragP->fr_symbol)
                  || S_IS_WEAK (fragP->fr_symbol)
                  || S_IS_EXTERNAL (fragP->fr_symbol)))
@@ -1269,7 +1269,6 @@ md_estimate_size_before_relax (fragP, segment)
                }
              else
                {
-       
                  if (((unsigned char *) fragP->fr_opcode)[0] == VAX_CALLS
                      || ((unsigned char *) fragP->fr_opcode)[0] == VAX_CALLG
                      || ((unsigned char *) fragP->fr_opcode)[0] == VAX_JSB
@@ -1913,7 +1912,7 @@ vip (vitP, instring)
          /*
           * We found a match! So let's pick up as many operands as the
           * instruction wants, and even gripe if there are too many.
-          * We expect comma to seperate each operand.
+          * We expect comma to separate each operand.
           * We let instring track the text, while p tracks a part of the
           * struct vot.
           */
@@ -2202,7 +2201,7 @@ vax_reg_parse (c1, c2, c3, c4)    /* 3 chars of register name */
  * There were a number of 'mismatched argument type' bugs to vip_op.
  * The most general solution is to typedef each (of many) arguments.
  * We used instead a typedef'd argument block. This is less modular
- * than using seperate return pointers for each result, but runs faster
+ * than using separate return pointers for each result, but runs faster
  * on most engines, and seems to keep programmers happy. It will have
  * to be done properly if we ever want to use vip_op as a general-purpose
  * module (it was designed to be).
@@ -2386,7 +2385,7 @@ vip_op_defaults (immediate, indirect, displen)
  * We don't limit your choice of width character.
  *
  * DEC operands are hard work to parse. For example, '@' as the first
- * character means indirect (deferred) mode but elswhere it is a shift
+ * character means indirect (deferred) mode but elsewhere it is a shift
  * operator.
  * The long-winded explanation of how this is supposed to work is
  * cancelled. Read a DEC vax manual.
@@ -2610,7 +2609,7 @@ vip_op (optext, vopP)
               */
              if (reg < 0)
                {
-                 /* JF allow parenthasized expressions.  I hope this works */
+                 /* JF allow parenthesized expressions.  I hope this works */
                  paren = 0;
                  while (*q != ')')
                    q++;
@@ -2962,7 +2961,7 @@ vip_op (optext, vopP)
    */
 \f
   /*
-   * Case of Rn. We seperate this one because it has a few special
+   * Case of Rn. We separate this one because it has a few special
    * errors the remaining modes lack.
    *
    * in:  at       optional
@@ -3257,12 +3256,16 @@ md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
 \f
 #ifdef OBJ_VMS
 const char *md_shortopts = "d:STt:V+1h:Hv::";
-#elif defined(OBJ_ELC)
+#elif defined(OBJ_ELF)
 const char *md_shortopts = "d:STt:VkK";
 #else
 const char *md_shortopts = "d:STt:V";
 #endif
 struct option md_longopts[] = {
+#ifdef OBJ_ELF
+#define OPTION_PIC (OPTION_MD_BASE)
+  {"pic", no_argument, NULL, OPTION_PIC},
+#endif
   {NULL, no_argument, NULL, 0}
 };
 size_t md_longopts_size = sizeof (md_longopts);
@@ -3326,7 +3329,7 @@ md_parse_option (c, arg)
 #endif
 
 #ifdef OBJ_ELF
-    case 'K':
+    case OPTION_PIC:
     case 'k':
       flag_want_pic = 1;
       break;                   /* -pic, Position Independent Code */