From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randolph Chung To: gdb-patches@sources.redhat.com Subject: [patch/rfa] Fix trampoline definitions for hppa-linux Date: Sat, 15 May 2004 03:08:00 -0000 Message-id: <20040515030758.GN566@tausq.org> X-SW-Source: 2004-05/msg00439.html The cross-gdb patch I posted earlier had a nasty side effect that it overrode some of the trampoline methods set in hppa-linux-tdep.c. This fixes it. ok to apply? It's rather non-obvious that including tm-linux.h will suddenly make some gdbarch methods not work anymore.... :( randolph 2004-05-14 Randolph Chung * config/pa/tm-linux.h (IN_SOLIB_CALL_TRAMPOLINE, SKIP_TRAMPOLINE_CODE) Undefine these so we can overide them using gdbarch. Index: config/pa/tm-linux.h =================================================================== RCS file: /cvs/src/src/gdb/config/pa/tm-linux.h,v retrieving revision 1.1 diff -u -p -r1.1 tm-linux.h --- config/pa/tm-linux.h 10 May 2004 18:33:37 -0000 1.1 +++ config/pa/tm-linux.h 15 May 2004 03:02:38 -0000 @@ -24,4 +24,10 @@ #include "pa/tm-hppa.h" #include "config/tm-linux.h" +/* Including tm-linux.h indirectly includes tm-sysv4.h which defines + the following macros. We want to use the regular gdbarch mechanism + to set the methods in hppa*tdep.c, so undefine them here. */ +#undef IN_SOLIB_CALL_TRAMPOLINE +#undef SKIP_TRAMPOLINE_CODE + #endif /* #ifndef TM_LINUX_H */ -- Randolph Chung Debian GNU/Linux Developer, hppa/ia64 ports http://www.tausq.org/