commit 2ad2b4c4d8f0776012d36f1f3ae17c5fef55c7f9

Author: root <root@lenovo-x3950-01.khw.lab.eng.bos.redhat.com>

Date:   Thu Jan 18 17:43:15 2018 -0500

    HJ's patch #2

diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h

index ecdf108..4e4b210 100644

--- a/gcc/config/i386/i386-protos.h

+++ b/gcc/config/i386/i386-protos.h

@@ -307,6 +307,7 @@ extern enum attr_cpu ix86_schedule;

 extern const char * ix86_output_call_insn (rtx insn, rtx call_op);

 extern const char * ix86_output_indirect_jmp (rtx call_op, bool ret_p);

+extern const char * ix86_output_function_return (bool long_p);

 #ifdef RTX_CODE

 /* Target data for multipass lookahead scheduling.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c

index ebc9a90..9dffd02f 100644

--- a/gcc/config/i386/i386.c

+++ b/gcc/config/i386/i386.c

@@ -4635,6 +4635,31 @@ ix86_set_indirect_branch_type (tree fndecl)

       else

 	cfun->machine->indirect_branch_type = ix86_indirect_branch;

     }

+

+  if (cfun->machine->function_return_type == indirect_branch_unset)

+    {

+      tree attr = lookup_attribute ("function_return",

+				    DECL_ATTRIBUTES (fndecl));

+      if (attr != NULL)

+	{

+	  tree args = TREE_VALUE (attr);

+	  if (args == NULL)

+	    gcc_unreachable ();

+	  tree cst = TREE_VALUE (args);

+	  if (strcmp (TREE_STRING_POINTER (cst), "keep") == 0)

+	    cfun->machine->function_return_type = indirect_branch_keep;

+	  else if (strcmp (TREE_STRING_POINTER (cst), "thunk") == 0)

+	    cfun->machine->function_return_type = indirect_branch_thunk;

+	  else if (strcmp (TREE_STRING_POINTER (cst), "thunk-inline") == 0)

+	    cfun->machine->function_return_type = indirect_branch_thunk_inline;

+	  else if (strcmp (TREE_STRING_POINTER (cst), "thunk-extern") == 0)

+	    cfun->machine->function_return_type = indirect_branch_thunk_extern;

+	  else

+	    gcc_unreachable ();

+	}

+      else

+	cfun->machine->function_return_type = ix86_function_return;

+    }

 }

 /* Remember the last target of ix86_set_current_function.  */

@@ -8733,8 +8758,11 @@ static int indirect_thunks_used;

 /* Fills in the label name that should be used for the indirect thunk.  */

 static void

-indirect_thunk_name (char name[32], int regno)

+indirect_thunk_name (char name[32], int regno, bool ret_p)

 {

+  if (regno >= 0 && ret_p)

+    gcc_unreachable ();

+

   if (USE_HIDDEN_LINKONCE)

     {

       if (regno >= 0)

@@ -8748,14 +8776,22 @@ indirect_thunk_name (char name[32], int regno)

 		   reg_prefix, reg_names[regno]);

 	}

       else

-	sprintf (name, "__x86_indirect_thunk");

+	{

+	  const char *ret = ret_p ? "return" : "indirect";

+	  sprintf (name, "__x86_%s_thunk", ret);

+	}

     }

   else

     {

       if (regno >= 0)

 	ASM_GENERATE_INTERNAL_LABEL (name, "LITR", regno);

       else

-	ASM_GENERATE_INTERNAL_LABEL (name, "LIT", 0);

+	{

+	  if (ret_p)

+	    ASM_GENERATE_INTERNAL_LABEL (name, "LRT", 0);

+	  else

+	    ASM_GENERATE_INTERNAL_LABEL (name, "LIT", 0);

+	}

     }

 }

@@ -8841,7 +8877,7 @@ output_indirect_thunk_function (int regno)

   tree decl;

   /* Create __x86_indirect_thunk.  */

-  indirect_thunk_name (name, regno);

+  indirect_thunk_name (name, regno, false);

   decl = build_decl (BUILTINS_LOCATION, FUNCTION_DECL,

 		     get_identifier (name),

 		     build_function_type_list (void_type_node, NULL_TREE));

@@ -8885,6 +8921,36 @@ output_indirect_thunk_function (int regno)

 	ASM_OUTPUT_LABEL (asm_out_file, name);

       }

+  if (regno < 0)

+    {

+      /* Create alias for __x86.return_thunk/__x86.return_thunk_bnd.  */

+      char alias[32];

+

+      indirect_thunk_name (alias, regno, true);

+#if TARGET_MACHO

+      if (TARGET_MACHO)

+	{

+	  fputs ("\t.weak_definition\t", asm_out_file);

+	  assemble_name (asm_out_file, alias);

+	  fputs ("\n\t.private_extern\t", asm_out_file);

+	  assemble_name (asm_out_file, alias);

+	  putc ('\n', asm_out_file);

+	  ASM_OUTPUT_LABEL (asm_out_file, alias);

+	}

+#else

+      ASM_OUTPUT_DEF (asm_out_file, alias, name);

+      if (USE_HIDDEN_LINKONCE)

+	{

+	  fputs ("\t.globl\t", asm_out_file);

+	  assemble_name (asm_out_file, alias);

+	  putc ('\n', asm_out_file);

+	  fputs ("\t.hidden\t", asm_out_file);

+	  assemble_name (asm_out_file, alias);

+	  putc ('\n', asm_out_file);

+	}

+#endif

+    }

+

   DECL_INITIAL (decl) = make_node (BLOCK);

   current_function_decl = decl;

   allocate_struct_function (decl, false);

@@ -24353,7 +24419,7 @@ ix86_output_indirect_branch_via_reg (rtx call_op, bool sibcall_p)

 	    i -= (FIRST_REX_INT_REG - LAST_INT_REG - 1);

 	  indirect_thunks_used |= 1 << i;

 	}

-      indirect_thunk_name (thunk_name_buf, regno);

+      indirect_thunk_name (thunk_name_buf, regno, false);

       thunk_name = thunk_name_buf;

     }

   else

@@ -24437,7 +24503,7 @@ ix86_output_indirect_branch_via_push (rtx call_op, const char *xasm,

     {

       if (cfun->machine->indirect_branch_type == indirect_branch_thunk)

 	indirect_thunk_needed = true;

-      indirect_thunk_name (thunk_name_buf, regno);

+      indirect_thunk_name (thunk_name_buf, regno, false);

       thunk_name = thunk_name_buf;

     }

   else

@@ -24559,6 +24625,37 @@ ix86_output_indirect_jmp (rtx call_op, bool ret_p)

     return "jmp\t%A0";

 }

+/* Output function return.  CALL_OP is the jump target.  Add a REP

+   prefix to RET if LONG_P is true and function return is kept.  */

+

+const char *

+ix86_output_function_return (bool long_p)

+{

+  if (cfun->machine->function_return_type != indirect_branch_keep)

+    {

+      char thunk_name[32];

+

+      if (cfun->machine->function_return_type

+	  != indirect_branch_thunk_inline)

+	{

+	  bool need_thunk = (cfun->machine->function_return_type

+			     == indirect_branch_thunk);

+	  indirect_thunk_name (thunk_name, -1, true);

+	  indirect_thunk_needed |= need_thunk;

+	  fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name);

+	}

+      else

+	output_indirect_thunk (-1);

+

+      return "";

+    }

+

+  if (!long_p)

+    return "ret";

+

+  return "rep%; ret";

+}

+

 /* Output the assembly for a call instruction.  */

 const char *

@@ -35972,6 +36069,28 @@ ix86_handle_fndecl_attribute (tree *node, tree name,

 	}

     }

+  if (is_attribute_p ("function_return", name))

+    {

+      tree cst = TREE_VALUE (args);

+      if (TREE_CODE (cst) != STRING_CST)

+	{

+	  warning (OPT_Wattributes,

+		   "%qE attribute requires a string constant argument",

+		   name);

+	  *no_add_attrs = true;

+	}

+      else if (strcmp (TREE_STRING_POINTER (cst), "keep") != 0

+	       && strcmp (TREE_STRING_POINTER (cst), "thunk") != 0

+	       && strcmp (TREE_STRING_POINTER (cst), "thunk-inline") != 0

+	       && strcmp (TREE_STRING_POINTER (cst), "thunk-extern") != 0)

+	{

+	  warning (OPT_Wattributes,

+		   "argument to %qE attribute is not "

+		   "(keep|thunk|thunk-inline|thunk-extern)", name);

+	  *no_add_attrs = true;

+	}

+    }

+

   return NULL_TREE;

 }

@@ -39492,6 +39611,9 @@ static const struct attribute_spec ix86_attribute_table[] =

     ix86_handle_callee_pop_aggregate_return, true },

   { "indirect_branch", 1, 1, true, false, false,

     ix86_handle_fndecl_attribute, false },

+  { "function_return", 1, 1, true, false, false,

+    ix86_handle_fndecl_attribute, false },

+

   /* End element.  */

   { NULL,        0, 0, false, false, false, NULL, false }

 };

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h

index 8183cee7..8ff7026 100644

--- a/gcc/config/i386/i386.h

+++ b/gcc/config/i386/i386.h

@@ -2329,6 +2329,9 @@ struct GTY(()) machine_function {

      "indirect_jump" or "tablejump".  */

   BOOL_BITFIELD has_local_indirect_jump : 1;

+  /* How to generate function return.  */

+  ENUM_BITFIELD(indirect_branch) function_return_type : 3;

+

   /* During prologue/epilogue generation, the current frame state.

      Otherwise, the frame state at the end of the prologue.  */

   struct machine_frame_state fs;

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md

index b943849..ef16cf5 100644

--- a/gcc/config/i386/i386.md

+++ b/gcc/config/i386/i386.md

@@ -11749,7 +11749,7 @@

 (define_insn "simple_return_internal"

   [(simple_return)]

   "reload_completed"

-  "ret"

+  "* return ix86_output_function_return (false);"

   [(set_attr "length" "1")

    (set_attr "atom_unit" "jeu")

    (set_attr "length_immediate" "0")

@@ -11762,7 +11762,7 @@

   [(simple_return)

    (unspec [(const_int 0)] UNSPEC_REP)]

   "reload_completed"

-  "rep%; ret"

+  "* return ix86_output_function_return (true);"

   [(set_attr "length" "2")

    (set_attr "atom_unit" "jeu")

    (set_attr "length_immediate" "0")

diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt

index 0f6965a..9dfa2cb 100644

--- a/gcc/config/i386/i386.opt

+++ b/gcc/config/i386/i386.opt

@@ -635,9 +635,13 @@ mindirect-branch=

 Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_indirect_branch) Init(indirect_branch_keep)

 Convert indirect call and jump to call and return thunks.

+mfunction-return=

+Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_function_return) Init(indirect_branch_keep)

+Convert function return to call and return thunk.

+

 Enum

 Name(indirect_branch) Type(enum indirect_branch)

-Known indirect branch choices (for use with the -mindirect-branch= option):

+Known indirect branch choices (for use with the -mindirect-branch=/-mfunction-return= options):

 EnumValue

 Enum(indirect_branch) String(keep) Value(indirect_branch_keep)

diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi

index 847991c..add4f18 100644

--- a/gcc/doc/extend.texi

+++ b/gcc/doc/extend.texi

@@ -3821,6 +3821,15 @@ call and jump to call and return thunk.  @samp{thunk-inline} converts

 indirect call and jump to inlined call and return thunk.

 @samp{thunk-extern} converts indirect call and jump to external call

 and return thunk provided in a separate object file.

+

+@item function_return("@var{choice}")

+@cindex @code{function_return} function attribute, x86

+On x86 targets, the @code{function_return} attribute causes the compiler

+to convert function return with @var{choice}.  @samp{keep} keeps function

+return unmodified.  @samp{thunk} converts function return to call and

+return thunk.  @samp{thunk-inline} converts function return to inlined

+call and return thunk.  @samp{thunk-extern} converts function return to

+external call and return thunk provided in a separate object file.

 @end table

 On the PowerPC, the following options are allowed:

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi

index b299fbf..5acd23a 100644

--- a/gcc/doc/invoke.texi

+++ b/gcc/doc/invoke.texi

@@ -658,7 +658,7 @@ Objective-C and Objective-C++ Dialects}.

 -m32 -m64 -mx32 -mlarge-data-threshold=@var{num} @gol

 -msse2avx -mfentry -m8bit-idiv @gol

 -mavx256-split-unaligned-load -mavx256-split-unaligned-store @gol

--mindirect-branch=@var{choice}}

+-mindirect-branch=@var{choice} -mfunction-return==@var{choice}}

 @emph{i386 and x86-64 Windows Options}

 @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol

@@ -14658,6 +14658,17 @@ to external call and return thunk provided in a separate object file.

 You can control this behavior for a specific function by using the

 function attribute @code{indirect_branch}.  @xref{Function Attributes}.

+@item -mfunction-return=@var{choice}

+@opindex -mfunction-return

+Convert function return with @var{choice}.  The default is @samp{keep},

+which keeps function return unmodified.  @samp{thunk} converts function

+return to call and return thunk.  @samp{thunk-inline} converts function

+return to inlined call and return thunk.  @samp{thunk-extern} converts

+function return to external call and return thunk provided in a separate

+object file.  You can control this behavior for a specific function by

+using the function attribute @code{function_return}.

+@xref{Function Attributes}.

+

 @end table

 These @samp{-m} switches are supported in addition to the above

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c

index 87f6dae..034b4cc 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c

index 6bc4f0a..e0c57cb 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c

index f20d35c..3c0d4c3 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -12,7 +12,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */

 /* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c

index 0eff8fb..14d4ef6 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -12,7 +12,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */

 /* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c

index afdb600..bc6b47a 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-7.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */

 void func0 (void);

 void func1 (void);

@@ -35,7 +35,7 @@ bar (int i)

     }

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c

index efccdec..7c45142 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c

index ca3814e..9eebc84 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c

index 97744d6..f938db0 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -14,7 +14,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */

 /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */

 /* { dg-final { scan-assembler {\tpause} } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c

index bfce3ea..4e58599 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -13,7 +13,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */

 /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */

 /* { dg-final { scan-assembler {\tpause} } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c

index 0833606..b8d5024 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -14,7 +14,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */

 /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c

index 2eba0fb..455adab 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -13,7 +13,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */

 /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c

index f58427e..4595b84 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-7.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -fno-pic" } */

 void func0 (void);

 void func1 (void);

@@ -36,7 +36,7 @@ bar (int i)

     }

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" } } */

 /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c

index 564ed39..d730d31 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-8.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk -fno-pic" } */

 void func0 (void);

 void func1 (void);

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c

index 7fd01d6..f424181 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c

index 825f6b2..ac54868 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c

index 395634e..06ebf1c 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -12,7 +12,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */

 /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */

 /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c

index fd3f633..1c8f944 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -12,7 +12,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */

 /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */

 /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 1 { target { ! x32 } } } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c

index 6652523..86e9fd1 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-7.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-extern -fno-pic" } */

 void func0 (void);

 void func1 (void);

@@ -35,7 +35,7 @@ bar (int i)

     }

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk" { target { ! x32 } } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*__x86_indirect_thunk_(r|e)ax" { target x32 } } } */

 /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c

index 48c4dd4..4117a35 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c

index 355dad5..650d55c 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c

index 244fec7..9540996 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -12,7 +12,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */

 /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */

 /* { dg-final { scan-assembler-times {\tpause} 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c

index 107ebe3..f3db6e2 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */

 typedef void (*dispatch_t)(long offset);

@@ -12,7 +12,7 @@ male_indirect_jump (long offset)

   return 0;

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*_?dispatch" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler-times "jmp\[ \t\]*\.LIND" 2 } } */

 /* { dg-final { scan-assembler-times "call\[ \t\]*\.LIND" 2 } } */

 /* { dg-final { scan-assembler-times {\tpause} 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c

index d02b1dc..764a375 100644

--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c

+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-7.c

@@ -1,5 +1,5 @@

 /* { dg-do compile } */

-/* { dg-options "-O2 -mindirect-branch=thunk-inline -fno-pic" } */

+/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=thunk-inline -fno-pic" } */

 void func0 (void);

 void func1 (void);

@@ -35,7 +35,7 @@ bar (int i)

     }

 }

-/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { ! x32 } } } } */

+/* { dg-final { scan-assembler "push(?:l|q)\[ \t\]*\.L\[0-9\]+\\(,%" { target { { ! x32 } && *-*-linux* } } } } */

 /* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" { target x32 } } } */

 /* { dg-final { scan-assembler "jmp\[ \t\]*\.LIND" } } */

 /* { dg-final { scan-assembler "call\[ \t\]*\.LIND" } } */

diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-1.c b/gcc/testsuite/gcc.target/i386/ret-thunk-1.c