OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* gdbarch.sh: Generate an error when conflicting macro

Browse Source 
definitions.  Generate an error when both pure multi-arch and
"tm.h".
* gdbarch.h, gdbarch.c: Regenerate.
* defs.h (GDB_MULTI_ARCH_TM): Rewrite definition.
This commit is contained in:
Andrew Cagney 2001-06-18 13:14:40 +00:00
parent b85045e00b
commit 83905903c9
4 changed files with 415 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2001-06-17 Andrew Cagney <ac131313@redhat.com>
* gdbarch.sh: Generate an error when conflicting macro
definitions. Generate an error when both pure multi-arch and
"tm.h".
* gdbarch.h, gdbarch.c: Regenerate.
* defs.h (GDB_MULTI_ARCH_TM): Rewrite definition.
2001-06-17 Andrew Cagney <ac131313@redhat.com> 2001-06-17 Andrew Cagney <ac131313@redhat.com>
* config/sparc/tm-sun4sol2.h (GDB_MULTI_ARCH): Down grade to * config/sparc/tm-sun4sol2.h (GDB_MULTI_ARCH): Down grade to

9
gdb/defs.h
View File

@ -73,9 +73,12 @@
#define GDB_MULTI_ARCH_PARTIAL 1 #define GDB_MULTI_ARCH_PARTIAL 1
/* The target is multi-arched. The MULTI-ARCH vector provides all /* The target is partially multi-arched. Both the multi-arch vector
definitions. "tm.h" is included and may provide definitions of and "tm.h" provide definitions. "tm.h" cannot override a definition
non- multi-arch macros.. */ provided by the multi-arch vector. It is detected as a compilation
error.
This setting is only useful during a multi-arch conversion. */
#define GDB_MULTI_ARCH_TM 2 #define GDB_MULTI_ARCH_TM 2

385
gdb/gdbarch.h
View File

File diff suppressed because it is too large Load Diff

16
gdb/gdbarch.sh
View File

@ -653,6 +653,10 @@ extern struct gdbarch *current_gdbarch;
#error "FRAME_FIND_SAVED_REGS: replaced by FRAME_INIT_SAVED_REGS" #error "FRAME_FIND_SAVED_REGS: replaced by FRAME_INIT_SAVED_REGS"
#endif #endif
#endif #endif
#if (GDB_MULTI_ARCH >= GDB_MULTI_ARCH_PURE) && defined (GDB_TM_FILE)
#error "GDB_TM_FILE: Pure multi-arch targets do not have a tm.h file."
#endif
EOF EOF
# function typedef's # function typedef's
@ -666,6 +670,9 @@ do
printf "\n" printf "\n"
printf "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);\n" printf "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);\n"
printf "/* set_gdbarch_${function}() - not applicable - pre-initialized. */\n" printf "/* set_gdbarch_${function}() - not applicable - pre-initialized. */\n"
printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (${macro})\n"
printf "#error \"Non multi-arch definition of ${macro}\"\n"
printf "#endif\n"
printf "#if GDB_MULTI_ARCH\n" printf "#if GDB_MULTI_ARCH\n"
printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n" printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n"
printf "#define ${macro} (gdbarch_${function} (current_gdbarch))\n" printf "#define ${macro} (gdbarch_${function} (current_gdbarch))\n"
@ -712,6 +719,9 @@ do
printf "#endif\n" printf "#endif\n"
printf "\n" printf "\n"
printf "extern int gdbarch_${function}_p (struct gdbarch *gdbarch);\n" printf "extern int gdbarch_${function}_p (struct gdbarch *gdbarch);\n"
printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (${macro}_P)\n"
printf "#error \"Non multi-arch definition of ${macro}\"\n"
printf "#endif\n"
printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro}_P)\n" printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro}_P)\n"
printf "#define ${macro}_P() (gdbarch_${function}_p (current_gdbarch))\n" printf "#define ${macro}_P() (gdbarch_${function}_p (current_gdbarch))\n"
printf "#endif\n" printf "#endif\n"
@ -731,6 +741,9 @@ do
printf "\n" printf "\n"
printf "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);\n" printf "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);\n"
printf "extern void set_gdbarch_${function} (struct gdbarch *gdbarch, ${returntype} ${function});\n" printf "extern void set_gdbarch_${function} (struct gdbarch *gdbarch, ${returntype} ${function});\n"
printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (${macro})\n"
printf "#error \"Non multi-arch definition of ${macro}\"\n"
printf "#endif\n"
printf "#if GDB_MULTI_ARCH\n" printf "#if GDB_MULTI_ARCH\n"
printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n" printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n"
printf "#define ${macro} (gdbarch_${function} (current_gdbarch))\n" printf "#define ${macro} (gdbarch_${function} (current_gdbarch))\n"
@ -774,6 +787,9 @@ do
printf "extern void set_gdbarch_${function} (struct gdbarch *gdbarch, gdbarch_${function}_ftype *${function});\n" printf "extern void set_gdbarch_${function} (struct gdbarch *gdbarch, gdbarch_${function}_ftype *${function});\n"
if class_is_multiarch_p ; then : if class_is_multiarch_p ; then :
else else
printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (${macro})\n"
printf "#error \"Non multi-arch definition of ${macro}\"\n"
printf "#endif\n"
printf "#if GDB_MULTI_ARCH\n" printf "#if GDB_MULTI_ARCH\n"
printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n" printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n"
if [ "x${actual}" = "x" ] if [ "x${actual}" = "x" ]