projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 273d8a6)
rs6000.c (rs6000_legitimize_tls_address): Generate new tls_gd_* and tls_ld_* insns...
authorSteven Bosscher <stevenb.gcc@gmail.com>
Mon, 26 May 2008 23:37:05 +0000 (23:37 +0000)
committerKenneth Zadeck <zadeck@gcc.gnu.org>
Mon, 26 May 2008 23:37:05 +0000 (23:37 +0000)
2008-05-26  Steven Bosscher  <stevenb.gcc@gmail.com>

* config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Generate
new tls_gd_* and tls_ld_* insns instead of an insn sequence.
* config/rs6000/rs6000.md (TLSmode, tls_abi_suffix, tls_insn_suffix,
tls_sysv_suffix): New mode and mode attribute iterators.
(tls_gd_32, tls_gd_64, tls_ld_32, tls_ld_64): Remove.
(lts_gd_aix*, tls_gd_sysv*, tls_ld_aix*, tls_ld_sysv*): New patterns.
(tls_dtprel_*, tls_dtprel_ha_*, tls_dtprel_lo_*, tls_got_dtprel_*,
tls_tprel_*, tls_tprel_ha_*, tls_tprel_lo_*, tls_got_tprel_*,
tls_tls_*): Merge 32 bit and 64 bit variants using aforementioned
iterators.

From-SVN: r135961

gcc/ChangeLog patch | blob | history
gcc/config/rs6000/rs6000.c patch | blob | history
gcc/config/rs6000/rs6000.md patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 831b1a992785d07ff3d1d65ac9e8437dd99bf0f0..7798bf7c5018badb6659c101f36f53470ff4cd82 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2008-05-26  Steven Bosscher  <stevenb.gcc@gmail.com>
+
+       * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Generate
+       new tls_gd_* and tls_ld_* insns instead of an insn sequence.
+       * config/rs6000/rs6000.md (TLSmode, tls_abi_suffix, tls_insn_suffix,
+       tls_sysv_suffix): New mode and mode attribute iterators.
+       (tls_gd_32, tls_gd_64, tls_ld_32, tls_ld_64): Remove.
+       (lts_gd_aix*, tls_gd_sysv*, tls_ld_aix*, tls_ld_sysv*): New patterns.
+       (tls_dtprel_*, tls_dtprel_ha_*, tls_dtprel_lo_*, tls_got_dtprel_*,
+       tls_tprel_*, tls_tprel_ha_*, tls_tprel_lo_*, tls_got_tprel_*,
+       tls_tls_*): Merge 32 bit and 64 bit variants using aforementioned
+       iterators.
+
 2008-05-26  Eric Botcazou  <ebotcazou@adacore.com>
 
        PR tree-optimization/36329
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index e90772b03efcffa2cd672dcc20276b251f070b00..1eafc999fde43acdf2096bc73a8cb66450f46db6 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -3897,14 +3897,18 @@ rs6000_legitimize_tls_address (rtx addr, enum tls_model model)
       if (model == TLS_MODEL_GLOBAL_DYNAMIC)
        {
          r3 = gen_rtx_REG (Pmode, 3);
-         if (TARGET_64BIT)
-           insn = gen_tls_gd_64 (r3, got, addr);
+         tga = rs6000_tls_get_addr ();
+
+         if (DEFAULT_ABI == ABI_AIX && TARGET_64BIT)
+           insn = gen_tls_gd_aix64 (r3, got, addr, tga, const0_rtx);
+         else if (DEFAULT_ABI == ABI_AIX && !TARGET_64BIT)
+           insn = gen_tls_gd_aix32 (r3, got, addr, tga, const0_rtx);
+         else if (DEFAULT_ABI == ABI_V4)
+           insn = gen_tls_gd_sysvsi (r3, got, addr, tga, const0_rtx);
          else
-           insn = gen_tls_gd_32 (r3, got, addr);
+           gcc_unreachable ();
+
          start_sequence ();
-         emit_insn (insn);
-         tga = gen_rtx_MEM (Pmode, rs6000_tls_get_addr ());
-         insn = gen_call_value (r3, tga, const0_rtx, const0_rtx);
          insn = emit_call_insn (insn);
          RTL_CONST_CALL_P (insn) = 1;
          use_reg (&CALL_INSN_FUNCTION_USAGE (insn), r3);
@@ -3915,14 +3919,18 @@ rs6000_legitimize_tls_address (rtx addr, enum tls_model model)
       else if (model == TLS_MODEL_LOCAL_DYNAMIC)
        {
          r3 = gen_rtx_REG (Pmode, 3);
-         if (TARGET_64BIT)
-           insn = gen_tls_ld_64 (r3, got);
+         tga = rs6000_tls_get_addr ();
+
+         if (DEFAULT_ABI == ABI_AIX && TARGET_64BIT)
+           insn = gen_tls_ld_aix64 (r3, got, tga, const0_rtx);
+         else if (DEFAULT_ABI == ABI_AIX && !TARGET_64BIT)
+           insn = gen_tls_ld_aix32 (r3, got, tga, const0_rtx);
+         else if (DEFAULT_ABI == ABI_V4)
+           insn = gen_tls_ld_sysvsi (r3, got, tga, const0_rtx);
          else
-           insn = gen_tls_ld_32 (r3, got);
+           gcc_unreachable ();
+
          start_sequence ();
-         emit_insn (insn);
-         tga = gen_rtx_MEM (Pmode, rs6000_tls_get_addr ());
-         insn = gen_call_value (r3, tga, const0_rtx, const0_rtx);
          insn = emit_call_insn (insn);
          RTL_CONST_CALL_P (insn) = 1;
          use_reg (&CALL_INSN_FUNCTION_USAGE (insn), r3);
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index fc65c94f8ca7f8a67e58c14f9001fbb0db1ff130..1f63454e69498edd311e2983bc078a0ef06041d6 100644 (file)
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -10199,183 +10199,155 @@
 \f
 ;; TLS support.
 
-;; "b" output constraint here and on tls_ld to support tls linker optimization.
-(define_insn "tls_gd_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=b")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSGD))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "addi %0,%1,%2@got@tlsgd")
-
-(define_insn "tls_gd_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=b")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSGD))]
-  "HAVE_AS_TLS && TARGET_64BIT"
-  "addi %0,%1,%2@got@tlsgd")
-
-(define_insn "tls_ld_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=b")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")]
-                  UNSPEC_TLSLD))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "addi %0,%1,%&@got@tlsld")
-
-(define_insn "tls_ld_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=b")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")]
-                  UNSPEC_TLSLD))]
-  "HAVE_AS_TLS && TARGET_64BIT"
-  "addi %0,%1,%&@got@tlsld")
-
-(define_insn "tls_dtprel_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSDTPREL))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "addi %0,%1,%2@dtprel")
-
-(define_insn "tls_dtprel_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSDTPREL))]
-  "HAVE_AS_TLS && TARGET_64BIT"
-  "addi %0,%1,%2@dtprel")
-
-(define_insn "tls_dtprel_ha_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSDTPRELHA))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "addis %0,%1,%2@dtprel@ha")
+;; Mode attributes for different ABIs.
+(define_mode_iterator TLSmode [(SI "! TARGET_64BIT") (DI "TARGET_64BIT")])
+(define_mode_attr tls_abi_suffix [(SI "32") (DI "64")])
+(define_mode_attr tls_sysv_suffix [(SI "si") (DI "di")])
+(define_mode_attr tls_insn_suffix [(SI "wz") (DI "d")])
+
+(define_insn "tls_gd_aix<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=b")
+        (call (mem:TLSmode (match_operand:TLSmode 3 "symbol_ref_operand" "s"))
+             (match_operand 4 "" "g")))
+   (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                   (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                  UNSPEC_TLSGD)
+   (clobber (reg:SI LR_REGNO))]
+  "HAVE_AS_TLS && DEFAULT_ABI == ABI_AIX"
+  "addi %0,%1,%2@got@tlsgd\;bl %z3\;%."
+  [(set_attr "type" "two")
+   (set_attr "length" "12")])
 
-(define_insn "tls_dtprel_ha_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSDTPRELHA))]
-  "HAVE_AS_TLS && TARGET_64BIT"
-  "addis %0,%1,%2@dtprel@ha")
+(define_insn "tls_gd_sysv<TLSmode:tls_sysv_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=b")
+        (call (mem:TLSmode (match_operand:TLSmode 3 "symbol_ref_operand" "s"))
+             (match_operand 4 "" "g")))
+   (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                   (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                  UNSPEC_TLSGD)
+   (clobber (reg:SI LR_REGNO))]
+  "HAVE_AS_TLS && DEFAULT_ABI == ABI_V4"
+{
+  if (flag_pic)
+    {
+      if (TARGET_SECURE_PLT && flag_pic == 2)
+       return "addi %0,%1,%2@got@tlsgd\;bl %z3+32768@plt";
+      else
+       return "addi %0,%1,%2@got@tlsgd\;bl %z3@plt";
+    }
+  else
+    return "addi %0,%1,%2@got@tlsgd\;bl %z3";
+}
+  [(set_attr "type" "two")
+   (set_attr "length" "8")])
 
-(define_insn "tls_dtprel_lo_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSDTPRELLO))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "addi %0,%1,%2@dtprel@l")
+(define_insn "tls_ld_aix<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=b")
+        (call (mem:TLSmode (match_operand:TLSmode 2 "symbol_ref_operand" "s"))
+             (match_operand 3 "" "g")))
+   (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")]
+                  UNSPEC_TLSLD)
+   (clobber (reg:SI LR_REGNO))]
+  "HAVE_AS_TLS && DEFAULT_ABI == ABI_AIX"
+  "addi %0,%1,%&@got@tlsld\;bl %z2\;%."
+  [(set_attr "length" "12")])
 
-(define_insn "tls_dtprel_lo_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSDTPRELLO))]
-  "HAVE_AS_TLS && TARGET_64BIT"
-  "addi %0,%1,%2@dtprel@l")
+(define_insn "tls_ld_sysv<TLSmode:tls_sysv_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=b")
+        (call (mem:TLSmode (match_operand:TLSmode 2 "symbol_ref_operand" "s"))
+             (match_operand 3 "" "g")))
+   (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")]
+                  UNSPEC_TLSLD)
+   (clobber (reg:SI LR_REGNO))]
+  "HAVE_AS_TLS && DEFAULT_ABI == ABI_V4"
+{
+  if (flag_pic)
+    {
+      if (TARGET_SECURE_PLT && flag_pic == 2)
+       return "addi %0,%1,%&@got@tlsld\;bl %z2+32768@plt";
+      else
+       return "addi %0,%1,%&@got@tlsld\;bl %z2@plt";
+    }
+  else
+    return "addi %0,%1,%&@got@tlsld\;bl %z2";
+}
+  [(set_attr "length" "8")])
 
-(define_insn "tls_got_dtprel_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSGOTDTPREL))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "lwz %0,%2@got@dtprel(%1)")
+(define_insn "tls_dtprel_<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=r")
+       (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                        (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                       UNSPEC_TLSDTPREL))]
+  "HAVE_AS_TLS"
+  "addi %0,%1,%2@dtprel")
 
-(define_insn "tls_got_dtprel_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSGOTDTPREL))]
-  "HAVE_AS_TLS && TARGET_64BIT"
-  "ld %0,%2@got@dtprel(%1)")
+(define_insn "tls_dtprel_ha_<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=r")
+       (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                        (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                       UNSPEC_TLSDTPRELHA))]
+  "HAVE_AS_TLS"
+  "addis %0,%1,%2@dtprel@ha")
 
-(define_insn "tls_tprel_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSTPREL))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "addi %0,%1,%2@tprel")
+(define_insn "tls_dtprel_lo_<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=r")
+       (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                        (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                       UNSPEC_TLSDTPRELLO))]
+  "HAVE_AS_TLS"
+  "addi %0,%1,%2@dtprel@l")
 
-(define_insn "tls_tprel_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSTPREL))]
-  "HAVE_AS_TLS && TARGET_64BIT"
+(define_insn "tls_got_dtprel_<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=r")
+       (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                        (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                       UNSPEC_TLSGOTDTPREL))]
+  "HAVE_AS_TLS"
+  "l<TLSmode:tls_insn_suffix> %0,%2@got@dtprel(%1)")
+
+(define_insn "tls_tprel_<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=r")
+       (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                        (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                       UNSPEC_TLSTPREL))]
+  "HAVE_AS_TLS"
   "addi %0,%1,%2@tprel")
 
-(define_insn "tls_tprel_ha_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSTPRELHA))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "addis %0,%1,%2@tprel@ha")
-
-(define_insn "tls_tprel_ha_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSTPRELHA))]
-  "HAVE_AS_TLS && TARGET_64BIT"
+(define_insn "tls_tprel_ha_<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=r")
+       (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                        (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                       UNSPEC_TLSTPRELHA))]
+  "HAVE_AS_TLS"
   "addis %0,%1,%2@tprel@ha")
 
-(define_insn "tls_tprel_lo_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSTPRELLO))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "addi %0,%1,%2@tprel@l")
-
-(define_insn "tls_tprel_lo_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSTPRELLO))]
-  "HAVE_AS_TLS && TARGET_64BIT"
+(define_insn "tls_tprel_lo_<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=r")
+       (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                        (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                       UNSPEC_TLSTPRELLO))]
+  "HAVE_AS_TLS"
   "addi %0,%1,%2@tprel@l")
 
 ;; "b" output constraint here and on tls_tls input to support linker tls
 ;; optimization.  The linker may edit the instructions emitted by a
 ;; tls_got_tprel/tls_tls pair to addis,addi.
-(define_insn "tls_got_tprel_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=b")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSGOTTPREL))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
-  "lwz %0,%2@got@tprel(%1)")
-
-(define_insn "tls_got_tprel_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=b")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSGOTTPREL))]
-  "HAVE_AS_TLS && TARGET_64BIT"
-  "ld %0,%2@got@tprel(%1)")
-
-(define_insn "tls_tls_32"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-       (unspec:SI [(match_operand:SI 1 "gpc_reg_operand" "b")
-                   (match_operand:SI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSTLS))]
-  "HAVE_AS_TLS && !TARGET_64BIT"
+(define_insn "tls_got_tprel_<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=b")
+       (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                        (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                       UNSPEC_TLSGOTTPREL))]
+  "HAVE_AS_TLS"
+  "l<TLSmode:tls_insn_suffix> %0,%2@got@tprel(%1)")
+
+(define_insn "tls_tls_<TLSmode:tls_abi_suffix>"
+  [(set (match_operand:TLSmode 0 "gpc_reg_operand" "=r")
+       (unspec:TLSmode [(match_operand:TLSmode 1 "gpc_reg_operand" "b")
+                        (match_operand:TLSmode 2 "rs6000_tls_symbol_ref" "")]
+                       UNSPEC_TLSTLS))]
+  "HAVE_AS_TLS"
   "add %0,%1,%2@tls")
 
-(define_insn "tls_tls_64"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "gpc_reg_operand" "b")
-                   (match_operand:DI 2 "rs6000_tls_symbol_ref" "")]
-                  UNSPEC_TLSTLS))]
-  "HAVE_AS_TLS && TARGET_64BIT"
-  "add %0,%1,%2@tls")
 \f
 ;; Next come insns related to the calling sequence.
 ;;