Ensure local labels are marked as local, so that GOT/GOTOFF happens.

2001-09-12 22:12:54 +00:00 · 2001-09-12 22:12:54 +00:00 · d7cb30421a
commit d7cb30421a
parent 362d12454c
1 changed files with 122 additions and 0 deletions
--- a/lang/egcs/stable/patches/patch-gcc_config_i386_i386_c
+++ b/lang/egcs/stable/patches/patch-gcc_config_i386_i386_c
@ -0,0 +1,122 @@
+$OpenBSD: patch-gcc_config_i386_i386_c,v 1.1 2001/09/12 22:12:54 espie Exp $
+--- gcc/config/i386/i386.c.orig	Mon Aug  6 23:26:24 2001
+++ gcc/config/i386/i386.c	Wed Sep 12 20:38:45 2001
+@@ -417,7 +417,12 @@ int ix86_align_loops;
+ 
+ /* Power of two alignment for non-loop jumps.  */
+ int ix86_align_jumps;
+
+/* Prefix built by ASM_GENERATE_INTERNAL_LABEL.  */
+static char internal_label_prefix[16];
+static int internal_label_prefix_len;
+ 
+static int local_symbolic_operand PARAMS ((rtx, enum machine_mode));
+ static void output_pic_addr_const PARAMS ((FILE *, rtx, int));
+ static void put_condition_code PARAMS ((enum rtx_code, enum machine_mode,
+ 				       int, int, FILE *));
+@@ -693,6 +698,15 @@ override_options ()
+      on by -msse.  */
+   if (TARGET_SSE)
+     target_flags |= MASK_MMX;
+
+  /* Figure out what ASM_GENERATE_INTERNAL_LABEL builds as a prefix.  */
+  {
+    char *p;
+    ASM_GENERATE_INTERNAL_LABEL (internal_label_prefix, "LX", 0);
+    p = strchr (internal_label_prefix, 'X');
+    internal_label_prefix_len = p - internal_label_prefix;
+    *p = '\0';
+  }
+ }
+ 
+ /* A C statement (sans semicolon) to choose the order in which to
+@@ -1128,6 +1142,40 @@ pic_symbolic_operand (op, mode)
+   return 0;
+ }
+ 
+/* Return true if OP is a symbolic operand that resolves locally.  */
+
+static int
+local_symbolic_operand (op, mode)
+     rtx op;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
+{
+  if (GET_CODE (op) == LABEL_REF)
+    return 1;
+
+  if (GET_CODE (op) == CONST
+      && GET_CODE (XEXP (op, 0)) == PLUS
+      && GET_CODE (XEXP (XEXP (op, 0), 1)) == CONST_INT)
+    op = XEXP (XEXP (op, 0), 0);
+
+  if (GET_CODE (op) != SYMBOL_REF)
+    return 0;
+
+  /* These we've been told are local by varasm and encode_section_info
+     respectively.  */
+  if (CONSTANT_POOL_ADDRESS_P (op) || SYMBOL_REF_FLAG (op))
+    return 1;
+
+  /* There is, however, a not insubstantial body of code in the rest of
+     the compiler that assumes it can just stick the results of 
+     ASM_GENERATE_INTERNAL_LABEL in a symbol_ref and have done.  */
+
+  if (strncmp (XSTR (op, 0), internal_label_prefix,
+	       internal_label_prefix_len) == 0)
+    return 1;
+
+  return 0;
+}
+
+ /* Test for a valid operand for a call instruction.  Don't allow the
+    arg pointer register or virtual regs since they may decay into
+    reg + const, which the patterns can't handle.  */
+@@ -2530,15 +2578,16 @@ legitimate_pic_address_disp_p (disp)
+     return 0;
+ 
+   /* Must be @GOT or @GOTOFF.  */
+-  if (XINT (disp, 1) != 6
+-      && XINT (disp, 1) != 7)
+-    return 0;
+-
+-  if (GET_CODE (XVECEXP (disp, 0, 0)) != SYMBOL_REF
+-      && GET_CODE (XVECEXP (disp, 0, 0)) != LABEL_REF)
+-    return 0;
+  switch (XINT (disp, 1))
+    {
+    case 6: /* @GOT */
+      return GET_CODE (XVECEXP (disp, 0, 0)) == SYMBOL_REF;
+ 
+-  return 1;
+    case 7: /* @GOTOFF */
+      return local_symbolic_operand (XVECEXP (disp, 0, 0), Pmode);
+    }
+    
+  return 0;
+ }
+ 
+ /* GO_IF_LEGITIMATE_ADDRESS recognizes an RTL expression that is a valid
+@@ -2767,10 +2816,7 @@ legitimize_pic_address (orig, reg)
+   rtx new = orig;
+   rtx base;
+ 
+-  if (GET_CODE (addr) == LABEL_REF
+-      || (GET_CODE (addr) == SYMBOL_REF
+-	  && (CONSTANT_POOL_ADDRESS_P (addr)
+-	      || SYMBOL_REF_FLAG (addr))))
+  if (local_symbolic_operand (addr, Pmode))
+     {
+       /* This symbol may be referenced via a displacement from the PIC
+ 	 base address (@GOTOFF).  */
+@@ -2822,10 +2868,7 @@ legitimize_pic_address (orig, reg)
+ 
+ 	  /* Check first to see if this is a constant offset from a @GOTOFF
+ 	     symbol reference.  */
+-	  if ((GET_CODE (op0) == LABEL_REF
+-	       || (GET_CODE (op0) == SYMBOL_REF
+-		   && (CONSTANT_POOL_ADDRESS_P (op0)
+-		       || SYMBOL_REF_FLAG (op0))))
+	  if (local_symbolic_operand (op0, Pmode)
+ 	      && GET_CODE (op1) == CONST_INT)
+ 	    {
+ 	      current_function_uses_pic_offset_table = 1;