From: Rainer Orth Date: Fri, 7 Jan 2011 15:27:47 +0000 (+0000) Subject: backport: re PR target/43309 (amd64 TLS IE code sequence on Solaris 2/x86 violates... X-Git-Tag: releases/gcc-4.4.6~184 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ea234aecc36bad0673b9f9eaa3858c6c36204ca;p=thirdparty%2Fgcc.git backport: re PR target/43309 (amd64 TLS IE code sequence on Solaris 2/x86 violates spec) Backport from mainline: 2011-01-06 Rainer Orth PR target/43309 * config/i386/i386.c (legitimize_tls_address) : Handle TARGET_64BIT && TARGET_SUN_TLS. * config/i386/i386.md (UNSPEC_TLS_IE_SUN): Declare. (tls_initial_exec_64_sun): New pattern. 2010-03-24 Rainer Orth * config/i386/i386.c (override_options): Don't accept -mtls-dialect=sun any longer. * config/i386/i386.h (TARGET_SUN_TLS): Define as 0. * config/i386/i386.md (*tls_global_dynamic_32_sun): Remove. (*tls_local_dynamic_base_32_sun): Likewise. * config/i386/sol2.h (TARGET_SUN_TLS): Redefine. From-SVN: r168575 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4cfc866734cb..1b7f9e329981 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,23 @@ +2011-01-07 Rainer Orth + + Backport from mainline: + 2011-01-06 Rainer Orth + + PR target/43309 + * config/i386/i386.c (legitimize_tls_address) + : Handle TARGET_64BIT && TARGET_SUN_TLS. + * config/i386/i386.md (UNSPEC_TLS_IE_SUN): Declare. + (tls_initial_exec_64_sun): New pattern. + + 2010-03-24 Rainer Orth + + * config/i386/i386.c (override_options): Don't accept + -mtls-dialect=sun any longer. + * config/i386/i386.h (TARGET_SUN_TLS): Define as 0. + * config/i386/i386.md (*tls_global_dynamic_32_sun): Remove. + (*tls_local_dynamic_base_32_sun): Likewise. + * config/i386/sol2.h (TARGET_SUN_TLS): Redefine. + 2010-12-30 John David Anglin * config/pa/pa.md: Add ",*" condition to 64-bit add/subtract boolean diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 112b1b1d92ea..463f169a73cd 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -2999,8 +2999,6 @@ override_options (bool main_args_p) ix86_tls_dialect = TLS_DIALECT_GNU; else if (strcmp (ix86_tls_dialect_string, "gnu2") == 0) ix86_tls_dialect = TLS_DIALECT_GNU2; - else if (strcmp (ix86_tls_dialect_string, "sun") == 0) - ix86_tls_dialect = TLS_DIALECT_SUN; else error ("bad value (%s) for %stls-dialect=%s %s", ix86_tls_dialect_string, prefix, suffix, sw); @@ -9869,6 +9867,17 @@ legitimize_tls_address (rtx x, enum tls_model model, int for_mov) case TLS_MODEL_INITIAL_EXEC: if (TARGET_64BIT) { + if (TARGET_SUN_TLS) + { + /* The Sun linker took the AMD64 TLS spec literally + and can only handle %rax as destination of the + initial executable code sequence. */ + + dest = gen_reg_rtx (Pmode); + emit_insn (gen_tls_initial_exec_64_sun (dest, x)); + return dest; + } + pic = NULL; type = UNSPEC_GOTNTPOFF; } diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 23c0d183eef9..753493f28e98 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GCC for IA-32. Copyright (C) 1988, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -422,7 +422,7 @@ extern int x86_prefetch_sse; #define TARGET_GNU_TLS (ix86_tls_dialect == TLS_DIALECT_GNU) #define TARGET_GNU2_TLS (ix86_tls_dialect == TLS_DIALECT_GNU2) #define TARGET_ANY_GNU_TLS (TARGET_GNU_TLS || TARGET_GNU2_TLS) -#define TARGET_SUN_TLS (ix86_tls_dialect == TLS_DIALECT_SUN) +#define TARGET_SUN_TLS 0 extern int ix86_isa_flags; diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index a5423e7e6509..82f7ecbb5ad2 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -1,6 +1,6 @@ ;; GCC machine description for IA-32 and x86-64. ;; Copyright (C) 1988, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Mostly by William Schelter. ;; x86_64 support added by Jan Hubicka @@ -75,6 +75,7 @@ (UNSPEC_TLS_GD 21) (UNSPEC_TLS_LD_BASE 22) (UNSPEC_TLSDESC 23) + (UNSPEC_TLS_IE_SUN 24) ; Other random patterns (UNSPEC_EH_RETURN 29) @@ -15889,21 +15890,6 @@ [(set_attr "type" "multi") (set_attr "length" "12")]) -(define_insn "*tls_global_dynamic_32_sun" - [(set (match_operand:SI 0 "register_operand" "=a") - (unspec:SI [(match_operand:SI 1 "register_operand" "b") - (match_operand:SI 2 "tls_symbolic_operand" "") - (match_operand:SI 3 "call_insn_operand" "")] - UNSPEC_TLS_GD)) - (clobber (match_scratch:SI 4 "=d")) - (clobber (match_scratch:SI 5 "=c")) - (clobber (reg:CC FLAGS_REG))] - "!TARGET_64BIT && TARGET_SUN_TLS" - "lea{l}\t{%a2@DTLNDX(%1), %4|%4, %a2@DTLNDX[%1]} - push{l}\t%4\;call\t%a2@TLSPLT\;pop{l}\t%4\;nop" - [(set_attr "type" "multi") - (set_attr "length" "14")]) - (define_expand "tls_global_dynamic_32" [(parallel [(set (match_operand:SI 0 "register_operand" "") (unspec:SI @@ -15972,20 +15958,6 @@ [(set_attr "type" "multi") (set_attr "length" "11")]) -(define_insn "*tls_local_dynamic_base_32_sun" - [(set (match_operand:SI 0 "register_operand" "=a") - (unspec:SI [(match_operand:SI 1 "register_operand" "b") - (match_operand:SI 2 "call_insn_operand" "")] - UNSPEC_TLS_LD_BASE)) - (clobber (match_scratch:SI 3 "=d")) - (clobber (match_scratch:SI 4 "=c")) - (clobber (reg:CC FLAGS_REG))] - "!TARGET_64BIT && TARGET_SUN_TLS" - "lea{l}\t{%&@TMDNX(%1), %3|%3, %&@TMDNX[%1]} - push{l}\t%3\;call\t%&@TLSPLT\;pop{l}\t%3" - [(set_attr "type" "multi") - (set_attr "length" "13")]) - (define_expand "tls_local_dynamic_base_32" [(parallel [(set (match_operand:SI 0 "register_operand" "") (unspec:SI [(match_dup 1) (match_dup 2)] @@ -16111,6 +16083,18 @@ (set_attr "memory" "load") (set_attr "imm_disp" "false")]) +;; The Sun linker took the AMD64 TLS spec literally and can only handle +;; %rax as destination of the initial executable code sequence. +(define_insn "tls_initial_exec_64_sun" + [(set (match_operand:DI 0 "register_operand" "=a") + (unspec:DI + [(match_operand:DI 1 "tls_symbolic_operand" "")] + UNSPEC_TLS_IE_SUN)) + (clobber (reg:CC FLAGS_REG))] + "TARGET_64BIT && TARGET_SUN_TLS" + "mov{q}\t{%%fs:0, %0|%0, QWORD PTR fs:0}\n\tadd{q}\t{%a1@gottpoff(%%rip), %0|%0, %a1@gottpoff[rip]}" + [(set_attr "type" "multi")]) + ;; GNU2 TLS patterns can be split. (define_expand "tls_dynamic_gnu2_32" diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h index b4e12b5f5920..fc85fca3ca30 100644 --- a/gcc/config/i386/sol2.h +++ b/gcc/config/i386/sol2.h @@ -91,6 +91,11 @@ along with GCC; see the file COPYING3. If not see } \ } while (0) +/* Follow Sun requirements for TLS code sequences and use Sun assembler TLS + syntax. */ +#undef TARGET_SUN_TLS +#define TARGET_SUN_TLS 1 + /* The Solaris assembler cannot grok .stabd directives. */ #undef NO_DBX_BNSYM_ENSYM #define NO_DBX_BNSYM_ENSYM 1