* config/mips/mips.c (mips_in_small_data_p): Return false if

	TARGET_ABICALLS.

testsuite/
	* gcc.dg/torture/mips-sdata-1.c: Restrict to mips*-*-elf*.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79060 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4509825..651e3e4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-07  Richard Sandiford  <rsandifo@redhat.com>
+
+       * config/mips/mips.c (mips_in_small_data_p): Return false if
+       TARGET_ABICALLS.
+
 2004-03-06  Stephane Carrez  <stcarrez@nerim.fr>
 
        * config/m68hc11/m68hc11.c (m68hc11_gen_movhi): Use 2,-sp to push

diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index bfd5970..037a25a 100644 (file)
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -7303,6 +7303,11 @@ mips_in_small_data_p (tree decl)
   if (TREE_CODE (decl) == STRING_CST || TREE_CODE (decl) == FUNCTION_DECL)
     return false;
 
+  /* We don't yet generate small-data references for -mabicalls.  See related
+     -G handling in override_options.  */
+  if (TARGET_ABICALLS)
+    return false;
+
   if (TREE_CODE (decl) == VAR_DECL && DECL_SECTION_NAME (decl) != 0)
     {
       const char *name;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9acab5d..45d94f5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-07  Richard Sandiford  <rsandifo@redhat.com>
+
+       * gcc.dg/torture/mips-sdata-1.c: Restrict to mips*-*-elf*.
+
 2004-03-06  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * gcc.dg/20040306-1.c: New test.

diff --git a/gcc/testsuite/gcc.dg/torture/mips-sdata-1.c b/gcc/testsuite/gcc.dg/torture/mips-sdata-1.c
index b665d96..8ffd4d8 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/mips-sdata-1.c
+++ b/gcc/testsuite/gcc.dg/torture/mips-sdata-1.c
@@ -1,6 +1,6 @@
 /* Check that sdata-accesses are applied regardless of size or ABI.  */
 /* { dg-options -mexplicit-relocs } */
-/* { dg-do compile { target mips*-*-* } } */
+/* { dg-do compile { target mips*-*-elf* } } */
 
 struct s { int x[4]; };
 struct s my_struct __attribute__((__section__(".sdata")));