From b06a79b82366a53fffc113f3bb5f873dbc70e381 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Thu, 5 May 2022 21:42:12 +0200
Subject: [PATCH] [PATCH] i386: Cleanup -m32 usage in the testuite.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use conditional compilation for ia32 target istead.

2022-05-05  Uroš Bizjak  <ubizjak@gmail.com>

gcc/testsuite/ChangeLog:

	* gcc.target/i386/pr103611-2.c (dg-do): Compile for target ia32.
	(dg-options): Remove -m32.
	* gcc.target/i386/pr105032.c (dg-do): Compile for taget ia32.
	(dg-additional-options): Remove.
	* gcc.target/i386/pr104732.c (dg-options): Remove -m32.
	* gcc.target/i386/pr99753.c (dg-options): Ditto.
---
 gcc/testsuite/gcc.target/i386/pr103611-2.c | 5 +++--
 gcc/testsuite/gcc.target/i386/pr104732.c   | 2 +-
 gcc/testsuite/gcc.target/i386/pr105032.c   | 3 +--
 gcc/testsuite/gcc.target/i386/pr99753.c    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/gcc.target/i386/pr103611-2.c b/gcc/testsuite/gcc.target/i386/pr103611-2.c
index 1555e997ec8..d966a41f03e 100644
--- a/gcc/testsuite/gcc.target/i386/pr103611-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr103611-2.c
@@ -1,5 +1,6 @@
-/* { dg-do compile } */
-/* { dg-options "-m32 -O2 -msse4" } */
+/* { dg-do compile { target ia32 } } */
+/* { dg-options "-O2 -msse4" } */
+
 typedef int __v4si __attribute__ ((__vector_size__ (16)));
 
 long long test1(__v4si v) {
diff --git a/gcc/testsuite/gcc.target/i386/pr104732.c b/gcc/testsuite/gcc.target/i386/pr104732.c
index c8954366c6d..baa52573c7a 100644
--- a/gcc/testsuite/gcc.target/i386/pr104732.c
+++ b/gcc/testsuite/gcc.target/i386/pr104732.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target ia32 } } */
-/* { dg-options "-O2 -m32 -msse -march=pentiumpro" } */
+/* { dg-options "-O2 -msse -march=pentiumpro" } */
 
 typedef long long v2di __attribute__((vector_size (16)));
 
diff --git a/gcc/testsuite/gcc.target/i386/pr105032.c b/gcc/testsuite/gcc.target/i386/pr105032.c
index 57b21d3cd7a..a45e7555f8f 100644
--- a/gcc/testsuite/gcc.target/i386/pr105032.c
+++ b/gcc/testsuite/gcc.target/i386/pr105032.c
@@ -1,6 +1,5 @@
-/* { dg-do compile } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-w" } */
-/* { dg-additional-options "-m32" { target x86_64-*-* } } */
 
 typedef unsigned int size_t;	
 __extension__ typedef long int __off_t;
diff --git a/gcc/testsuite/gcc.target/i386/pr99753.c b/gcc/testsuite/gcc.target/i386/pr99753.c
index 1b000bd56b6..95ce5916392 100644
--- a/gcc/testsuite/gcc.target/i386/pr99753.c
+++ b/gcc/testsuite/gcc.target/i386/pr99753.c
@@ -1,5 +1,5 @@
 /* PR target/99753 */
 
 /* { dg-do compile } */
-/* { dg-options "-march=amd -m32" } */
+/* { dg-options "-march=amd" } */
 /* { dg-error "bad value 'amd' for '-march=' switch"  "" { target *-*-* } 0 } */