public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* Fix ARM GAS tests for non-ELF based ports
@ 2006-04-16 18:16 Nick Clifton
  2006-04-19 23:48 ` Paul Brook
  0 siblings, 1 reply; 3+ messages in thread
From: Nick Clifton @ 2006-04-16 18:16 UTC (permalink / raw)
  To: binutils, paul

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

Hi Guys,

  A number of the new ARM GAS tests are failing for non-ELF based
  targets (eg: arm-pe) because they use ELF specific pseudo-ops,
  usually .arch.  I am applying the attached patch to ensure that
  these tests are skipped for such targets.

Cheers
  Nick

gas/testsuite/ChangeLog
2006-04-16  Nick Clifton  <nickc@redhat.com>

	* gas/arm/arch7.d: Skip test for non-ELF targets.
	* gas/arm/blx-local.d: Likewise.
	* gas/arm/svc.d: Likewise.
	* gas/arm/thumb2_bcond.d: Likewise.
	* gas/arm/thumb2_it_bad.d: Likewise.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: arm.tests.patch --]
[-- Type: text/x-patch, Size: 2893 bytes --]

Index: gas/testsuite/gas/arm/arch7.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/arch7.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 arch7.d
*** gas/testsuite/gas/arm/arch7.d	24 Feb 2006 15:36:36 -0000	1.1
--- gas/testsuite/gas/arm/arch7.d	16 Apr 2006 11:44:22 -0000
***************
*** 1,5 ****
--- 1,6 ----
  #name: ARM V7 instructions
  #as: -march=armv7r
+ #skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
  #objdump: -dr --prefix-addresses --show-raw-insn
  
  .*: +file format .*arm.*
Index: gas/testsuite/gas/arm/blx-local.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/blx-local.d,v
retrieving revision 1.2
diff -c -3 -p -r1.2 blx-local.d
*** gas/testsuite/gas/arm/blx-local.d	7 Apr 2006 15:08:04 -0000	1.2
--- gas/testsuite/gas/arm/blx-local.d	16 Apr 2006 11:44:22 -0000
***************
*** 1,5 ****
--- 1,6 ----
  #name: Local BLX instructions
  #objdump: -dr --prefix-addresses --show-raw-insn
+ #skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
  #as:
  
  # Test assembler resolution of blx instructions.
Index: gas/testsuite/gas/arm/svc.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/svc.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 svc.d
*** gas/testsuite/gas/arm/svc.d	16 Mar 2006 15:08:47 -0000	1.1
--- gas/testsuite/gas/arm/svc.d	16 Apr 2006 11:44:22 -0000
***************
*** 1,5 ****
--- 1,6 ----
  # name: SWI/SVC instructions
  # objdump: -dr --prefix-addresses --show-raw-insn
+ # skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
  
  .*: +file format .*arm.*
  
Index: gas/testsuite/gas/arm/thumb2_bcond.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/thumb2_bcond.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 thumb2_bcond.d
*** gas/testsuite/gas/arm/thumb2_bcond.d	20 Mar 2006 15:38:02 -0000	1.1
--- gas/testsuite/gas/arm/thumb2_bcond.d	16 Apr 2006 11:44:22 -0000
***************
*** 1,5 ****
--- 1,6 ----
  # as:
  # objdump: -dr --prefix-addresses --show-raw-insn
+ # skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
  
  .*: +file format .*arm.*
  
Index: gas/testsuite/gas/arm/thumb2_it_bad.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/thumb2_it_bad.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 thumb2_it_bad.d
*** gas/testsuite/gas/arm/thumb2_it_bad.d	20 Mar 2006 15:38:02 -0000	1.1
--- gas/testsuite/gas/arm/thumb2_it_bad.d	16 Apr 2006 11:44:22 -0000
***************
*** 1,3 ****
--- 1,4 ----
  #name: Invalid IT instructions
  #as:
+ #skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
  #error-output: thumb2_it_bad.l

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Fix ARM GAS tests for non-ELF based ports
  2006-04-16 18:16 Fix ARM GAS tests for non-ELF based ports Nick Clifton
@ 2006-04-19 23:48 ` Paul Brook
  2006-04-20 14:33   ` Nick Clifton
  0 siblings, 1 reply; 3+ messages in thread
From: Paul Brook @ 2006-04-19 23:48 UTC (permalink / raw)
  To: binutils; +Cc: Nick Clifton

On Sunday 16 April 2006 12:45, Nick Clifton wrote:
> Hi Guys,
>
>   A number of the new ARM GAS tests are failing for non-ELF based
>   targets (eg: arm-pe) because they use ELF specific pseudo-ops,
>   usually .arch.  I am applying the attached patch to ensure that
>   these tests are skipped for such targets.

There's no good reason why .arch is ELF specific.

The patch below makes the .arch, .cpu and .fpu directives for all targets, and 
removes the corresponding skips.

Tested with cross to arm-eabi and arm-pe.
Ok?

Paul

2005-04-19  Paul Brook  <paul@codesourcery.com>

gas/
	* config/tc-arm.c (s_arm_arch, s_arm_cpu, s_arm_fpu): Enable for
	all targets.
	(md_pseudo_table): Enable .arch, .cpu and .fpu for all targets.
gas/testsuite/
	* gas/arm/arch7.d: Remove skip.
	* gas/arm/svc.d: Ditto.
	* gas/arm/thumb2_bcond.d: Ditto.
	* gas/arm/thumb2_it_bad.d: Ditto.

Index: gas/config/tc-arm.c
===================================================================
RCS file: /var/cvsroot/src-cvs/src/gas/config/tc-arm.c,v
retrieving revision 1.256
diff -u -p -r1.256 tc-arm.c
--- gas/config/tc-arm.c	7 Apr 2006 15:11:19 -0000	1.256
+++ gas/config/tc-arm.c	19 Apr 2006 15:04:36 -0000
@@ -2956,11 +2956,11 @@ bad:
   as_bad (_("expected <tag> , <value>"));
   ignore_rest_of_line ();
 }
+#endif /* OBJ_ELF */
 
 static void s_arm_arch (int);
 static void s_arm_cpu (int);
 static void s_arm_fpu (int);
-#endif /* OBJ_ELF */
 
 /* This table describes all the machine specific pseudo-ops the assembler
    has to support.  The fields are:
@@ -2985,6 +2985,9 @@ const pseudo_typeS md_pseudo_table[] =
   { "ltorg",	   s_ltorg,	  0 },
   { "pool",	   s_ltorg,	  0 },
   { "syntax",	   s_syntax,	  0 },
+  { "cpu",	   s_arm_cpu,	  0 },
+  { "arch",	   s_arm_arch,	  0 },
+  { "fpu",	   s_arm_fpu,	  0 },
 #ifdef OBJ_ELF
   { "word",	   s_arm_elf_cons, 4 },
   { "long",	   s_arm_elf_cons, 4 },
@@ -3000,9 +3003,6 @@ const pseudo_typeS md_pseudo_table[] =
   { "pad",		s_arm_unwind_pad,	0 },
   { "setfp",		s_arm_unwind_setfp,	0 },
   { "unwind_raw",	s_arm_unwind_raw,	0 },
-  { "cpu",		s_arm_cpu,		0 },
-  { "arch",		s_arm_arch,		0 },
-  { "fpu",		s_arm_fpu,		0 },
   { "eabi_attribute",	s_arm_eabi_attribute,	0 },
 #else
   { "word",	   cons, 4},
@@ -13909,6 +13909,7 @@ arm_md_end (void)
   p = frag_more (size);
   elf32_arm_set_eabi_attr_contents (stdoutput, (bfd_byte *)p, size);
 }
+#endif /* OBJ_ELF */
 
 
 /* Parse a .cpu directive.  */
@@ -14015,5 +14016,4 @@ s_arm_fpu (int ignored ATTRIBUTE_UNUSED)
   *input_line_pointer = saved_char;
   ignore_rest_of_line ();
 }
-#endif /* OBJ_ELF */
 
Index: gas/testsuite/gas/arm/arch7.d
===================================================================
RCS file: /var/cvsroot/src-cvs/src/gas/testsuite/gas/arm/arch7.d,v
retrieving revision 1.2
diff -u -p -r1.2 arch7.d
--- gas/testsuite/gas/arm/arch7.d	16 Apr 2006 11:53:00 -0000	1.2
+++ gas/testsuite/gas/arm/arch7.d	19 Apr 2006 16:30:20 -0000
@@ -1,6 +1,5 @@
 #name: ARM V7 instructions
 #as: -march=armv7r
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*arm.*
Index: gas/testsuite/gas/arm/svc.d
===================================================================
RCS file: /var/cvsroot/src-cvs/src/gas/testsuite/gas/arm/svc.d,v
retrieving revision 1.2
diff -u -p -r1.2 svc.d
--- gas/testsuite/gas/arm/svc.d	16 Apr 2006 11:53:00 -0000	1.2
+++ gas/testsuite/gas/arm/svc.d	19 Apr 2006 16:30:20 -0000
@@ -1,6 +1,5 @@
 # name: SWI/SVC instructions
 # objdump: -dr --prefix-addresses --show-raw-insn
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
Index: gas/testsuite/gas/arm/thumb2_bcond.d
===================================================================
RCS file: /var/cvsroot/src-cvs/src/gas/testsuite/gas/arm/thumb2_bcond.d,v
retrieving revision 1.2
diff -u -p -r1.2 thumb2_bcond.d
--- gas/testsuite/gas/arm/thumb2_bcond.d	16 Apr 2006 11:53:00 -0000	1.2
+++ gas/testsuite/gas/arm/thumb2_bcond.d	19 Apr 2006 16:30:20 -0000
@@ -1,6 +1,5 @@
 # as:
 # objdump: -dr --prefix-addresses --show-raw-insn
-# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
Index: gas/testsuite/gas/arm/thumb2_it_bad.d
===================================================================
RCS file: /var/cvsroot/src-cvs/src/gas/testsuite/gas/arm/thumb2_it_bad.d,v
retrieving revision 1.2
diff -u -p -r1.2 thumb2_it_bad.d
--- gas/testsuite/gas/arm/thumb2_it_bad.d	16 Apr 2006 11:53:00 -0000	1.2
+++ gas/testsuite/gas/arm/thumb2_it_bad.d	19 Apr 2006 16:30:20 -0000
@@ -1,4 +1,3 @@
 #name: Invalid IT instructions
 #as:
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 #error-output: thumb2_it_bad.l

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Fix ARM GAS tests for non-ELF based ports
  2006-04-19 23:48 ` Paul Brook
@ 2006-04-20 14:33   ` Nick Clifton
  0 siblings, 0 replies; 3+ messages in thread
From: Nick Clifton @ 2006-04-20 14:33 UTC (permalink / raw)
  To: Paul Brook; +Cc: binutils

Hi Paul,

> There's no good reason why .arch is ELF specific.

I'd hoped that that was the case.

> The patch below makes the .arch, .cpu and .fpu directives for all targets, and 
> removes the corresponding skips.
> 
> Tested with cross to arm-eabi and arm-pe.
> Ok?
Sure.


> 2005-04-19  Paul Brook  <paul@codesourcery.com>
> 
> gas/
> 	* config/tc-arm.c (s_arm_arch, s_arm_cpu, s_arm_fpu): Enable for
> 	all targets.
> 	(md_pseudo_table): Enable .arch, .cpu and .fpu for all targets.
> gas/testsuite/
> 	* gas/arm/arch7.d: Remove skip.
> 	* gas/arm/svc.d: Ditto.
> 	* gas/arm/thumb2_bcond.d: Ditto.
> 	* gas/arm/thumb2_it_bad.d: Ditto.

Approved - please apply.

Cheers
   Nick

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2006-04-20 10:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-04-16 18:16 Fix ARM GAS tests for non-ELF based ports Nick Clifton
2006-04-19 23:48 ` Paul Brook
2006-04-20 14:33   ` Nick Clifton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).