[patch/rfa] Fix trampoline definitions for hppa-linux

[patch/rfa] Fix trampoline definitions for hppa-linux

[Randolph Chung]

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  <tausq@debian.org>

	* 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/

Re: [patch/rfa] Fix trampoline definitions for hppa-linux

[Andrew Cagney]

[oops, forgot cc: gdb-patches@ first time]
> 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 */
(mumble something under breath about #include/undef spaghetti we need to 
fix :-( :-)

I see:

cagney@nettle$ frep 'undef IN_SOLIB_CALL_TRAMPOLINE'
arm/tm-linux.h:30:#undef IN_SOLIB_CALL_TRAMPOLINE
mips/tm-nbsd.h:29:#undef IN_SOLIB_CALL_TRAMPOLINE
mips/tm-linux.h:55:#undef IN_SOLIB_CALL_TRAMPOLINE
powerpc/tm-linux.h:31:#undef IN_SOLIB_CALL_TRAMPOLINE
sigh, ok.

Andrew