linux64.h (MD_FALLBACK_FRAME_STATE_FOR): Add i386 support so multilib works again.

2002-06-21  Bo Thorsen  <bo@suse.de>

	* config/i386/linux64.h (MD_FALLBACK_FRAME_STATE_FOR): Add i386
	support so multilib works again. And don't define this at all
	when -Dinhibit_libc is used.

From-SVN: r54872

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e917679fa0c0749c9475d5c402ef1ed39158030f..ccc0179e3998abf71a927f7c2abf5ddf5ffdbb94 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-21  Bo Thorsen  <bo@suse.de>
+
+       * config/i386/linux64.h (MD_FALLBACK_FRAME_STATE_FOR): Add i386
+       support so multilib works again. And don't define this at all
+       when -Dinhibit_libc is used.
+
 Thu Jun 20 16:41:40 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
        * combine.c (gen_lowpart_for_combine): Avoid calling of

diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
index 49269996a9d26d1e11f62a2ab323ed71fd5d357b..61584315d43d87766098a9d35759acb13b7d2069 100644 (file)
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -69,13 +69,16 @@ Boston, MA 02111-1307, USA.  */
 #define MULTILIB_DEFAULTS { "m64" }
 
 /* Do code reading to identify a signal frame, and set the frame
-   state data appropriately.  See unwind-dw2.c for the structs.  */
+   state data appropriately.  See unwind-dw2.c for the structs.  
+   Don't use this at all if inhibit_libc is used.  */
 
+#ifndef inhibit_libc
 #ifdef IN_LIBGCC2
 #include <signal.h>
 #include <sys/ucontext.h>
 #endif
 
+#ifdef __x86_64__
 #define MD_FALLBACK_FRAME_STATE_FOR(CONTEXT, FS, SUCCESS)              \
   do {                                                                 \
     unsigned char *pc_ = (CONTEXT)->ra;                                        \
@@ -132,3 +135,59 @@ Boston, MA 02111-1307, USA.  */
     (FS)->retaddr_column = 16;                                         \
     goto SUCCESS;                                                      \
   } while (0)
+#else /* ifdef __x86_64__  */
+#define MD_FALLBACK_FRAME_STATE_FOR(CONTEXT, FS, SUCCESS)              \
+  do {                                                                 \
+    unsigned char *pc_ = (CONTEXT)->ra;                                        \
+    struct sigcontext *sc_;                                            \
+    long new_cfa_;                                                     \
+                                                                       \
+    /* popl %eax ; movl $__NR_sigreturn,%eax ; int $0x80  */           \
+    if (*(unsigned short *)(pc_+0) == 0xb858                           \
+       && *(unsigned int *)(pc_+2) == 119                              \
+       && *(unsigned short *)(pc_+6) == 0x80cd)                        \
+      sc_ = (CONTEXT)->cfa + 4;                                                \
+    /* movl $__NR_rt_sigreturn,%eax ; int $0x80  */                    \
+    else if (*(unsigned char *)(pc_+0) == 0xb8                         \
+            && *(unsigned int *)(pc_+1) == 173                         \
+            && *(unsigned short *)(pc_+5) == 0x80cd)                   \
+      {                                                                        \
+       struct rt_sigframe {                                            \
+         int sig;                                                      \
+         struct siginfo *pinfo;                                        \
+         void *puc;                                                    \
+         struct siginfo info;                                          \
+         struct ucontext uc;                                           \
+       } *rt_ = (CONTEXT)->cfa;                                        \
+       sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;               \
+      }                                                                        \
+    else                                                               \
+      break;                                                           \
+                                                                       \
+    new_cfa_ = sc_->esp;                                               \
+    (FS)->cfa_how = CFA_REG_OFFSET;                                    \
+    (FS)->cfa_reg = 4;                                                 \
+    (FS)->cfa_offset = new_cfa_ - (long) (CONTEXT)->cfa;               \
+                                                                       \
+    /* The SVR4 register numbering macros aren't usable in libgcc.  */ \
+    (FS)->regs.reg[0].how = REG_SAVED_OFFSET;                          \
+    (FS)->regs.reg[0].loc.offset = (long)&sc_->eax - new_cfa_;         \
+    (FS)->regs.reg[3].how = REG_SAVED_OFFSET;                          \
+    (FS)->regs.reg[3].loc.offset = (long)&sc_->ebx - new_cfa_;         \
+    (FS)->regs.reg[1].how = REG_SAVED_OFFSET;                          \
+    (FS)->regs.reg[1].loc.offset = (long)&sc_->ecx - new_cfa_;         \
+    (FS)->regs.reg[2].how = REG_SAVED_OFFSET;                          \
+    (FS)->regs.reg[2].loc.offset = (long)&sc_->edx - new_cfa_;         \
+    (FS)->regs.reg[6].how = REG_SAVED_OFFSET;                          \
+    (FS)->regs.reg[6].loc.offset = (long)&sc_->esi - new_cfa_;         \
+    (FS)->regs.reg[7].how = REG_SAVED_OFFSET;                          \
+    (FS)->regs.reg[7].loc.offset = (long)&sc_->edi - new_cfa_;         \
+    (FS)->regs.reg[5].how = REG_SAVED_OFFSET;                          \
+    (FS)->regs.reg[5].loc.offset = (long)&sc_->ebp - new_cfa_;         \
+    (FS)->regs.reg[8].how = REG_SAVED_OFFSET;                          \
+    (FS)->regs.reg[8].loc.offset = (long)&sc_->eip - new_cfa_;         \
+    (FS)->retaddr_column = 8;                                          \
+    goto SUCCESS;                                                      \
+  } while (0)
+#endif /* ifdef __x86_64__  */
+#endif /* ifdef inhibit_libc  */