PR gas/12296

	* arm.h (ARM_AEXT_V7_ARM): Add ARM_EXT_OS.

	* gas/arm/arch7.s: Add SVC insn.
	* gas/arm/arch7.d: Add disassembly of SVC insn.
	* gas/arm/attr-march-armv7.d: Add arch profile tag.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d77b730a2ea1849039571b2355ea23c5ea9138fc..43b6091b999fb409d28469ad7e4108221f08c477 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-11  Dan McDonald  <dan@wellkeeper.com>
+
+       PR gas/12296
+       * gas/arm/arch7.s: Add SVC insn.
+       * gas/arm/arch7.d: Add disassembly of SVC insn.
+       * gas/arm/attr-march-armv7.d: Add arch profile tag.
+
 2011-04-06  Joseph Myers  <joseph@codesourcery.com>
 
        * gas/all/gas.exp (*arm*-*-coff): Change to arm*-*-coff.

diff --git a/gas/testsuite/gas/arm/arch7.d b/gas/testsuite/gas/arm/arch7.d
index 0c0b3e8273cdd70c76a2524266e169b8dd2b0549..4f9d9aa19c75534c90a3c9b680491dae718b189c 100644 (file)
--- a/gas/testsuite/gas/arm/arch7.d
+++ b/gas/testsuite/gas/arm/arch7.d
@@ -76,3 +76,4 @@ Disassembly of section .text:
 0+10c <[^>]*> f380 8814        msr     CONTROL, r0
 0+110 <[^>]*> f3ef 8003        mrs     r0, PSR
 0+114 <[^>]*> f380 8803        msr     PSR, r0
+0+118 <[^>]*> df00             svc     0

diff --git a/gas/testsuite/gas/arm/arch7.s b/gas/testsuite/gas/arm/arch7.s
index 4f00f5fa610c8bfb25e28747383a7e0d81c2e737..e1a2ed0dc5b4aac95bbf826edb02fa18eae4b883 100644 (file)
--- a/gas/testsuite/gas/arm/arch7.s
+++ b/gas/testsuite/gas/arm/arch7.s
@@ -79,3 +79,5 @@ label2:
        msr     control, r0
        mrs     r0, xpsr
        msr     xpsr, r0
+
+       svc     0

diff --git a/gas/testsuite/gas/arm/attr-march-armv7.d b/gas/testsuite/gas/arm/attr-march-armv7.d
index 57e021e1fae2c0e04d5af71833583317240981ed..c6bd0d4bdaed461dab63f4fb270208edd7478b0c 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7.d
@@ -9,5 +9,6 @@ Attribute Section: aeabi
 File Attributes
   Tag_CPU_name: "7"
   Tag_CPU_arch: v7
+  Tag_CPU_arch_profile: Microcontroller
   Tag_THUMB_ISA_use: Thumb-2
   Tag_DIV_use: Not allowed

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index fe8506931ef469656cb0a40af26651c4d9fba034..537a0601d604a7ecbad9b642b0622b82346e05d5 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-11  Dan McDonald  <dan@wellkeeper.com>
+
+       PR gas/12296
+       * arm.h (ARM_AEXT_V7_ARM): Add ARM_EXT_OS.
+
 2011-03-22  Eric B. Weddington  <eric.weddington@atmel.com>
 
        * avr.h (AVR_ISA_SPMX,AVR_ISA_DES,AVR_ISA_M256,AVR_ISA_XMEGA):

diff --git a/include/opcode/arm.h b/include/opcode/arm.h
index 50bc726a60fcff0ed602ded0a06952c22b4a0dbc..c6fb22014c6c7bc6b8897d993ca4ab9a1a17a489 100644 (file)
--- a/include/opcode/arm.h
+++ b/include/opcode/arm.h
@@ -1,5 +1,5 @@
 /* ARM assembler/disassembler support.
-   Copyright 2004, 2010 Free Software Foundation, Inc.
+   Copyright 2004, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GDB and GAS.
 
@@ -109,7 +109,8 @@
 #define ARM_AEXT_V6KT2  (ARM_AEXT_V6T2 | ARM_EXT_V6K)
 #define ARM_AEXT_V6ZT2  (ARM_AEXT_V6T2 | ARM_EXT_SEC)
 #define ARM_AEXT_V6ZKT2 (ARM_AEXT_V6T2 | ARM_EXT_V6K | ARM_EXT_SEC)
-#define ARM_AEXT_V7_ARM        (ARM_AEXT_V6KT2 | ARM_EXT_V7 | ARM_EXT_BARRIER)
+#define ARM_AEXT_V7_ARM        (ARM_AEXT_V6KT2 | ARM_EXT_V7 | ARM_EXT_BARRIER \
+    | ARM_EXT_OS)
 #define ARM_AEXT_V7A   (ARM_AEXT_V7_ARM | ARM_EXT_V7A)
 #define ARM_AEXT_V7R   (ARM_AEXT_V7_ARM | ARM_EXT_V7R | ARM_EXT_DIV)
 #define ARM_AEXT_NOTM \
@@ -148,7 +149,7 @@
                          | FPU_VFP_EXT_V3 | FPU_NEON_EXT_V1 | FPU_VFP_EXT_D32)
 #define FPU_FPA                (FPU_FPA_EXT_V1 | FPU_FPA_EXT_V2)
 
-/* Deprecated */
+/* Deprecated.  */
 #define FPU_ARCH_VFP   ARM_FEATURE (0, FPU_ENDIAN_PURE)
 
 #define FPU_ARCH_FPE   ARM_FEATURE (0, FPU_FPA_EXT_V1)