SYMBOL_SMALL_GOTTPREL is for TLS IE model, while it is the only symbol name
which is not following the name convention SYMBOL_[code model]_TLS[tls model].

This patch fix this.

Committed as obivious.

2015-08-28  Jiong Wang  <jiong.w...@arm.com>

gcc/
  * config/aarch64/aarch64-protos.h (aarch64_symbol_context): Rename
  SYMBOL_SMALL_GOTTPREL to SYMBOL_SMALL_TLSIE.
  (aarch64_symbol_type): Likewise.
  * config/aarch64/aarch64.c (aarch64_load_symref_appropriately): Likewise.
  (aarch64_expand_mov_immediate): Likewise.
  (aarch64_print_operand): Likewise.
  (aarch64_classify_tls_symbol): Likewise.

-- 
Regards,
Jiong

Index: gcc/ChangeLog
===================================================================
--- gcc/ChangeLog	(revision 227293)
+++ gcc/ChangeLog	(working copy)
@@ -1,3 +1,14 @@
+2015-08-28  Jiong Wang  <jiong.w...@arm.com>
+
+	* config/aarch64/aarch64-protos.h (aarch64_symbol_context): Rename
+	SYMBOL_SMALL_GOTTPREL to SYMBOL_SMALL_TLSIE.
+	(aarch64_symbol_type): Likewise.
+	* config/aarch64/aarch64.c (aarch64_load_symref_appropriately):
+	Likewise.
+	(aarch64_expand_mov_immediate): Likewise.
+	(aarch64_print_operand): Likewise.
+	(aarch64_classify_tls_symbol): Likewise.
+
 2015-08-28  Richard Biener  <rguent...@suse.de>
 
 	* cgraphunit.c (symbol_table::compile): Move early debug generation
Index: gcc/config/aarch64/aarch64-protos.h
===================================================================
--- gcc/config/aarch64/aarch64-protos.h	(revision 227293)
+++ gcc/config/aarch64/aarch64-protos.h	(working copy)
@@ -73,7 +73,7 @@
 
    SYMBOL_SMALL_TLSGD
    SYMBOL_SMALL_TLSDESC
-   SYMBOL_SMALL_GOTTPREL
+   SYMBOL_SMALL_TLSIE
    SYMBOL_TINY_TLSIE
    SYMBOL_TLSLE12
    SYMBOL_TLSLE24
@@ -112,7 +112,7 @@
   SYMBOL_SMALL_GOT_4G,
   SYMBOL_SMALL_TLSGD,
   SYMBOL_SMALL_TLSDESC,
-  SYMBOL_SMALL_GOTTPREL,
+  SYMBOL_SMALL_TLSIE,
   SYMBOL_TINY_ABSOLUTE,
   SYMBOL_TINY_GOT,
   SYMBOL_TINY_TLSIE,
Index: gcc/config/aarch64/aarch64.c
===================================================================
--- gcc/config/aarch64/aarch64.c	(revision 227293)
+++ gcc/config/aarch64/aarch64.c	(working copy)
@@ -1103,7 +1103,7 @@
 	return;
       }
 
-    case SYMBOL_SMALL_GOTTPREL:
+    case SYMBOL_SMALL_TLSIE:
       {
 	/* In ILP32, the mode of dest can be either SImode or DImode,
 	   while the got entry is always of SImode size.  The mode of
@@ -1737,7 +1737,7 @@
 
         case SYMBOL_SMALL_TLSGD:
         case SYMBOL_SMALL_TLSDESC:
-        case SYMBOL_SMALL_GOTTPREL:
+	case SYMBOL_SMALL_TLSIE:
 	case SYMBOL_SMALL_GOT_28K:
 	case SYMBOL_SMALL_GOT_4G:
 	case SYMBOL_TINY_GOT:
@@ -4623,7 +4623,7 @@
 	  asm_fprintf (asm_out_file, ":tlsdesc:");
 	  break;
 
-	case SYMBOL_SMALL_GOTTPREL:
+	case SYMBOL_SMALL_TLSIE:
 	  asm_fprintf (asm_out_file, ":gottprel:");
 	  break;
 
@@ -4656,7 +4656,7 @@
 	  asm_fprintf (asm_out_file, ":tlsdesc_lo12:");
 	  break;
 
-	case SYMBOL_SMALL_GOTTPREL:
+	case SYMBOL_SMALL_TLSIE:
 	  asm_fprintf (asm_out_file, ":gottprel_lo12:");
 	  break;
 
@@ -8787,7 +8787,7 @@
 	case AARCH64_CMODEL_TINY_PIC:
 	  return SYMBOL_TINY_TLSIE;
 	default:
-	  return SYMBOL_SMALL_GOTTPREL;
+	  return SYMBOL_SMALL_TLSIE;
 	}
 
     case TLS_MODEL_LOCAL_EXEC:

Reply via email to