summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorkan <kan@FreeBSD.org>2003-08-22 03:10:47 +0000
committerkan <kan@FreeBSD.org>2003-08-22 03:10:47 +0000
commitd6bc06101fceaa845f49f85581464c8c6fb06029 (patch)
treeb4f8e83f22030f101cd48dad2c5408050716af47 /contrib
parent0509a035d147d5a0f0da4af64572682e26a3a514 (diff)
downloadFreeBSD-src-d6bc06101fceaa845f49f85581464c8c6fb06029.zip
FreeBSD-src-d6bc06101fceaa845f49f85581464c8c6fb06029.tar.gz
Stock files.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gcc/Makefile.in7
-rw-r--r--contrib/gcc/dbxout.c4
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);
OpenPOWER on IntegriCloud