x86: Disallow -mindirect-branch=/-mfunction-return= with -mcmodel=large
Since the thunk function may not be reachable in large code model, -mcmodel=large is incompatible with -mindirect-branch=thunk, -mindirect-branch=thunk-extern, -mfunction-return=thunk and -mfunction-return=thunk-extern. Issue an error when they are used with -mcmodel=large. gcc/ Backport from mainline 2018-01-14 H.J. Lu <hongjiu.lu@intel.com> * config/i386/i386.c (ix86_set_indirect_branch_type): Disallow -mcmodel=large with -mindirect-branch=thunk, -mindirect-branch=thunk-extern, -mfunction-return=thunk and -mfunction-return=thunk-extern. * doc/invoke.texi: Document -mcmodel=large is incompatible with -mindirect-branch=thunk, -mindirect-branch=thunk-extern, -mfunction-return=thunk and -mfunction-return=thunk-extern. gcc/testsuite/ Backport from mainline 2018-01-14 H.J. Lu <hongjiu.lu@intel.com> * gcc.target/i386/indirect-thunk-10.c: New test. * gcc.target/i386/indirect-thunk-8.c: Likewise. * gcc.target/i386/indirect-thunk-9.c: Likewise. * gcc.target/i386/indirect-thunk-attr-10.c: Likewise. * gcc.target/i386/indirect-thunk-attr-11.c: Likewise. * gcc.target/i386/indirect-thunk-attr-9.c: Likewise. * gcc.target/i386/ret-thunk-17.c: Likewise. * gcc.target/i386/ret-thunk-18.c: Likewise. * gcc.target/i386/ret-thunk-19.c: Likewise. * gcc.target/i386/ret-thunk-20.c: Likewise. * gcc.target/i386/ret-thunk-21.c: Likewise. From-SVN: r256737
This commit is contained in:
parent
3a205fe54c
commit
ce8249fe78
|
@ -1,3 +1,16 @@
|
|||
2018-01-16 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
Backport from mainline
|
||||
2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* config/i386/i386.c (ix86_set_indirect_branch_type): Disallow
|
||||
-mcmodel=large with -mindirect-branch=thunk,
|
||||
-mindirect-branch=thunk-extern, -mfunction-return=thunk and
|
||||
-mfunction-return=thunk-extern.
|
||||
* doc/invoke.texi: Document -mcmodel=large is incompatible with
|
||||
-mindirect-branch=thunk, -mindirect-branch=thunk-extern,
|
||||
-mfunction-return=thunk and -mfunction-return=thunk-extern.
|
||||
|
||||
2018-01-16 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
Backport from mainline
|
||||
|
|
|
@ -7187,6 +7187,19 @@ ix86_set_indirect_branch_type (tree fndecl)
|
|||
}
|
||||
else
|
||||
cfun->machine->indirect_branch_type = ix86_indirect_branch;
|
||||
|
||||
/* -mcmodel=large is not compatible with -mindirect-branch=thunk
|
||||
nor -mindirect-branch=thunk-extern. */
|
||||
if ((ix86_cmodel == CM_LARGE || ix86_cmodel == CM_LARGE_PIC)
|
||||
&& ((cfun->machine->indirect_branch_type
|
||||
== indirect_branch_thunk_extern)
|
||||
|| (cfun->machine->indirect_branch_type
|
||||
== indirect_branch_thunk)))
|
||||
error ("%<-mindirect-branch=%s%> and %<-mcmodel=large%> are not "
|
||||
"compatible",
|
||||
((cfun->machine->indirect_branch_type
|
||||
== indirect_branch_thunk_extern)
|
||||
? "thunk-extern" : "thunk"));
|
||||
}
|
||||
|
||||
if (cfun->machine->function_return_type == indirect_branch_unset)
|
||||
|
@ -7212,6 +7225,19 @@ ix86_set_indirect_branch_type (tree fndecl)
|
|||
}
|
||||
else
|
||||
cfun->machine->function_return_type = ix86_function_return;
|
||||
|
||||
/* -mcmodel=large is not compatible with -mfunction-return=thunk
|
||||
nor -mfunction-return=thunk-extern. */
|
||||
if ((ix86_cmodel == CM_LARGE || ix86_cmodel == CM_LARGE_PIC)
|
||||
&& ((cfun->machine->function_return_type
|
||||
== indirect_branch_thunk_extern)
|
||||
|| (cfun->machine->function_return_type
|
||||
== indirect_branch_thunk)))
|
||||
error ("%<-mfunction-return=%s%> and %<-mcmodel=large%> are not "
|
||||
"compatible",
|
||||
((cfun->machine->function_return_type
|
||||
== indirect_branch_thunk_extern)
|
||||
? "thunk-extern" : "thunk"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -25699,6 +25699,11 @@ 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}.
|
||||
|
||||
Note that @option{-mcmodel=large} is incompatible with
|
||||
@option{-mindirect-branch=thunk} nor
|
||||
@option{-mindirect-branch=thunk-extern} since the thunk function may
|
||||
not be reachable in large code model.
|
||||
|
||||
@item -mfunction-return=@var{choice}
|
||||
@opindex -mfunction-return
|
||||
Convert function return with @var{choice}. The default is @samp{keep},
|
||||
|
@ -25710,6 +25715,12 @@ object file. You can control this behavior for a specific function by
|
|||
using the function attribute @code{function_return}.
|
||||
@xref{Function Attributes}.
|
||||
|
||||
Note that @option{-mcmodel=large} is incompatible with
|
||||
@option{-mfunction-return=thunk} nor
|
||||
@option{-mfunction-return=thunk-extern} since the thunk function may
|
||||
not be reachable in large code model.
|
||||
|
||||
|
||||
@item -mindirect-branch-register
|
||||
@opindex -mindirect-branch-register
|
||||
Force indirect call and jump via register.
|
||||
|
|
|
@ -1,3 +1,20 @@
|
|||
2018-01-16 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
Backport from mainline
|
||||
2018-01-14 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* gcc.target/i386/indirect-thunk-10.c: New test.
|
||||
* gcc.target/i386/indirect-thunk-8.c: Likewise.
|
||||
* gcc.target/i386/indirect-thunk-9.c: Likewise.
|
||||
* gcc.target/i386/indirect-thunk-attr-10.c: Likewise.
|
||||
* gcc.target/i386/indirect-thunk-attr-11.c: Likewise.
|
||||
* gcc.target/i386/indirect-thunk-attr-9.c: Likewise.
|
||||
* gcc.target/i386/ret-thunk-17.c: Likewise.
|
||||
* gcc.target/i386/ret-thunk-18.c: Likewise.
|
||||
* gcc.target/i386/ret-thunk-19.c: Likewise.
|
||||
* gcc.target/i386/ret-thunk-20.c: Likewise.
|
||||
* gcc.target/i386/ret-thunk-21.c: Likewise.
|
||||
|
||||
2018-01-16 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
Backport from mainline
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mindirect-branch=thunk-inline -mfunction-return=keep -mcmodel=large" } */
|
||||
|
||||
void
|
||||
bar (void)
|
||||
{
|
||||
}
|
|
@ -0,0 +1,7 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mindirect-branch=thunk -mfunction-return=keep -mcmodel=large" } */
|
||||
|
||||
void
|
||||
bar (void)
|
||||
{ /* { dg-error "'-mindirect-branch=thunk' and '-mcmodel=large' are not compatible" } */
|
||||
}
|
|
@ -0,0 +1,7 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mindirect-branch=thunk-extern -mfunction-return=keep -mcmodel=large" } */
|
||||
|
||||
void
|
||||
bar (void)
|
||||
{ /* { dg-error "'-mindirect-branch=thunk-extern' and '-mcmodel=large' are not compatible" } */
|
||||
}
|
|
@ -0,0 +1,9 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mindirect-branch=keep -mfunction-return=keep -mcmodel=large" } */
|
||||
/* { dg-additional-options "-fPIC" { target fpic } } */
|
||||
|
||||
__attribute__ ((indirect_branch("thunk-extern")))
|
||||
void
|
||||
bar (void)
|
||||
{ /* { dg-error "'-mindirect-branch=thunk-extern' and '-mcmodel=large' are not compatible" } */
|
||||
}
|
|
@ -0,0 +1,9 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mindirect-branch=keep -mfunction-return=keep -mcmodel=large" } */
|
||||
/* { dg-additional-options "-fPIC" { target fpic } } */
|
||||
|
||||
__attribute__ ((indirect_branch("thunk-inline")))
|
||||
void
|
||||
bar (void)
|
||||
{
|
||||
}
|
|
@ -0,0 +1,9 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mindirect-branch=keep -mfunction-return=keep -mcmodel=large" } */
|
||||
/* { dg-additional-options "-fPIC" { target fpic } } */
|
||||
|
||||
__attribute__ ((indirect_branch("thunk")))
|
||||
void
|
||||
bar (void)
|
||||
{ /* { dg-error "'-mindirect-branch=thunk' and '-mcmodel=large' are not compatible" } */
|
||||
}
|
|
@ -0,0 +1,7 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mfunction-return=thunk -mindirect-branch=keep -mcmodel=large" } */
|
||||
|
||||
void
|
||||
bar (void)
|
||||
{ /* { dg-error "'-mfunction-return=thunk' and '-mcmodel=large' are not compatible" } */
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mfunction-return=thunk-extern -mindirect-branch=keep -mcmodel=large" } */
|
||||
/* { dg-additional-options "-fPIC" { target fpic } } */
|
||||
|
||||
void
|
||||
bar (void)
|
||||
{ /* { dg-error "'-mfunction-return=thunk-extern' and '-mcmodel=large' are not compatible" } */
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=keep -mcmodel=large" } */
|
||||
|
||||
__attribute__ ((function_return("thunk")))
|
||||
void
|
||||
bar (void)
|
||||
{ /* { dg-error "'-mfunction-return=thunk' and '-mcmodel=large' are not compatible" } */
|
||||
}
|
|
@ -0,0 +1,9 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=keep -mcmodel=large" } */
|
||||
/* { dg-additional-options "-fPIC" { target fpic } } */
|
||||
|
||||
__attribute__ ((function_return("thunk-extern")))
|
||||
void
|
||||
bar (void)
|
||||
{ /* { dg-error "'-mfunction-return=thunk-extern' and '-mcmodel=large' are not compatible" } */
|
||||
}
|
|
@ -0,0 +1,9 @@
|
|||
/* { dg-do compile { target { lp64 } } } */
|
||||
/* { dg-options "-O2 -mfunction-return=keep -mindirect-branch=keep -mcmodel=large" } */
|
||||
/* { dg-additional-options "-fPIC" { target fpic } } */
|
||||
|
||||
__attribute__ ((function_return("thunk-inline")))
|
||||
void
|
||||
bar (void)
|
||||
{
|
||||
}
|
Loading…
Reference in New Issue