diff options
-rw-r--r-- | contrib/gcc/Makefile.in | 7 | ||||
-rw-r--r-- | contrib/gcc/dbxout.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/contrib/gcc/Makefile.in b/contrib/gcc/Makefile.in index 75e4d03..40e90c2 100644 --- a/contrib/gcc/Makefile.in +++ b/contrib/gcc/Makefile.in @@ -682,6 +682,7 @@ LANG_STAGESTUFF = @all_stagestuff@ # subdirectories. # ??? The choices here will need some experimenting with. ORDINARY_FLAGS_TO_PASS = \ + "AR=$(AR)" \ "AR_FLAGS_FOR_TARGET=$(AR_FLAGS_FOR_TARGET)" \ "AR_CREATE_FOR_TARGET=$(AR_CREATE_FOR_TARGET)" \ "AR_EXTRACT_FOR_TARGET=$(AR_EXTRACT_FOR_TARGET)" \ @@ -3317,6 +3318,8 @@ VOL_FILES=`echo $(BACKEND) $(OBJS) $(C_OBJS) $(LIBCPP_OBJS) *.c *.h gen*` # the context of the stage_x rule. STAGE2_FLAGS_TO_PASS = \ ADAC="\$$(CC)" \ + AR_FOR_TARGET="$(AR_FOR_TARGET)" \ + RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)" \ CFLAGS="$(BOOT_CFLAGS)" \ LDFLAGS="$(BOOT_LDFLAGS)" \ WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \ @@ -3332,7 +3335,9 @@ STAGE2_FLAGS_TO_PASS = \ # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). stage1_build: - $(MAKE) CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)" \ + $(MAKE) AR_FOR_TARGET="$(AR_FOR_TARGET)" \ + RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)" \ + CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)" \ CFLAGS="$(STAGE1_CFLAGS)" MAKEINFO="$(MAKEINFO)" \ MAKEINFOFLAGS="$(MAKEINFOFLAGS)" COVERAGE_FLAGS= $(STAMP) stage1_build diff --git a/contrib/gcc/dbxout.c b/contrib/gcc/dbxout.c index 60ca664..43dd9ab 100644 --- a/contrib/gcc/dbxout.c +++ b/contrib/gcc/dbxout.c @@ -1621,9 +1621,7 @@ dbxout_type (type, full) * BITS_PER_UNIT); putc (',', asmfile); CHARS (1); - print_wide_int (tree_low_cst (DECL_SIZE - (TYPE_NAME - (BINFO_TYPE (child))), + print_wide_int (tree_low_cst (TYPE_SIZE (BINFO_TYPE (child)), 0) * BITS_PER_UNIT); putc (';', asmfile); |