From beeedde8dd051d056585828c041bc645bcef3e6b Mon Sep 17 00:00:00 2001 From: kan Date: Tue, 17 Sep 2002 04:14:38 +0000 Subject: Use the stock 3.2.1-prerelease file. Approved by: obrien --- contrib/gcc/Makefile.in | 2 +- contrib/gcc/c-tree.h | 5 ----- contrib/gcc/configure | 42 ++++++++++++++++++++---------------------- contrib/gcc/dbxout.c | 4 ++++ contrib/gcc/emit-rtl.c | 11 +++++++++++ contrib/gcc/reload.c | 2 +- 6 files changed, 37 insertions(+), 29 deletions(-) diff --git a/contrib/gcc/Makefile.in b/contrib/gcc/Makefile.in index 27a7a36..46c96c5 100644 --- a/contrib/gcc/Makefile.in +++ b/contrib/gcc/Makefile.in @@ -2275,7 +2275,7 @@ $(docdir)/gcc.info: $(docdir)/gcc.texi $(docdir)/include/gcc-common.texi \ $(docdir)/invoke.texi $(docdir)/extend.texi $(docdir)/md.texi \ $(docdir)/objc.texi $(docdir)/gcov.texi $(docdir)/trouble.texi \ $(docdir)/bugreport.texi $(docdir)/service.texi \ - $(docdir)/contribute.texi $(docdir)/vms.texi \ + $(docdir)/contribute.texi $(docdir)/vms.texi $(docdir)/compat.texi \ $(docdir)/include/funding.texi $(docdir)/gnu.texi \ $(docdir)/include/gpl.texi $(docdir)/include/fdl.texi \ $(docdir)/contrib.texi $(docdir)/cppenv.texi $(docdir)/cppopts.texi diff --git a/contrib/gcc/c-tree.h b/contrib/gcc/c-tree.h index da20586..12ca54c 100644 --- a/contrib/gcc/c-tree.h +++ b/contrib/gcc/c-tree.h @@ -289,11 +289,6 @@ extern int current_function_returns_null; extern int current_function_returns_abnormally; -/* Nonzero means the expression being parsed will never be evaluated. - This is a count, since unevaluated expressions can nest. */ - -extern int skip_evaluation; - /* Nonzero means `$' can be in an identifier. */ extern int dollars_in_ident; diff --git a/contrib/gcc/configure b/contrib/gcc/configure index 8f5fbc9..25d70d7 100755 --- a/contrib/gcc/configure +++ b/contrib/gcc/configure @@ -7580,42 +7580,40 @@ EOF fi - if test "x$gcc_cv_as_flags64" != xno; then - echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 + echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 echo "configure:7584: checking for assembler offsetable %lo() support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - gcc_cv_as_offsetable_lo10=unknown - if test "x$gcc_cv_as" != x; then - # Check if assembler has offsetable %lo() - echo "or %g1, %lo(ab) + 12, %g1" > conftest.s - echo "or %g1, %lo(ab + 12), %g1" > conftest1.s - if $gcc_cv_as $gcc_cv_as_flags64 -o conftest.o conftest.s \ - > /dev/null 2>&1 && - $gcc_cv_as $gcc_cv_as_flags64 -o conftest1.o conftest1.s \ - > /dev/null 2>&1; then - if cmp conftest.o conftest1.o > /dev/null 2>&1; then - gcc_cv_as_offsetable_lo10=no - else - gcc_cv_as_offsetable_lo10=yes - fi - else + gcc_cv_as_offsetable_lo10=unknown + if test "x$gcc_cv_as" != x; then + # Check if assembler has offsetable %lo() + echo "or %g1, %lo(ab) + 12, %g1" > conftest.s + echo "or %g1, %lo(ab + 12), %g1" > conftest1.s + if $gcc_cv_as -xarch=v9 -o conftest.o conftest.s \ + > /dev/null 2>&1 && + $gcc_cv_as -xarch=v9 -o conftest1.o conftest1.s \ + > /dev/null 2>&1; then + if cmp conftest.o conftest1.o > /dev/null 2>&1; then gcc_cv_as_offsetable_lo10=no + else + gcc_cv_as_offsetable_lo10=yes fi - rm -f conftest.s conftest.o conftest1.s conftest1.o + else + gcc_cv_as_offsetable_lo10=no fi - + rm -f conftest.s conftest.o conftest1.s conftest1.o + fi + fi echo "$ac_t""$gcc_cv_as_offsetable_lo10" 1>&6 - if test "x$gcc_cv_as_offsetable_lo10" = xyes; then - cat >> confdefs.h <<\EOF + if test "x$gcc_cv_as_offsetable_lo10" = xyes; then + cat >> confdefs.h <<\EOF #define HAVE_AS_OFFSETABLE_LO10 1 EOF - fi fi ;; diff --git a/contrib/gcc/dbxout.c b/contrib/gcc/dbxout.c index b7907a5..bc6105b 100644 --- a/contrib/gcc/dbxout.c +++ b/contrib/gcc/dbxout.c @@ -398,11 +398,15 @@ dbxout_function_end () /* By convention, GCC will mark the end of a function with an N_FUN symbol and an empty string. */ +#ifdef DBX_OUTPUT_NFUN + DBX_OUTPUT_NFUN (asmfile, lscope_label_name, current_function_decl); +#else fprintf (asmfile, "%s\"\",%d,0,0,", ASM_STABS_OP, N_FUN); assemble_name (asmfile, lscope_label_name); putc ('-', asmfile); assemble_name (asmfile, XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); fprintf (asmfile, "\n"); +#endif } #endif /* DBX_DEBUGGING_INFO */ diff --git a/contrib/gcc/emit-rtl.c b/contrib/gcc/emit-rtl.c index fd8d8e4..8329c5d 100644 --- a/contrib/gcc/emit-rtl.c +++ b/contrib/gcc/emit-rtl.c @@ -1905,6 +1905,17 @@ set_mem_offset (mem, offset) offset, MEM_SIZE (mem), MEM_ALIGN (mem), GET_MODE (mem)); } + +/* Set the size of MEM to SIZE. */ + +void +set_mem_size (mem, size) + rtx mem, size; +{ + MEM_ATTRS (mem) = get_mem_attrs (MEM_ALIAS_SET (mem), MEM_EXPR (mem), + MEM_OFFSET (mem), size, MEM_ALIGN (mem), + GET_MODE (mem)); +} /* Return a memory reference like MEMREF, but with its mode changed to MODE and its address changed to ADDR. (VOIDmode means don't change the mode. diff --git a/contrib/gcc/reload.c b/contrib/gcc/reload.c index fb2828d..4b331f0 100644 --- a/contrib/gcc/reload.c +++ b/contrib/gcc/reload.c @@ -2647,7 +2647,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p) ; else if (constraints[i][0] == 'p') { - find_reloads_address (VOIDmode, (rtx*) 0, + find_reloads_address (recog_data.operand_mode[i], (rtx*) 0, recog_data.operand[i], recog_data.operand_loc[i], i, operand_type[i], ind_levels, insn); -- cgit v1.1