From a08f9f8067b0090f257992cd2610f1e2dca4f9af Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Wed, 7 Dec 2016 01:28:13 +0000 Subject: [PATCH] Fix x86_64-ism in selftest (PR bootstrap/78705) In r243317 I accidentally introduced an assumption in a selftest in i386.c that Pmode == DImode. This patch conditionalizes the overzealous string comparison to avoid breaking the build on 32-bit i386.c targets. gcc/ChangeLog: PR bootstrap/78705 * config/i386/i386.c (selftest::ix86_test_dumping_memory_blockage): Conditionalize the string comparison on Pmode == DImode. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@243332 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/i386.c | 14 ++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 797b7113a8a..d30345f3600 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-12-06 David Malcolm + + PR bootstrap/78705 + * config/i386/i386.c (ix86_test_dumping_memory_blockage): + Conditionalize the string comparison on Pmode == DImode. + 2016-12-06 Tom de Vries PR tree-optimization/67955 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 2e6be02c53f..1cd1cd87477 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -51190,12 +51190,14 @@ ix86_test_dumping_memory_blockage () /* Verify that the repeated references to the SCRATCH show use reuse IDS. The first should be prefixed with a reuse ID, - and the second should be dumped as a "reuse_rtx" of that ID. */ - ASSERT_RTL_DUMP_EQ_WITH_REUSE - ("(cinsn 1 (set (mem/v:BLK (0|scratch:DI) [0 A8])\n" - " (unspec:BLK [\n" - " (mem/v:BLK (reuse_rtx 0) [0 A8])\n" - " ] UNSPEC_MEMORY_BLOCKAGE)))\n", pat, &r); + and the second should be dumped as a "reuse_rtx" of that ID. + The expected string assumes Pmode == DImode. */ + if (Pmode == DImode) + ASSERT_RTL_DUMP_EQ_WITH_REUSE + ("(cinsn 1 (set (mem/v:BLK (0|scratch:DI) [0 A8])\n" + " (unspec:BLK [\n" + " (mem/v:BLK (reuse_rtx 0) [0 A8])\n" + " ] UNSPEC_MEMORY_BLOCKAGE)))\n", pat, &r); } /* Run all target-specific selftests. */ -- 2.11.4.GIT