File fix-ada-build.diff of Package gcc41

Index: Makefile.in
===================================================================
*** Makefile.in	(revision 121051)
--- Makefile.in	(working copy)
*************** M4 = @M4@
*** 261,266 ****
--- 261,267 ----
  MAKEINFO = @MAKEINFO@
  EXPECT = @EXPECT@
  RUNTEST = @RUNTEST@
+ GNATBIND = @GNATBIND@
  
  # This just becomes part of the MAKEINFO definition passed down to
  # sub-makes.  It lets flags be given on the command line while still
*************** EXTRA_GCC_FLAGS = \
*** 525,530 ****
--- 526,532 ----
  	'BUILD_PREFIX=$(BUILD_PREFIX)' \
  	'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
  	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
+ 	"GNATBIND=$(GNATBIND)" \
  	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
  	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
  	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
Index: Makefile.tpl
===================================================================
*** Makefile.tpl	(revision 121051)
--- Makefile.tpl	(working copy)
*************** M4 = @M4@
*** 264,269 ****
--- 264,270 ----
  MAKEINFO = @MAKEINFO@
  EXPECT = @EXPECT@
  RUNTEST = @RUNTEST@
+ GNATBIND = @GNATBIND@
  
  # This just becomes part of the MAKEINFO definition passed down to
  # sub-makes.  It lets flags be given on the command line while still
*************** EXTRA_GCC_FLAGS = \
*** 457,462 ****
--- 458,464 ----
  	'BUILD_PREFIX=$(BUILD_PREFIX)' \
  	'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
  	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
+ 	"GNATBIND=$(GNATBIND)" \
  	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
  	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
  	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
Index: gcc/Makefile.in
===================================================================
*** gcc/Makefile.in	(revision 121051)
--- gcc/Makefile.in	(working copy)
*************** stage1_copy: stage1_build
*** 4072,4077 ****
--- 4072,4078 ----
  stage2_build: stage1_copy
  	$(MAKE) CC="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/ -B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/ -B$(build_tooldir)/bin/" \
  		 STAGE_PREFIX=stage1/ \
+ 		 GNATBIND=stage1/gnatbind \
  		 $(POSTSTAGE1_FLAGS_TO_PASS) \
  		 $(STAGE2_FLAGS_TO_PASS)
  	$(STAMP) stage2_build
*************** stage2_copy: stage2_build
*** 4085,4090 ****
--- 4086,4092 ----
  stageprofile_build: stage1_copy
  	$(MAKE) CC="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/ -B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/ -B$(build_tooldir)/bin/" \
  		 STAGE_PREFIX=stage1/ \
+ 		 GNATBIND=stage1/gnatbind \
  		 $(POSTSTAGE1_FLAGS_TO_PASS) \
  		 $(STAGEPROFILE_FLAGS_TO_PASS)
  	$(STAMP) stageprofile_build
*************** stageprofile_copy: stageprofile_build
*** 4098,4103 ****
--- 4100,4106 ----
  stage3_build: stage2_copy
  	$(MAKE) CC="$(STAGE_CC_WRAPPER) stage2/xgcc$(exeext) -Bstage2/ -B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage2/xgcc$(exeext) -Bstage2/ -B$(build_tooldir)/bin/" \
  		 STAGE_PREFIX=stage2/ \
+ 		 GNATBIND=stage2/gnatbind \
  		 $(POSTSTAGE1_FLAGS_TO_PASS) \
  		 $(STAGE2_FLAGS_TO_PASS)
  	$(STAMP) stage3_build
*************** stage3_build: stage2_copy
*** 4106,4111 ****
--- 4109,4115 ----
  stagefeedback_build: stageprofile_copy stage1_copy
  	$(MAKE) CC="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/ -B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage1/xgcc$(exeext) -Bstage1/ -B$(build_tooldir)/bin/" \
  		 STAGE_PREFIX=stage1/ \
+ 		 GNATBIND=stage1/gnatbind \
  		 $(POSTSTAGE1_FLAGS_TO_PASS) \
  		 $(STAGEFEEDBACK_FLAGS_TO_PASS)
  	$(STAMP) stagefeedback_build
*************** stage3_copy: stage3_build
*** 4125,4130 ****
--- 4129,4135 ----
  stage4_build: stage3_copy
  	$(MAKE) CC="$(STAGE_CC_WRAPPER) stage3/xgcc$(exeext) -Bstage3/ -B$(build_tooldir)/bin/" CC_FOR_BUILD="$(STAGE_CC_WRAPPER) stage3/xgcc$(exeext) -Bstage3/ -B$(build_tooldir)/bin/" \
  		 STAGE_PREFIX=stage3/ \
+ 		 GNATBIND=stage3/gnatbind \
  		 $(POSTSTAGE1_FLAGS_TO_PASS) \
  		 $(STAGE2_FLAGS_TO_PASS)
  	$(STAMP) stage4_build
Index: gcc/ada/Make-lang.in
===================================================================
*** gcc/ada/Make-lang.in	(revision 121051)
--- gcc/ada/Make-lang.in	(working copy)
*************** ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA
*** 54,60 ****
  ADA_INCLUDES = -I- -I. -Iada -I$(srcdir)/ada
  ADA_INCLUDE_DIR = $(libsubdir)/adainclude
  ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
- GNATBIND = $(STAGE_PREFIX)gnatbind
  ADA_FLAGS_TO_PASS = \
  	"ADA_FOR_BUILD=$(ADA_FOR_BUILD)"	\
  	"ADA_INCLUDE_DIR=$(ADA_INCLUDE_DIR)"	\
--- 54,59 ----
Index: gcc/ada/Makefile.in
===================================================================
*** gcc/ada/Makefile.in	(revision 121051)
--- gcc/ada/Makefile.in	(working copy)
*************** PWD_COMMAND = $${PWDCMD-pwd}
*** 114,120 ****
  INSTALL_DATA_DATE = cp -p
  MAKEINFO = makeinfo
  TEXI2DVI = texi2dvi
- GNATBIND = $(STAGE_PREFIX)gnatbind
  GNATBIND_FLAGS = -static -x
  ADA_CFLAGS =
  ADAFLAGS = -W -Wall -gnatpg -gnata
--- 114,119 ----