diff --new-file --recursive --unified=3 original/gcc-3.0.2/gcc/Makefile.in gcc-3.0.2/gcc/Makefile.in --- original/gcc-3.0.2/gcc/Makefile.in Wed Aug 8 21:26:12 2001 +++ gcc-3.0.2/gcc/Makefile.in Thu Aug 23 22:32:12 2001 @@ -2613,7 +2613,7 @@ rm -f $(bindir)/gcov$(exeext); \ $(INSTALL_PROGRAM) gcov$(exeext) $(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \ fi - $(INSTALL_PROGRAM) gccbug $(bindir)/$(GCCBUG_INSTALL_NAME) + $(INSTALL_SCRIPT) gccbug $(bindir)/$(GCCBUG_INSTALL_NAME) # Install the driver program as $(target_alias)-gcc # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc. diff --new-file --recursive --unified=3 original/gcc-3.0.2/gcc/config/arm/t-arm-elf gcc-3.0.2/gcc/config/arm/t-arm-elf --- original/gcc-3.0.2/gcc/config/arm/t-arm-elf Thu Sep 21 12:36:20 2000 +++ gcc-3.0.2/gcc/config/arm/t-arm-elf Thu Aug 23 22:32:12 2001 @@ -37,9 +37,9 @@ # MULTILIB_OPTIONS += mapcs-32/mapcs-26 # MULTILIB_DIRNAMES += 32bit 26bit # -# MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork -# MULTILIB_DIRNAMES += normal interwork -# MULTILIB_EXCEPTIONS += *mapcs-26/*mthumb-interwork* +MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork +MULTILIB_DIRNAMES += normal interwork +MULTILIB_EXCEPTIONS += *mapcs-26/*mthumb-interwork* # # MULTILIB_OPTIONS += fno-leading-underscore/fleading-underscore # MULTILIB_DIRNAMES += elf under diff --new-file --recursive --unified=3 original/gcc-3.0.2/gcc/dwarf2out.c gcc-3.0.2/gcc/dwarf2out.c --- original/gcc-3.0.2/gcc/dwarf2out.c Wed Jul 18 23:51:52 2001 +++ gcc-3.0.2/gcc/dwarf2out.c Thu Aug 23 22:32:12 2001 @@ -2051,7 +2051,7 @@ fde->dw_fde_current_label = NULL; fde->dw_fde_end = NULL; fde->dw_fde_cfi = NULL; - fde->funcdef_number = current_funcdef_number; + fde->funcdef_number = get_current_funcdef_number (); fde->nothrow = current_function_nothrow; fde->uses_eh_lsda = cfun->uses_eh_lsda; diff --new-file --recursive --unified=3 original/gcc-3.0.2/gcc/except.c gcc-3.0.2/gcc/except.c --- original/gcc-3.0.2/gcc/except.c Wed Aug 8 16:19:56 2001 +++ gcc-3.0.2/gcc/except.c Thu Aug 23 22:32:12 2001 @@ -3523,6 +3523,14 @@ call_site_base += n; } +int +get_current_funcdef_number () +{ + return USING_SJLJ_EXCEPTIONS + ? sjlj_funcdef_number + : current_funcdef_number; +} + void output_function_exception_table () { @@ -3542,9 +3550,7 @@ if (! cfun->uses_eh_lsda) return; - funcdef_number = (USING_SJLJ_EXCEPTIONS - ? sjlj_funcdef_number - : current_funcdef_number); + funcdef_number = get_current_funcdef_number (); #ifdef IA64_UNWIND_INFO fputs ("\t.personality\t", asm_out_file); diff --new-file --recursive --unified=3 original/gcc-3.0.2/gcc/except.h gcc-3.0.2/gcc/except.h --- original/gcc-3.0.2/gcc/except.h Fri Jul 6 18:17:42 2001 +++ gcc-3.0.2/gcc/except.h Thu Aug 23 22:32:12 2001 @@ -146,6 +146,7 @@ extern void sjlj_emit_function_exit_after PARAMS ((rtx)); +extern int get_current_funcdef_number PARAMS ((void)); /* If non-NULL, this is a function that returns an expression to be executed if an unhandled exception is propogated out of a cleanup diff --new-file --recursive --unified=3 original/gcc-3.0.2/gcc/unwind-pe.h gcc-3.0.2/gcc/unwind-pe.h --- original/gcc-3.0.2/gcc/unwind-pe.h Wed Aug 1 14:19:30 2001 +++ gcc-3.0.2/gcc/unwind-pe.h Thu Aug 23 22:32:12 2001 @@ -96,10 +96,12 @@ case DW_EH_PE_aligned: return 0; +#ifdef EH_FRAME_SECTION case DW_EH_PE_textrel: return _Unwind_GetTextRelBase (context); case DW_EH_PE_datarel: return _Unwind_GetDataRelBase (context); +#endif case DW_EH_PE_funcrel: return _Unwind_GetRegionStart (context); } diff --new-file --recursive --unified=3 original/gcc-3.0.2/gcc/version.c gcc-3.0.2/gcc/version.c --- original/gcc-3.0.2/gcc/version.c Sun Aug 19 16:08:40 2001 +++ gcc-3.0.2/gcc/version.c Thu Aug 23 22:57:46 2001 @@ -1,4 +1,4 @@ #include "gansidecl.h" #include "version.h" -const char *const version_string = "3.0.2"; +const char *const version_string = "3.0.2 (DevKit-Advance)";