* sparc.h (ASM_OUTPUT_MI_THUNK): Move %o7 through %g1 instead of

save+restore.  Fix pic+big_offset delay slot.  Use "pic" case for
unix always, since we want to be able to thunk to functions in a
shared library from an application.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c619c03..b2043d1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 30 00:04:49 1997  Richard Henderson  <rth@cygnus.com>
+
+       * sparc.h (ASM_OUTPUT_MI_THUNK): Move %o7 through %g1 instead of
+       save+restore.  Fix pic+big_offset delay slot.  Use "pic" case for
+       unix always, since we want to be able to thunk to functions in a
+       shared library from an application.
+
 Mon Dec 29 14:37:31 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * mips/t-ecoff (CROSS_LIBGCC1): Define to libgcc1-asm.a.

diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index e87058c..2cc8b95 100644 (file)
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -3017,11 +3017,15 @@ do {                                                                    \
   int big_delta = (DELTA) >= 4096 || (DELTA) < -4096;                  \
   if (big_delta)                                                       \
     fprintf (FILE, "\tset %d,%%g1\n\tadd %%o0,%%g1,%%o0\n", (DELTA));  \
-  if (flag_pic)                                                                \
+  /* Don't use the jmp solution unless we know the target is local to  \
+     the application or shared object.                                 \
+     XXX: Wimp out and don't actually check anything except if this is \
+     an embedded target where we assume there are no shared libs.  */  \
+  if (!TARGET_CM_EMBMEDANY || flag_pic)                                        \
     {                                                                  \
       if (! big_delta)                                                 \
        fprintf (FILE, "\tadd %%o0,%d,%%o0\n", DELTA);                  \
-      fprintf (FILE, "\tsave %%sp,-112,%%sp\n");                       \
+      fprintf (FILE, "\tmov %%o7,%%g1\n");                             \
       fprintf (FILE, "\tcall ");                                       \
       assemble_name                                                    \
        (FILE, IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (FUNCTION)));    \
@@ -3044,10 +3048,10 @@ do {                                                                    \
        (FILE, IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (FUNCTION)));    \
       fprintf (FILE, ")\n");                                           \
     }                                                                  \
-  if (big_delta)                                                       \
+  if (!TARGET_CM_EMBMEDANY || flag_pic)                                        \
+    fprintf (FILE, "\tmov %%g1,%%o7\n");                               \
+  else if (big_delta)                                                  \
     fprintf (FILE, "\tnop\n");                                         \
-  else if (flag_pic)                                                   \
-    fprintf (FILE, "\trestore\n");                                     \
   else                                                                 \
     fprintf (FILE, "\tadd %%o0,%d,%%o0\n", DELTA);                     \
 } while (0)