diff options
Diffstat (limited to 'gcc/collect2.c')
| -rw-r--r-- | gcc/collect2.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/gcc/collect2.c b/gcc/collect2.c index aa17ecf6016..7730eccf52e 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -1783,20 +1783,20 @@ write_c_file_stat (stream, name) fprintf (stream, " void *pc_end;\n"); fprintf (stream, " void *fde_begin;\n"); fprintf (stream, " void *fde_array;\n"); - fprintf (stream, " size_t count;\n"); + fprintf (stream, " __SIZE_TYPE__ count;\n"); fprintf (stream, " struct object *next;\n"); fprintf (stream, "};\n"); - fprintf (stream, "extern void __register_frame_table (void *, struct object *);\n"); - fprintf (stream, "extern void __deregister_frame (void *);\n"); + fprintf (stream, "extern void __register_frame_info_table (void *, struct object *);\n"); + fprintf (stream, "extern void __deregister_frame_info (void *);\n"); fprintf (stream, "static void reg_frame () {\n"); fprintf (stream, "\tstatic struct object ob;\n"); - fprintf (stream, "\t__register_frame_table (frame_table, &ob);\n"); + fprintf (stream, "\t__register_frame_info_table (frame_table, &ob);\n"); fprintf (stream, "\t}\n"); fprintf (stream, "static void dereg_frame () {\n"); - fprintf (stream, "\t__deregister_frame (frame_table);\n"); + fprintf (stream, "\t__deregister_frame_info (frame_table);\n"); fprintf (stream, "\t}\n"); } @@ -1863,15 +1863,26 @@ write_c_file_glob (stream, name) write_list (stream, "\t\t&", frame_tables.first); fprintf (stream, "\t0\n};\n"); - fprintf (stream, "extern void __register_frame_table (void *);\n"); - fprintf (stream, "extern void __deregister_frame (void *);\n"); + /* This must match what's in frame.h. */ + fprintf (stream, "struct object {\n"); + fprintf (stream, " void *pc_begin;\n"); + fprintf (stream, " void *pc_end;\n"); + fprintf (stream, " void *fde_begin;\n"); + fprintf (stream, " void *fde_array;\n"); + fprintf (stream, " __SIZE_TYPE__ count;\n"); + fprintf (stream, " struct object *next;\n"); + fprintf (stream, "};\n"); + + fprintf (stream, "extern void __register_frame_info_table (void *, struct object *);\n"); + fprintf (stream, "extern void __deregister_frame_info (void *);\n"); fprintf (stream, "static void reg_frame () {\n"); - fprintf (stream, "\t__register_frame_table (frame_table);\n"); + fprintf (stream, "\tstatic struct object ob;\n"); + fprintf (stream, "\t__register_frame_info_table (frame_table, &ob);\n"); fprintf (stream, "\t}\n"); fprintf (stream, "static void dereg_frame () {\n"); - fprintf (stream, "\t__deregister_frame (frame_table);\n"); + fprintf (stream, "\t__deregister_frame_info (frame_table);\n"); fprintf (stream, "\t}\n"); } |