This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: PATCH: Skip x32 tests for Solaris
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: "H.J. Lu" <hjl dot tools at gmail dot com>
- Cc: binutils at sourceware dot org
- Date: Fri, 24 Aug 2012 10:58:52 -0700
- Subject: Re: PATCH: Skip x32 tests for Solaris
- References: <20120824174353.GA21828@intel.com>
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
On Fri, Aug 24, 2012 at 10:43:53AM -0700, H.J. Lu wrote:
> Hi,
>
> I checked in this patch to skip x32 tests for Solaris.
>
>
> H.J.
> --
> diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
> index 129e62f..735e0b4 100644
> --- a/gas/testsuite/ChangeLog
> +++ b/gas/testsuite/ChangeLog
> @@ -1,3 +1,10 @@
> +2012-08-24 H.J. Lu <hongjiu.lu@intel.com>
> +
> + * gas/i386/ilp32/ilp32.exp: Skip Solaris.
> + * gas/i386/ilp32/cfi/ilp32.exp: Likewise.
> + * gas/i386/ilp32/elf/ilp32.exp: Likewise.
> + * gas/i386/ilp32/lns/ilp32.exp: Likewise.
> +
Hi,
I checked in this patch to properly check x32 support.
H.J.
---
Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/gas/testsuite/ChangeLog,v
retrieving revision 1.2106
diff -u -p -r1.2106 ChangeLog
--- ChangeLog 24 Aug 2012 17:42:54 -0000 1.2106
+++ ChangeLog 24 Aug 2012 17:57:13 -0000
@@ -1,5 +1,14 @@
2012-08-24 H.J. Lu <hongjiu.lu@intel.com>
+ * gas/i386/ilp32/ilp32.exp (gas_64_check): Renamed to ...
+ (gas_x32_check): This. Check elf32-x86-64.
+ Remove Solaris check.
+ * gas/i386/ilp32/cfi/ilp32.exp: Likewise.
+ * gas/i386/ilp32/elf/ilp32.exp: Likewise.
+ * gas/i386/ilp32/lns/ilp32.exp: Likewise.
+
+2012-08-24 H.J. Lu <hongjiu.lu@intel.com>
+
* gas/i386/ilp32/ilp32.exp: Skip Solaris.
* gas/i386/ilp32/cfi/ilp32.exp: Likewise.
* gas/i386/ilp32/elf/ilp32.exp: Likewise.
Index: gas/i386/ilp32/ilp32.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/i386/ilp32/ilp32.exp,v
retrieving revision 1.9
diff -u -p -r1.9 ilp32.exp
--- gas/i386/ilp32/ilp32.exp 24 Aug 2012 17:42:55 -0000 1.9
+++ gas/i386/ilp32/ilp32.exp 24 Aug 2012 17:57:13 -0000
@@ -1,19 +1,15 @@
#
# x86-64 ILP32 tests
#
-proc gas_64_check { } {
+proc gas_x32_check { } {
global NM
global NMFLAGS
set status [gas_host_run "$NM $NMFLAGS --help" ""]
- return [regexp "targets:.*x86-64" [lindex $status 1]];
+ return [regexp "targets:.*elf32-x86-64" [lindex $status 1]];
}
-if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then {
- return
-}
-
-if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then {
+if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_x32_check] && [is_elf_format]] then {
global ASFLAGS
set old_ASFLAGS "$ASFLAGS"
Index: gas/i386/ilp32/cfi/ilp32.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp,v
retrieving revision 1.3
diff -u -p -r1.3 ilp32.exp
--- gas/i386/ilp32/cfi/ilp32.exp 24 Aug 2012 17:42:55 -0000 1.3
+++ gas/i386/ilp32/cfi/ilp32.exp 24 Aug 2012 17:57:13 -0000
@@ -1,19 +1,15 @@
#
# x86-64 ILP32 tests
#
-proc gas_64_check { } {
+proc gas_x32_check { } {
global NM
global NMFLAGS
set status [gas_host_run "$NM $NMFLAGS --help" ""]
- return [regexp "targets:.*x86-64" [lindex $status 1]];
+ return [regexp "targets:.*elf32-x86-64" [lindex $status 1]];
}
-if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then {
- return
-}
-
-if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then {
+if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_x32_check] && [is_elf_format]] then {
global ASFLAGS
set old_ASFLAGS "$ASFLAGS"
Index: gas/i386/ilp32/elf/ilp32.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp,v
retrieving revision 1.3
diff -u -p -r1.3 ilp32.exp
--- gas/i386/ilp32/elf/ilp32.exp 24 Aug 2012 17:42:55 -0000 1.3
+++ gas/i386/ilp32/elf/ilp32.exp 24 Aug 2012 17:57:13 -0000
@@ -1,19 +1,15 @@
#
# x86-64 ILP32 tests
#
-proc gas_64_check { } {
+proc gas_x32_check { } {
global NM
global NMFLAGS
set status [gas_host_run "$NM $NMFLAGS --help" ""]
- return [regexp "targets:.*x86-64" [lindex $status 1]];
+ return [regexp "targets:.*elf32-x86-64" [lindex $status 1]];
}
-if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then {
- return
-}
-
-if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then {
+if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_x32_check] && [is_elf_format]] then {
global ASFLAGS
set old_ASFLAGS "$ASFLAGS"
Index: gas/i386/ilp32/lns/ilp32.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp,v
retrieving revision 1.3
diff -u -p -r1.3 ilp32.exp
--- gas/i386/ilp32/lns/ilp32.exp 24 Aug 2012 17:42:56 -0000 1.3
+++ gas/i386/ilp32/lns/ilp32.exp 24 Aug 2012 17:57:13 -0000
@@ -1,19 +1,15 @@
#
# x86-64 ILP32 tests
#
-proc gas_64_check { } {
+proc gas_x32_check { } {
global NM
global NMFLAGS
set status [gas_host_run "$NM $NMFLAGS --help" ""]
- return [regexp "targets:.*x86-64" [lindex $status 1]];
+ return [regexp "targets:.*elf32-x86-64" [lindex $status 1]];
}
-if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then {
- return
-}
-
-if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then {
+if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_x32_check] && [is_elf_format]] then {
global ASFLAGS
set old_ASFLAGS "$ASFLAGS"