You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
233 lines
8.6 KiB
233 lines
8.6 KiB
commit 5315d05c7295fbb9345d85d6bf7cbe7c975a19c8 |
|
Author: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> |
|
Date: Tue Jan 16 11:22:01 2018 +0000 |
|
|
|
HJ patch #5 |
|
|
|
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c |
|
index e73389b..15cfe83 100644 |
|
--- a/gcc/config/i386/i386.c |
|
+++ b/gcc/config/i386/i386.c |
|
@@ -4634,6 +4634,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) |
|
@@ -4659,6 +4672,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")); |
|
} |
|
} |
|
|
|
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi |
|
index 4a365c7..7b33803 100644 |
|
--- a/gcc/doc/invoke.texi |
|
+++ b/gcc/doc/invoke.texi |
|
@@ -14659,6 +14659,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}, |
|
@@ -14670,6 +14675,11 @@ 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. |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-10.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-10.c |
|
new file mode 100644 |
|
index 0000000..a0674bd |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-10.c |
|
@@ -0,0 +1,7 @@ |
|
+/* { dg-do compile { target { lp64 } } } */ |
|
+/* { dg-options "-O2 -mindirect-branch=thunk-inline -mfunction-return=keep -mcmodel=large" } */ |
|
+ |
|
+void |
|
+bar (void) |
|
+{ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-8.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-8.c |
|
new file mode 100644 |
|
index 0000000..7a80a89 |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-8.c |
|
@@ -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" } */ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-9.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-9.c |
|
new file mode 100644 |
|
index 0000000..d4d45c5 |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-9.c |
|
@@ -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" } */ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-10.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-10.c |
|
new file mode 100644 |
|
index 0000000..3a2aead |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-10.c |
|
@@ -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" } */ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-11.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-11.c |
|
new file mode 100644 |
|
index 0000000..8e52f03 |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-11.c |
|
@@ -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) |
|
+{ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-9.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-9.c |
|
new file mode 100644 |
|
index 0000000..bdaa4f6 |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-9.c |
|
@@ -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" } */ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-17.c b/gcc/testsuite/gcc.target/i386/ret-thunk-17.c |
|
new file mode 100644 |
|
index 0000000..0605e2c |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-17.c |
|
@@ -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" } */ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-18.c b/gcc/testsuite/gcc.target/i386/ret-thunk-18.c |
|
new file mode 100644 |
|
index 0000000..307019d |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-18.c |
|
@@ -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" } */ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-19.c b/gcc/testsuite/gcc.target/i386/ret-thunk-19.c |
|
new file mode 100644 |
|
index 0000000..772617f |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-19.c |
|
@@ -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" } */ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-20.c b/gcc/testsuite/gcc.target/i386/ret-thunk-20.c |
|
new file mode 100644 |
|
index 0000000..1e9f9bd |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-20.c |
|
@@ -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" } */ |
|
+} |
|
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-21.c b/gcc/testsuite/gcc.target/i386/ret-thunk-21.c |
|
new file mode 100644 |
|
index 0000000..eea07f7 |
|
--- /dev/null |
|
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-21.c |
|
@@ -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) |
|
+{ |
|
+}
|
|
|