The removal of sdata support also removed the only use of SYMBOL_REF_FLAG

in the m88k backend; as a result, SHORT_ADDRESS_P() will always return 0,
therefore remove all code depending on it being nonzero.

2 files changed, 3 insertions, 18 deletions

diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/m88k.c b/gnu/usr.bin/gcc/gcc/config/m88k/m88k.c
index 7701a393baf..7646c7fe2bf 100644
--- a/gnu/usr.bin/gcc/gcc/config/m88k/m88k.c
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/m88k.c
@@ -418,7 +418,7 @@ legitimize_address (pic, orig, reg, scratch)
 	  /* Should we set special REG_NOTEs here?  */
 	}
     }
-  else if (! SHORT_ADDRESS_P (addr, temp))
+  else
     {
       if (reg == 0)
 	{
@@ -433,8 +433,7 @@ legitimize_address (pic, orig, reg, scratch)
       new = gen_rtx_LO_SUM (SImode, reg, addr);
     }
 
-  if (new != orig
-      && GET_CODE (orig) == MEM)
+  if (GET_CODE (orig) == MEM)
     {
       new = gen_rtx_MEM (GET_MODE (orig), new);
       MEM_COPY_ATTRIBUTES (new, orig);
@@ -3230,14 +3229,7 @@ print_operand_address (file, addr)
 
     default:
       fprintf (file, "%s,", reg_names[0]);
-      if (SHORT_ADDRESS_P (addr, temp))
-	{
-	  fprintf (file, "%siw16(", m88k_pound_sign);
-	  output_addr_const (file, addr);
-	  fputc (')', file);
-	}
-      else
-	  output_addr_const (file, addr);
+      output_addr_const (file, addr);
     }
 }
 
diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/m88k.h b/gnu/usr.bin/gcc/gcc/config/m88k/m88k.h
index 9e8b56b56bf..11052f8496f 100644
--- a/gnu/usr.bin/gcc/gcc/config/m88k/m88k.h
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/m88k.h
@@ -1106,11 +1106,6 @@ enum reg_class { NO_REGS, AP_REG, XRF_REGS, GENERAL_REGS, AGRF_REGS,
    && (GET_CODE (XEXP (ADDR, 0)) == MULT	\
        || GET_CODE (XEXP (ADDR, 1)) == MULT))
 
-/* Can the reference to X be made short?  */
-#define SHORT_ADDRESS_P(X,TEMP) \
-  ((TEMP) = (GET_CODE (X) == CONST ? get_related_value (X) : X), \
-   ((TEMP) && GET_CODE (TEMP) == SYMBOL_REF && SYMBOL_REF_FLAG (TEMP)))
-
 /* GO_IF_LEGITIMATE_ADDRESS recognizes an RTL expression
    that is a valid memory address for an instruction.
    The MODE argument is the machine mode for the MEM expression
@@ -1180,8 +1175,6 @@ enum reg_class { NO_REGS, AP_REG, XRF_REGS, GENERAL_REGS, AGRF_REGS,
   else if (GET_CODE (X) == CONST_INT			\
 	   && SMALL_INT (X))				\
     goto ADDR;						\
-  else if (SHORT_ADDRESS_P (X, _x))			\
-    goto ADDR;						\
 }
 
 /* The macros REG_OK_FOR..._P assume that the arg is a REG rtx