diff mbox

[MIPS] Modify sysroot layout for mips-mti-* and mips-img-*

Message ID 1434472544.20199.214.camel@ubuntu-sellcey
State New
Headers show

Commit Message

Steve Ellcey June 16, 2015, 4:35 p.m. UTC
As follow-up to this patch, I forgot to include a testsuite patch to two
mips specific tests that fail with the new layout.  These tests are
loongson specific and have includes of system headers in them.   The way
mips.exp in testsuite/gcc.target/mips works is that for runnable tests
requiring a specific ABI that is incompatible with the ABI being tested
the test is converted to an assemble only test.  With the old layouts
for mips-mti-linux* and mips-img-linux*, this was no problem because
there was a single copy of /usr/include in sysroot used by all
compilations.  With the new layout there are multiple copies
of /usr/include under each of the various system sysroots and if the ABI
does not match any of those than the test will not know where to find
the include files.  Since there are only two of these tests and I could
not think of a clean way to make the tests work on the mti or img
toolchains I just added a target option to skip them for the mti and img
toolchains.

I ran this by Matthew and got his OK so I will check this patch in along
with the patch to change the sysroot layout.

Steve Ellcey
sellcey@imgtec.com

2015-06-16  Steve Ellcey  <sellcey@imgtec.com>

	* gcc.target/mips/loongson-shift-count-truncated-1.c:
	Skip on mips*-mti-linux* and mips*-img-linux* targets.
	* gcc.target/mips/loongson-simd.c: Ditto.

Comments

Matthew Fortune June 16, 2015, 4:40 p.m. UTC | #1
Steve Ellcey <Steve.Ellcey@imgtec.com> writes:
> As follow-up to this patch, I forgot to include a testsuite patch to two
> mips specific tests that fail with the new layout.  These tests are
> loongson specific and have includes of system headers in them.   The way
> mips.exp in testsuite/gcc.target/mips works is that for runnable tests
> requiring a specific ABI that is incompatible with the ABI being tested
> the test is converted to an assemble only test.  With the old layouts
> for mips-mti-linux* and mips-img-linux*, this was no problem because
> there was a single copy of /usr/include in sysroot used by all
> compilations.  With the new layout there are multiple copies
> of /usr/include under each of the various system sysroots and if the ABI
> does not match any of those than the test will not know where to find
> the include files.  Since there are only two of these tests and I could
> not think of a clean way to make the tests work on the mti or img
> toolchains I just added a target option to skip them for the mti and img
> toolchains.
> 
> I ran this by Matthew and got his OK so I will check this patch in along
> with the patch to change the sysroot layout.

Agreed, I see no way to avoid this.

Thanks,
Matthew
diff mbox

Patch

diff --git a/gcc/testsuite/gcc.target/mips/loongson-shift-count-truncated-1.c b/gcc/testsuite/gcc.target/mips/loongson-shift-count-truncated-1.c
index 778d739..f57a18c 100644
--- a/gcc/testsuite/gcc.target/mips/loongson-shift-count-truncated-1.c
+++ b/gcc/testsuite/gcc.target/mips/loongson-shift-count-truncated-1.c
@@ -1,6 +1,6 @@ 
 /* Test case for SHIFT_COUNT_TRUNCATED on Loongson.  */
 
-/* { dg-do run } */
+/* { dg-do run { target { ! { mips*-mti-linux* mips*-img-linux* } } } } */
 /* loongson.h does not handle or check for MIPS16ness.  There doesn't
    seem any good reason for it to, given that the Loongson processors
    do not support MIPS16.  */
diff --git a/gcc/testsuite/gcc.target/mips/loongson-simd.c b/gcc/testsuite/gcc.target/mips/loongson-simd.c
index 3d72e93..6d2ceb6 100644
--- a/gcc/testsuite/gcc.target/mips/loongson-simd.c
+++ b/gcc/testsuite/gcc.target/mips/loongson-simd.c
@@ -18,7 +18,7 @@  You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-/* { dg-do run } */
+/* { dg-do run { target { ! { mips*-mti-linux* mips*-img-linux* } } } } */
 /* loongson.h does not handle or check for MIPS16ness or
    microMIPSness.  There doesn't seem any good reason for it to, given
    that the Loongson processors do not support either.  The effective target