summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>2017-08-11 15:37:14 +0000
committertschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>2017-08-11 15:37:14 +0000
commit5b005e86c8c45aa84c090064b2f789c802384fc5 (patch)
tree1c08c40c4222ecd07711eb58999e70a2c22705dc
parenta0fa63ce6967b98ad53a2e431dc47e6a6c89a957 (diff)
downloadgcc-5b005e86c8c45aa84c090064b2f789c802384fc5.tar.gz
[PR lto/81430] Revert "Add nvptx_override_options_after_change"
This reverts r250421; properly fixed by r250852. PR lto/81430 * config/nvptx/nvptx.c (nvptx_override_options_after_change): Remove function. (TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE): Remove definition. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@251053 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/nvptx/nvptx.c14
2 files changed, 7 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2975655d248..295b4c9629a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-11 Thomas Schwinge <thomas@codesourcery.com>
+
+ PR lto/81430
+ * config/nvptx/nvptx.c (nvptx_override_options_after_change):
+ Remove function.
+ (TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE): Remove definition.
+
2017-08-11 Tamar Christina <tamar.christina@arm.com>
* config/aarch64/aarch64.md (mov<mode>): Change.
(*movhf_aarch64, *movsf_aarch64, *movdf_aarch64):
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index ffd50d781f0..8babac75bc3 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -212,17 +212,6 @@ nvptx_option_override (void)
target_flags |= MASK_SOFT_STACK | MASK_UNIFORM_SIMT;
}
-/* Implement TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE. */
-
-static void
-nvptx_override_options_after_change (void)
-{
- /* This is a workaround for PR81430 - nvptx acceleration compilation broken
- because of running pass_partition_blocks. This should be dealt with in the
- common code, not in the target. */
- flag_reorder_blocks_and_partition = 0;
-}
-
/* Return a ptx type for MODE. If PROMOTE, then use .u32 for QImode to
deal with ptx ideosyncracies. */
@@ -5527,9 +5516,6 @@ nvptx_data_alignment (const_tree type, unsigned int basic_align)
#undef TARGET_OPTION_OVERRIDE
#define TARGET_OPTION_OVERRIDE nvptx_option_override
-#undef TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE
-#define TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE nvptx_override_options_after_change
-
#undef TARGET_ATTRIBUTE_TABLE
#define TARGET_ATTRIBUTE_TABLE nvptx_attribute_table