6 files changed, 28 insertions, 19 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0805241..477f372 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-01  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* gcc.target/mips/ext-3.c: Add NOMIPS16.
+	* gcc.target/mips/ext-4.c: Likewise.
+	* gcc.target/mips/interrupt_handler.c: Likewise.
+	* gcc.target/mips/truncate-4.c: Likewise.
+	* gcc.target/mips/truncate-5.c: Likewise.
+
 2009-08-01  Sebastian Pop  <sebastian.pop@amd.com>
 
 	* gcc.dg/graphite/graphite_autopar/graphite_autopar.exp: Rename
diff --git a/gcc/testsuite/gcc.target/mips/ext-3.c b/gcc/testsuite/gcc.target/mips/ext-3.c
index 557a8bc..acdbbc9 100644
--- a/gcc/testsuite/gcc.target/mips/ext-3.c
+++ b/gcc/testsuite/gcc.target/mips/ext-3.c
@@ -4,7 +4,7 @@
 /* { dg-final { scan-assembler "\tdext\t" } } */
 /* { dg-final { scan-assembler-not "sll" } } */
 
-unsigned long long
+NOMIPS16 unsigned long long
 f (unsigned *i)
 {
   unsigned j = *i;
diff --git a/gcc/testsuite/gcc.target/mips/ext-4.c b/gcc/testsuite/gcc.target/mips/ext-4.c
index 15e2029..f3d2ad9 100644
--- a/gcc/testsuite/gcc.target/mips/ext-4.c
+++ b/gcc/testsuite/gcc.target/mips/ext-4.c
@@ -4,7 +4,7 @@
 /* { dg-final { scan-assembler "\tdext\t" } } */
 /* { dg-final { scan-assembler-not "sll" } } */
 
-unsigned long long
+NOMIPS16 unsigned long long
 f (unsigned long long i)
 {
   return i & 0xffffffffull;
diff --git a/gcc/testsuite/gcc.target/mips/interrupt_handler.c b/gcc/testsuite/gcc.target/mips/interrupt_handler.c
index 35ee1d2..073c772 100644
--- a/gcc/testsuite/gcc.target/mips/interrupt_handler.c
+++ b/gcc/testsuite/gcc.target/mips/interrupt_handler.c
@@ -4,20 +4,20 @@
 
 void f () { }
 
-void __attribute__ ((interrupt)) v0 () { }
-void __attribute__ ((interrupt, use_shadow_register_set)) v1 () { }
-void __attribute__ ((interrupt, keep_interrupts_masked)) v2 () { }
-void __attribute__ ((interrupt, use_debug_exception_return)) v3 () { }
-void __attribute__ ((interrupt, use_shadow_register_set, keep_interrupts_masked)) v4 () { }
-void __attribute__ ((interrupt, use_shadow_register_set, use_debug_exception_return)) v5 () { }
-void __attribute__ ((interrupt, keep_interrupts_masked, use_debug_exception_return)) v6 () { }
-void __attribute__ ((interrupt, use_shadow_register_set, keep_interrupts_masked, use_debug_exception_return)) v7 () { }
+NOMIPS16 void __attribute__ ((interrupt)) v0 () { }
+NOMIPS16 void __attribute__ ((interrupt, use_shadow_register_set)) v1 () { }
+NOMIPS16 void __attribute__ ((interrupt, keep_interrupts_masked)) v2 () { }
+NOMIPS16 void __attribute__ ((interrupt, use_debug_exception_return)) v3 () { }
+NOMIPS16 void __attribute__ ((interrupt, use_shadow_register_set, keep_interrupts_masked)) v4 () { }
+NOMIPS16 void __attribute__ ((interrupt, use_shadow_register_set, use_debug_exception_return)) v5 () { }
+NOMIPS16 void __attribute__ ((interrupt, keep_interrupts_masked, use_debug_exception_return)) v6 () { }
+NOMIPS16 void __attribute__ ((interrupt, use_shadow_register_set, keep_interrupts_masked, use_debug_exception_return)) v7 () { }
 
-void __attribute__ ((interrupt)) w0 () { t(); }
-void __attribute__ ((interrupt, use_shadow_register_set)) w1 () { t(); }
-void __attribute__ ((interrupt, keep_interrupts_masked)) w2 () { t(); }
-void __attribute__ ((interrupt, use_debug_exception_return)) w3 () { t(); }
-void __attribute__ ((interrupt, use_shadow_register_set, keep_interrupts_masked)) w4 () { t(); }
-void __attribute__ ((interrupt, use_shadow_register_set, use_debug_exception_return)) w5 () { t(); }
-void __attribute__ ((interrupt, keep_interrupts_masked, use_debug_exception_return)) w6 () { t(); }
-void __attribute__ ((interrupt, use_shadow_register_set, keep_interrupts_masked, use_debug_exception_return)) w7 () { t(); }
+NOMIPS16 void __attribute__ ((interrupt)) w0 () { t(); }
+NOMIPS16 void __attribute__ ((interrupt, use_shadow_register_set)) w1 () { t(); }
+NOMIPS16 void __attribute__ ((interrupt, keep_interrupts_masked)) w2 () { t(); }
+NOMIPS16 void __attribute__ ((interrupt, use_debug_exception_return)) w3 () { t(); }
+NOMIPS16 void __attribute__ ((interrupt, use_shadow_register_set, keep_interrupts_masked)) w4 () { t(); }
+NOMIPS16 void __attribute__ ((interrupt, use_shadow_register_set, use_debug_exception_return)) w5 () { t(); }
+NOMIPS16 void __attribute__ ((interrupt, keep_interrupts_masked, use_debug_exception_return)) w6 () { t(); }
+NOMIPS16 void __attribute__ ((interrupt, use_shadow_register_set, keep_interrupts_masked, use_debug_exception_return)) w7 () { t(); }
diff --git a/gcc/testsuite/gcc.target/mips/truncate-4.c b/gcc/testsuite/gcc.target/mips/truncate-4.c
index 2958be8..4c78368 100644
--- a/gcc/testsuite/gcc.target/mips/truncate-4.c
+++ b/gcc/testsuite/gcc.target/mips/truncate-4.c
@@ -2,7 +2,7 @@
 /* { dg-options "-O -mgp64" } */
 /* { dg-final { scan-assembler-not "\tsll\t" } } */
 
-unsigned long long
+NOMIPS16 unsigned long long
 f (unsigned long long s)
 {
   unsigned u = s & 0xfff;
diff --git a/gcc/testsuite/gcc.target/mips/truncate-5.c b/gcc/testsuite/gcc.target/mips/truncate-5.c
index 046ef80..6cdb7f7 100644
--- a/gcc/testsuite/gcc.target/mips/truncate-5.c
+++ b/gcc/testsuite/gcc.target/mips/truncate-5.c
@@ -8,6 +8,7 @@ struct s
   unsigned a:5;
 };
 
+NOMIPS16 void
 f (struct s *s, unsigned long long a)
 {
   s->a = a & 0x3;