Commit 8c90b13a by H.J. Lu Committed by H.J. Lu

Makefile.tpl: Replace PWD with PWD_COMMAND.

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

	* Makefile.tpl: Replace PWD with PWD_COMMAND.
	* Makefile.in: Regenerated.

gcc/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

	* config-ml.in: Replace PWD with PWD_COMMAND.
	* Makefile.in: Likewise.

gcc/ada/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

	* Make-lang.in: Replace PWD with PWD_COMMAND.
	* Makefile.adalib: Likewise.
	* Makefile.in: Likewise.

gcc/treelang/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

	* Make-lang.in: Replace PWD with PWD_COMMAND.

libf2c/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

	* Makefile.in: Replace PWD with PWD_COMMAND.

libstdc++-v3/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

	* Makefile.am: Replace PWD with PWD_COMMAND.
	* Makefile.in: Regenerated.
	* docs/html/Makefile: Likewise.

From-SVN: r68931
parent 72d4a2ad
2003-07-04 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.tpl: Replace PWD with PWD_COMMAND.
* Makefile.in: Regenerated.
2003-07-04 Zack Weinberg <zack@codesourcery.com> 2003-07-04 Zack Weinberg <zack@codesourcery.com>
* intl: New directory; see intl/ChangeLog for details. * intl: New directory; see intl/ChangeLog for details.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -142,7 +142,9 @@ SHELL = @config_shell@ ...@@ -142,7 +142,9 @@ SHELL = @config_shell@
# the environment to account for automounters. The make variable must not # the environment to account for automounters. The make variable must not
# be called PWDCMD, otherwise the value set here is passed to make # be called PWDCMD, otherwise the value set here is passed to make
# subprocesses and overrides the setting from the user's environment. # subprocesses and overrides the setting from the user's environment.
PWD = $${PWDCMD-pwd} # Don't use PWD since it is a common shell environment variable and we
# don't want to corrupt it.
PWD_COMMAND = $${PWDCMD-pwd}
# compilers to use to create programs which must be run in the build # compilers to use to create programs which must be run in the build
# environment. # environment.
...@@ -534,8 +536,8 @@ maybe-[+make_target+]-gcc: ...@@ -534,8 +536,8 @@ maybe-[+make_target+]-gcc:
[+depend+]-gcc [+ [+depend+]-gcc [+
ENDFOR depend +] ENDFOR depend +]
@[ -f ./gcc/Makefile ] || exit 0; \ @[ -f ./gcc/Makefile ] || exit 0; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
for flag in $(EXTRA_GCC_FLAGS); do \ for flag in $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
...@@ -562,8 +564,8 @@ maybe-[+make_target+]-[+module+]: ...@@ -562,8 +564,8 @@ maybe-[+make_target+]-[+module+]:
[+depend+]-[+module+] [+ [+depend+]-[+module+] [+
ENDFOR depend +] ENDFOR depend +]
@[ -f ./[+module+]/Makefile ] || exit 0; \ @[ -f ./[+module+]/Makefile ] || exit 0; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
for flag in $(EXTRA_HOST_FLAGS); do \ for flag in $(EXTRA_HOST_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
...@@ -592,8 +594,8 @@ maybe-[+make_target+]-target-[+module+]: ...@@ -592,8 +594,8 @@ maybe-[+make_target+]-target-[+module+]:
[+depend+]-target-[+module+] [+ [+depend+]-target-[+module+] [+
ENDFOR depend +] ENDFOR depend +]
@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \ @[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]" ; \ echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]" ; \
for flag in $(EXTRA_TARGET_FLAGS); do \ for flag in $(EXTRA_TARGET_FLAGS); do \
...@@ -624,7 +626,7 @@ dvi: do-dvi ...@@ -624,7 +626,7 @@ dvi: do-dvi
do-info: maybe-all-texinfo do-info: maybe-all-texinfo
install-info: do-install-info dir.info install-info: do-install-info dir.info
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if [ -f dir.info ] ; then \ if [ -f dir.info ] ; then \
$(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
else true ; fi else true ; fi
...@@ -729,7 +731,7 @@ uninstall: ...@@ -729,7 +731,7 @@ uninstall:
.PHONY: install.all .PHONY: install.all
install.all: install-no-fixedincludes install.all: install-no-fixedincludes
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}` ; export r ; \ r=`${PWD_COMMAND}` ; export r ; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd ./gcc && \ (cd ./gcc && \
$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
...@@ -783,8 +785,8 @@ configure-build-[+module+]: ...@@ -783,8 +785,8 @@ configure-build-[+module+]:
@test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \ @test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \
[ -d $(BUILD_SUBDIR)/[+module+] ] || \ [ -d $(BUILD_SUBDIR)/[+module+] ] || \
mkdir $(BUILD_SUBDIR)/[+module+];\ mkdir $(BUILD_SUBDIR)/[+module+];\
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
AR="$(AR_FOR_BUILD)"; export AR; \ AR="$(AR_FOR_BUILD)"; export AR; \
AS="$(AS_FOR_BUILD)"; export AS; \ AS="$(AS_FOR_BUILD)"; export AS; \
CC="$(CC_FOR_BUILD)"; export CC; \ CC="$(CC_FOR_BUILD)"; export CC; \
...@@ -842,8 +844,8 @@ configure-build-[+module+]: ...@@ -842,8 +844,8 @@ configure-build-[+module+]:
.PHONY: all-build-[+module+] maybe-all-build-[+module+] .PHONY: all-build-[+module+] maybe-all-build-[+module+]
maybe-all-build-[+module+]: maybe-all-build-[+module+]:
all-build-[+module+]: configure-build-[+module+] all-build-[+module+]: configure-build-[+module+]
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
(cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all) (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all)
[+ ENDFOR build_modules +] [+ ENDFOR build_modules +]
...@@ -856,8 +858,8 @@ maybe-configure-[+module+]: ...@@ -856,8 +858,8 @@ maybe-configure-[+module+]:
configure-[+module+]: configure-[+module+]:
@test ! -f [+module+]/Makefile || exit 0; \ @test ! -f [+module+]/Makefile || exit 0; \
[ -d [+module+] ] || mkdir [+module+]; \ [ -d [+module+] ] || mkdir [+module+]; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
CC="$(CC)"; export CC; \ CC="$(CC)"; export CC; \
CFLAGS="$(CFLAGS)"; export CFLAGS; \ CFLAGS="$(CFLAGS)"; export CFLAGS; \
CXX="$(CXX)"; export CXX; \ CXX="$(CXX)"; export CXX; \
...@@ -892,8 +894,8 @@ configure-[+module+]: ...@@ -892,8 +894,8 @@ configure-[+module+]:
.PHONY: all-[+module+] maybe-all-[+module+] .PHONY: all-[+module+] maybe-all-[+module+]
maybe-all-[+module+]: maybe-all-[+module+]:
all-[+module+]: configure-[+module+] all-[+module+]: configure-[+module+]
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
IF with_x IF with_x
...@@ -908,8 +910,8 @@ check-[+module+]: ...@@ -908,8 +910,8 @@ check-[+module+]:
# This module is only tested in a native toolchain. # This module is only tested in a native toolchain.
check-[+module+]: check-[+module+]:
@if [ '$(host)' = '$(target)' ] ; then \ @if [ '$(host)' = '$(target)' ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
IF with_x IF with_x
...@@ -918,8 +920,8 @@ check-[+module+]: ...@@ -918,8 +920,8 @@ check-[+module+]:
fi fi
[+ ELSE check +] [+ ELSE check +]
check-[+module+]: check-[+module+]:
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
IF with_x IF with_x
...@@ -933,8 +935,8 @@ maybe-install-[+module+]: ...@@ -933,8 +935,8 @@ maybe-install-[+module+]:
install-[+module+]: install-[+module+]:
[+ ELSE install +] [+ ELSE install +]
install-[+module+]: installdirs install-[+module+]: installdirs
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
IF with_x IF with_x
...@@ -961,8 +963,8 @@ configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out ...@@ -961,8 +963,8 @@ configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out
@test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \ @test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \
[ -d $(TARGET_SUBDIR)/[+module+] ] || \ [ -d $(TARGET_SUBDIR)/[+module+] ] || \
mkdir $(TARGET_SUBDIR)/[+module+];\ mkdir $(TARGET_SUBDIR)/[+module+];\
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
AR="$(AR_FOR_TARGET)"; export AR; \ AR="$(AR_FOR_TARGET)"; export AR; \
AS="$(AS_FOR_TARGET)"; export AS; \ AS="$(AS_FOR_TARGET)"; export AS; \
...@@ -1027,8 +1029,8 @@ ENDIF raw_cxx +] ...@@ -1027,8 +1029,8 @@ ENDIF raw_cxx +]
.PHONY: all-target-[+module+] maybe-all-target-[+module+] .PHONY: all-target-[+module+] maybe-all-target-[+module+]
maybe-all-target-[+module+]: maybe-all-target-[+module+]:
all-target-[+module+]: configure-target-[+module+] all-target-[+module+]: configure-target-[+module+]
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/[+module+] && \ (cd $(TARGET_SUBDIR)/[+module+] && \
$(MAKE) $(TARGET_FLAGS_TO_PASS) [+ $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
...@@ -1044,8 +1046,8 @@ maybe-check-target-[+module+]: ...@@ -1044,8 +1046,8 @@ maybe-check-target-[+module+]:
check-target-[+module+]: check-target-[+module+]:
[+ ELSE check +] [+ ELSE check +]
check-target-[+module+]: check-target-[+module+]:
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/[+module+] && \ (cd $(TARGET_SUBDIR)/[+module+] && \
$(MAKE) $(TARGET_FLAGS_TO_PASS) [+ $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
...@@ -1062,8 +1064,8 @@ maybe-install-target-[+module+]: ...@@ -1062,8 +1064,8 @@ maybe-install-target-[+module+]:
install-target-[+module+]: install-target-[+module+]:
[+ ELSE install +] [+ ELSE install +]
install-target-[+module+]: installdirs install-target-[+module+]: installdirs
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/[+module+] && \ (cd $(TARGET_SUBDIR)/[+module+] && \
$(MAKE) $(TARGET_FLAGS_TO_PASS) install) $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
...@@ -1084,8 +1086,8 @@ maybe-configure-gcc: ...@@ -1084,8 +1086,8 @@ maybe-configure-gcc:
configure-gcc: configure-gcc:
@test ! -f gcc/Makefile || exit 0; \ @test ! -f gcc/Makefile || exit 0; \
[ -d gcc ] || mkdir gcc; \ [ -d gcc ] || mkdir gcc; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
CC="$(CC)"; export CC; \ CC="$(CC)"; export CC; \
CFLAGS="$(CFLAGS)"; export CFLAGS; \ CFLAGS="$(CFLAGS)"; export CFLAGS; \
CXX="$(CXX)"; export CXX; \ CXX="$(CXX)"; export CXX; \
...@@ -1125,13 +1127,13 @@ configure-gcc: ...@@ -1125,13 +1127,13 @@ configure-gcc:
maybe-all-gcc: maybe-all-gcc:
all-gcc: configure-gcc all-gcc: configure-gcc
@if [ -f gcc/stage_last ] ; then \ @if [ -f gcc/stage_last ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
else \ else \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
fi fi
...@@ -1149,13 +1151,13 @@ all-gcc: configure-gcc ...@@ -1149,13 +1151,13 @@ all-gcc: configure-gcc
GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
.PHONY: $(GCC_STRAP_TARGETS) .PHONY: $(GCC_STRAP_TARGETS)
$(GCC_STRAP_TARGETS): all-bootstrap configure-gcc $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Bootstrapping the compiler"; \ echo "Bootstrapping the compiler"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
case "$@" in \ case "$@" in \
*bootstrap4-lean ) \ *bootstrap4-lean ) \
msg="Comparing stage3 and stage4 of the compiler"; \ msg="Comparing stage3 and stage4 of the compiler"; \
...@@ -1173,38 +1175,38 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc ...@@ -1173,38 +1175,38 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "$$msg"; \ echo "$$msg"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}` ; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building runtime libraries"; \ echo "Building runtime libraries"; \
$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
profiledbootstrap: all-bootstrap configure-gcc profiledbootstrap: all-bootstrap configure-gcc
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Bootstrapping the compiler"; \ echo "Bootstrapping the compiler"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}` ; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building runtime libraries and training compiler"; \ echo "Building runtime libraries and training compiler"; \
$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building feedback based compiler"; \ echo "Building feedback based compiler"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
.PHONY: cross .PHONY: cross
cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building the C and C++ compiler"; \ echo "Building the C and C++ compiler"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}` ; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building runtime libraries"; \ echo "Building runtime libraries"; \
$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
...@@ -1214,8 +1216,8 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld ...@@ -1214,8 +1216,8 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
maybe-check-gcc: maybe-check-gcc:
check-gcc: check-gcc:
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
else \ else \
...@@ -1225,8 +1227,8 @@ check-gcc: ...@@ -1225,8 +1227,8 @@ check-gcc:
.PHONY: check-gcc-c++ .PHONY: check-gcc-c++
check-gcc-c++: check-gcc-c++:
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
else \ else \
...@@ -1241,8 +1243,8 @@ check-c++: ...@@ -1241,8 +1243,8 @@ check-c++:
maybe-install-gcc: maybe-install-gcc:
install-gcc: install-gcc:
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
else \ else \
...@@ -1261,8 +1263,8 @@ gcc-no-fixedincludes: ...@@ -1261,8 +1263,8 @@ gcc-no-fixedincludes:
cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \ cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
touch gcc/stmp-fixinc gcc/include/fixed; \ touch gcc/stmp-fixinc gcc/include/fixed; \
rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \ rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}` ; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd ./gcc && \ (cd ./gcc && \
$(MAKE) $(GCC_FLAGS_TO_PASS) install); \ $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
...@@ -1406,7 +1408,7 @@ configure-target-qthreads: $(ALL_GCC_C) ...@@ -1406,7 +1408,7 @@ configure-target-qthreads: $(ALL_GCC_C)
# We use move-if-change so that it's only considered updated when it # We use move-if-change so that it's only considered updated when it
# actually changes, because it has to depend on a phony target. # actually changes, because it has to depend on a phony target.
multilib.out: maybe-all-gcc multilib.out: maybe-all-gcc
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
echo "Checking multilib configuration..."; \ echo "Checking multilib configuration..."; \
$(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \ $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
$(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \ $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
......
...@@ -500,7 +500,7 @@ multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ] ...@@ -500,7 +500,7 @@ multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ]
cat > Multi.tem <<\EOF cat > Multi.tem <<\EOF
PWD=$${PWDCMD-pwd} PWD_COMMAND=$${PWDCMD-pwd}
# FIXME: There should be an @-sign in front of the `if'. # FIXME: There should be an @-sign in front of the `if'.
# Leave out until this is tested a bit more. # Leave out until this is tested a bit more.
...@@ -508,8 +508,8 @@ multi-do: ...@@ -508,8 +508,8 @@ multi-do:
if [ -z "$(MULTIDIRS)" ]; then \ if [ -z "$(MULTIDIRS)" ]; then \
true; \ true; \
else \ else \
rootpre=`${PWD}`/; export rootpre; \ rootpre=`${PWD_COMMAND}`/; export rootpre; \
srcrootpre=`cd $(srcdir); ${PWD}`/; export srcrootpre; \ srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \ lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
compiler="$(CC)"; \ compiler="$(CC)"; \
for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \ for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
...@@ -550,7 +550,7 @@ multi-clean: ...@@ -550,7 +550,7 @@ multi-clean:
if [ -z "$(MULTIDIRS)" ]; then \ if [ -z "$(MULTIDIRS)" ]; then \
true; \ true; \
else \ else \
lib=`${PWD} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \ lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
for dir in Makefile $(MULTIDIRS); do \ for dir in Makefile $(MULTIDIRS); do \
if [ -f ../$${dir}/$${lib}/Makefile ]; then \ if [ -f ../$${dir}/$${lib}/Makefile ]; then \
if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \ if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
......
2003-07-04 H.J. Lu <hongjiu.lu@intel.com>
* config-ml.in: Replace PWD with PWD_COMMAND.
* Makefile.in: Likewise.
2003-07-04 Zdenek Dvorak <rakdver@atrey.karlin.mff.cuni.cz> 2003-07-04 Zdenek Dvorak <rakdver@atrey.karlin.mff.cuni.cz>
* cfgloopanal.c (count_strange_loop_iterations): New static function. * cfgloopanal.c (count_strange_loop_iterations): New static function.
......
...@@ -199,7 +199,9 @@ SHELL = @SHELL@ ...@@ -199,7 +199,9 @@ SHELL = @SHELL@
# the environment to account for automounters. The make variable must not # the environment to account for automounters. The make variable must not
# be called PWDCMD, otherwise the value set here is passed to make # be called PWDCMD, otherwise the value set here is passed to make
# subprocesses and overrides the setting from the user's environment. # subprocesses and overrides the setting from the user's environment.
PWD = $${PWDCMD-pwd} # Don't use PWD since it is a common shell environment variable and we
# don't want to corrupt it.
PWD_COMMAND = $${PWDCMD-pwd}
# on sysV, define this as cp. # on sysV, define this as cp.
INSTALL = @INSTALL@ INSTALL = @INSTALL@
# Some systems may be missing symbolic links, regular links, or both. # Some systems may be missing symbolic links, regular links, or both.
...@@ -2511,7 +2513,7 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \ ...@@ -2511,7 +2513,7 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
$(FIXINCSRCDIR)/procopen.c $(FIXINCSRCDIR)/gnu-regex.c \ $(FIXINCSRCDIR)/procopen.c $(FIXINCSRCDIR)/gnu-regex.c \
$(FIXINCSRCDIR)/server.c $(FIXINCSRCDIR)/gnu-regex.h \ $(FIXINCSRCDIR)/server.c $(FIXINCSRCDIR)/gnu-regex.h \
$(FIXINCSRCDIR)/server.h $(FIXINCSRCDIR)/inclhack.def specs.ready $(FIXINCSRCDIR)/server.h $(FIXINCSRCDIR)/inclhack.def specs.ready
(MAKE="$(MAKE)"; srcdir=`cd $(srcdir)/fixinc && ${PWD}` ; \ (MAKE="$(MAKE)"; srcdir=`cd $(srcdir)/fixinc && ${PWD_COMMAND}` ; \
CC="$(CC_FOR_BUILD)"; CFLAGS="$(BUILD_CFLAGS)"; LDFLAGS="$(BUILD_LDFLAGS)"; \ CC="$(CC_FOR_BUILD)"; CFLAGS="$(BUILD_CFLAGS)"; LDFLAGS="$(BUILD_LDFLAGS)"; \
WARN_CFLAGS="$(WARN_CFLAGS)"; LIBERTY=`pwd`/"$(BUILD_LIBIBERTY)"; \ WARN_CFLAGS="$(WARN_CFLAGS)"; LIBERTY=`pwd`/"$(BUILD_LIBIBERTY)"; \
export MAKE srcdir CC CFLAGS LDFLAGS WARN_CFLAGS LIBERTY; \ export MAKE srcdir CC CFLAGS LDFLAGS WARN_CFLAGS LIBERTY; \
...@@ -2532,10 +2534,10 @@ stmp-fixinc: fixinc.sh gsyslimits.h ...@@ -2532,10 +2534,10 @@ stmp-fixinc: fixinc.sh gsyslimits.h
fi fi
rm -rf include; mkdir include rm -rf include; mkdir include
-chmod a+rx include -chmod a+rx include
(TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD}`; \ (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
SHELL='$(SHELL)' ;\ SHELL='$(SHELL)' ;\
export TARGET_MACHINE srcdir SHELL ; \ export TARGET_MACHINE srcdir SHELL ; \
$(SHELL) ./fixinc.sh `${PWD}`/include $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); \ $(SHELL) ./fixinc.sh `${PWD_COMMAND}`/include $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); \
rm -f include/syslimits.h; \ rm -f include/syslimits.h; \
if [ -f include/limits.h ]; then \ if [ -f include/limits.h ]; then \
mv include/limits.h include/syslimits.h; \ mv include/limits.h include/syslimits.h; \
...@@ -2697,7 +2699,7 @@ gccint.dvi: $(TEXI_GCCINT_FILES) ...@@ -2697,7 +2699,7 @@ gccint.dvi: $(TEXI_GCCINT_FILES)
$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/gccint.texi $(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/gccint.texi
gccinstall.dvi: $(TEXI_GCCINSTALL_FILES) gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(TEXI2DVI) -I $$s/doc -I $$s/doc/include -o $@ $$s/doc/install.texi $(TEXI2DVI) -I $$s/doc -I $$s/doc/include -o $@ $$s/doc/install.texi
cppinternals.dvi: $(TEXI_CPPINT_FILES) cppinternals.dvi: $(TEXI_CPPINT_FILES)
...@@ -3114,7 +3116,7 @@ install-headers: $(INSTALL_HEADERS_DIR) ...@@ -3114,7 +3116,7 @@ install-headers: $(INSTALL_HEADERS_DIR)
# Don't need to use LN_S here since we really do need ln -s and no substitutes. # Don't need to use LN_S here since we really do need ln -s and no substitutes.
-files=`cd $(DESTDIR)$(libsubdir)/include; find . -type l -print 2>/dev/null`; \ -files=`cd $(DESTDIR)$(libsubdir)/include; find . -type l -print 2>/dev/null`; \
if [ $$? -eq 0 ]; then \ if [ $$? -eq 0 ]; then \
dir=`cd include; ${PWD}`; \ dir=`cd include; ${PWD_COMMAND}`; \
for i in $$files; do \ for i in $$files; do \
dest=`ls -ld $(DESTDIR)$(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \ dest=`ls -ld $(DESTDIR)$(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \
if expr "$$dest" : "$$dir.*" > /dev/null; then \ if expr "$$dest" : "$$dir.*" > /dev/null; then \
...@@ -3136,7 +3138,7 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir ...@@ -3136,7 +3138,7 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
# Unless a full pathname is provided, some shells would print the new CWD, # Unless a full pathname is provided, some shells would print the new CWD,
# found in CDPATH, corrupting the output. We could just redirect the # found in CDPATH, corrupting the output. We could just redirect the
# output of `cd', but some shells lose on redirection within `()'s # output of `cd', but some shells lose on redirection within `()'s
(cd `${PWD}`/include ; \ (cd `${PWD_COMMAND}`/include ; \
tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - ) tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
# /bin/sh on some systems returns the status of the first tar, # /bin/sh on some systems returns the status of the first tar,
# and that can lose with GNU tar which always writes a full block. # and that can lose with GNU tar which always writes a full block.
...@@ -3145,7 +3147,7 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir ...@@ -3145,7 +3147,7 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
# Install the include directory using cpio. # Install the include directory using cpio.
install-headers-cpio: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir install-headers-cpio: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
# See discussion about the use of `pwd` above # See discussion about the use of `pwd` above
cd `${PWD}`/include ; \ cd `${PWD_COMMAND}`/include ; \
find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include
# Install the include directory using cp. # Install the include directory using cp.
...@@ -3233,8 +3235,8 @@ site.exp: ./config.status Makefile ...@@ -3233,8 +3235,8 @@ site.exp: ./config.status Makefile
@echo "## these variables are automatically generated by make ##" > ./tmp0 @echo "## these variables are automatically generated by make ##" > ./tmp0
@echo "# Do not edit here. If you wish to override these values" >> ./tmp0 @echo "# Do not edit here. If you wish to override these values" >> ./tmp0
@echo "# add them to the last section" >> ./tmp0 @echo "# add them to the last section" >> ./tmp0
@echo "set rootme \"`${PWD}`\"" >> ./tmp0 @echo "set rootme \"`${PWD_COMMAND}`\"" >> ./tmp0
@echo "set srcdir \"`cd ${srcdir}; ${PWD}`\"" >> ./tmp0 @echo "set srcdir \"`cd ${srcdir}; ${PWD_COMMAND}`\"" >> ./tmp0
@echo "set host_triplet $(host)" >> ./tmp0 @echo "set host_triplet $(host)" >> ./tmp0
@echo "set build_triplet $(build)" >> ./tmp0 @echo "set build_triplet $(build)" >> ./tmp0
@echo "set target_triplet $(target)" >> ./tmp0 @echo "set target_triplet $(target)" >> ./tmp0
...@@ -3315,52 +3317,52 @@ $(TESTSUITEDIR)/site.exp: site.exp ...@@ -3315,52 +3317,52 @@ $(TESTSUITEDIR)/site.exp: site.exp
sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)|' < site.exp > $@ sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)|' < site.exp > $@
check-g++: $(TESTSUITEDIR)/site.exp check-g++: $(TESTSUITEDIR)/site.exp
-(rootme=`${PWD}`; export rootme; \ -(rootme=`${PWD_COMMAND}`; export rootme; \
srcdir=`cd ${srcdir}; ${PWD}` ; export srcdir ; \ srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
cd $(TESTSUITEDIR); \ cd $(TESTSUITEDIR); \
EXPECT=${EXPECT} ; export EXPECT ; \ EXPECT=${EXPECT} ; export EXPECT ; \
if [ -f $${rootme}/../expect/expect ] ; then \ if [ -f $${rootme}/../expect/expect ] ; then \
TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD}` ; \ TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
export TCL_LIBRARY ; fi ; \ export TCL_LIBRARY ; fi ; \
$(RUNTEST) --tool g++ $(RUNTESTFLAGS)) $(RUNTEST) --tool g++ $(RUNTESTFLAGS))
check-gcc: $(TESTSUITEDIR)/site.exp check-gcc: $(TESTSUITEDIR)/site.exp
-(rootme=`${PWD}`; export rootme; \ -(rootme=`${PWD_COMMAND}`; export rootme; \
srcdir=`cd ${srcdir}; ${PWD}` ; export srcdir ; \ srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
cd $(TESTSUITEDIR); \ cd $(TESTSUITEDIR); \
EXPECT=${EXPECT} ; export EXPECT ; \ EXPECT=${EXPECT} ; export EXPECT ; \
if [ -f $${rootme}/../expect/expect ] ; then \ if [ -f $${rootme}/../expect/expect ] ; then \
TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD}` ; \ TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
export TCL_LIBRARY ; fi ; \ export TCL_LIBRARY ; fi ; \
$(RUNTEST) --tool gcc $(RUNTESTFLAGS)) $(RUNTEST) --tool gcc $(RUNTESTFLAGS))
check-g77: $(TESTSUITEDIR)/site.exp check-g77: $(TESTSUITEDIR)/site.exp
-(rootme=`${PWD}`; export rootme; \ -(rootme=`${PWD_COMMAND}`; export rootme; \
srcdir=`cd ${srcdir}; ${PWD}` ; export srcdir ; \ srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
cd $(TESTSUITEDIR); \ cd $(TESTSUITEDIR); \
EXPECT=${EXPECT} ; export EXPECT ; \ EXPECT=${EXPECT} ; export EXPECT ; \
if [ -f $${rootme}/../expect/expect ] ; then \ if [ -f $${rootme}/../expect/expect ] ; then \
TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD}` ; \ TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
export TCL_LIBRARY ; fi ; \ export TCL_LIBRARY ; fi ; \
$(RUNTEST) --tool g77 $(RUNTESTFLAGS)) $(RUNTEST) --tool g77 $(RUNTESTFLAGS))
check-objc: $(TESTSUITEDIR)/site.exp check-objc: $(TESTSUITEDIR)/site.exp
-(rootme=`${PWD}`; export rootme; \ -(rootme=`${PWD_COMMAND}`; export rootme; \
srcdir=`cd ${srcdir}; ${PWD}` ; export srcdir ; \ srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
cd $(TESTSUITEDIR); \ cd $(TESTSUITEDIR); \
EXPECT=${EXPECT} ; export EXPECT ; \ EXPECT=${EXPECT} ; export EXPECT ; \
if [ -f $${rootme}/../expect/expect ] ; then \ if [ -f $${rootme}/../expect/expect ] ; then \
TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD}` ; \ TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
export TCL_LIBRARY ; fi ; \ export TCL_LIBRARY ; fi ; \
$(RUNTEST) --tool objc $(RUNTESTFLAGS)) $(RUNTEST) --tool objc $(RUNTESTFLAGS))
check-consistency: testsuite/site.exp check-consistency: testsuite/site.exp
-rootme=`${PWD}`; export rootme; \ -rootme=`${PWD_COMMAND}`; export rootme; \
srcdir=`cd ${srcdir}; ${PWD}` ; export srcdir ; \ srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
cd testsuite; \ cd testsuite; \
EXPECT=${EXPECT} ; export EXPECT ; \ EXPECT=${EXPECT} ; export EXPECT ; \
if [ -f $${rootme}/../expect/expect ] ; then \ if [ -f $${rootme}/../expect/expect ] ; then \
TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD}` ; \ TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
export TCL_LIBRARY ; fi ; \ export TCL_LIBRARY ; fi ; \
$(RUNTEST) --tool consistency $(RUNTESTFLAGS) $(RUNTEST) --tool consistency $(RUNTESTFLAGS)
......
2003-07-04 H.J. Lu <hongjiu.lu@intel.com>
* Make-lang.in: Replace PWD with PWD_COMMAND.
* Makefile.adalib: Likewise.
* Makefile.in: Likewise.
2003-07-04 Matt Kraai <kraai@alumni.cmu.edu> 2003-07-04 Matt Kraai <kraai@alumni.cmu.edu>
* misc.c (gnat_argv): Revert last change. * misc.c (gnat_argv): Revert last change.
......
...@@ -427,32 +427,32 @@ ada.install-info: ...@@ -427,32 +427,32 @@ ada.install-info:
ada/gnat_ug_unx.dvi : $(srcdir)/ada/gnat_ug_unx.texi \ ada/gnat_ug_unx.dvi : $(srcdir)/ada/gnat_ug_unx.texi \
$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \ s=`cd $(srcdir); ${PWD_COMMAND}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_unx.dvi $$s/ada/gnat_ug_unx.texi cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_unx.dvi $$s/ada/gnat_ug_unx.texi
ada/gnat_ug_vms.dvi : $(srcdir)/ada/gnat_ug_vms.texi \ ada/gnat_ug_vms.dvi : $(srcdir)/ada/gnat_ug_vms.texi \
$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \ s=`cd $(srcdir); ${PWD_COMMAND}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vms.dvi $$s/ada/gnat_ug_vms.texi cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vms.dvi $$s/ada/gnat_ug_vms.texi
ada/gnat_ug_vxw.dvi : $(srcdir)/ada/gnat_ug_vxw.texi \ ada/gnat_ug_vxw.dvi : $(srcdir)/ada/gnat_ug_vxw.texi \
$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \ s=`cd $(srcdir); ${PWD_COMMAND}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vxw.dvi $$s/ada/gnat_ug_vxw.texi cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vxw.dvi $$s/ada/gnat_ug_vxw.texi
ada/gnat_ug_wnt.dvi : $(srcdir)/ada/gnat_ug_wnt.texi \ ada/gnat_ug_wnt.dvi : $(srcdir)/ada/gnat_ug_wnt.texi \
$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \ s=`cd $(srcdir); ${PWD_COMMAND}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_wnt.dvi $$s/ada/gnat_ug_wnt.texi cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_wnt.dvi $$s/ada/gnat_ug_wnt.texi
ada/gnat_rm.dvi : $(srcdir)/ada/gnat_rm.texi \ ada/gnat_rm.dvi : $(srcdir)/ada/gnat_rm.texi \
$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \ s=`cd $(srcdir); ${PWD_COMMAND}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_rm.dvi $$s/ada/gnat_rm.texi cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_rm.dvi $$s/ada/gnat_rm.texi
ada/gnat-style.dvi : $(srcdir)/ada/gnat-style.texi \ ada/gnat-style.dvi : $(srcdir)/ada/gnat-style.texi \
$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/fdl.texi
s=`cd $(srcdir); ${PWD}`; \ s=`cd $(srcdir); ${PWD_COMMAND}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat-style.dvi $$s/ada/gnat-style.texi cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat-style.dvi $$s/ada/gnat-style.texi
ada.dvi: ada/gnat_ug_vms.dvi ada/gnat_ug_wnt.dvi \ ada.dvi: ada/gnat_ug_vms.dvi ada/gnat_ug_wnt.dvi \
......
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
# updating the value of the environment variable ADA_OBJECTS_PATH # updating the value of the environment variable ADA_OBJECTS_PATH
SHELL=sh SHELL=sh
PWD=$${PWDCMD-pwd} PWD_COMMAND=$${PWDCMD-pwd}
CC = gcc CC = gcc
AR = ar AR = ar
GNAT_ROOT = $(shell cd $(ROOT);${PWD})/ GNAT_ROOT = $(shell cd $(ROOT);${PWD_COMMAND})/
target = $(shell $(CC) -dumpmachine) target = $(shell $(CC) -dumpmachine)
version = $(shell $(CC) -dumpversion) version = $(shell $(CC) -dumpversion)
ADA_INCLUDE_PATH = $(GNAT_ROOT)lib/gcc-lib/$(target)/$(version)/adainclude/ ADA_INCLUDE_PATH = $(GNAT_ROOT)lib/gcc-lib/$(target)/$(version)/adainclude/
......
...@@ -115,7 +115,7 @@ RANLIB = ranlib ...@@ -115,7 +115,7 @@ RANLIB = ranlib
# Test to use to see whether ranlib exists on the system. # Test to use to see whether ranlib exists on the system.
RANLIB_TEST = [ -f /usr/bin/ranlib -o -f /bin/ranlib ] RANLIB_TEST = [ -f /usr/bin/ranlib -o -f /bin/ranlib ]
SHELL = @SHELL@ SHELL = @SHELL@
PWD = $${PWDCMD-pwd} PWD_COMMAND = $${PWDCMD-pwd}
# How to copy preserving the date # How to copy preserving the date
INSTALL_DATA_DATE = cp -p INSTALL_DATA_DATE = cp -p
MAKEINFO = makeinfo MAKEINFO = makeinfo
...@@ -187,10 +187,10 @@ host_canonical=@host@ ...@@ -187,10 +187,10 @@ host_canonical=@host@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
fsrcdir := $(shell cd $(srcdir);${PWD}) fsrcdir := $(shell cd $(srcdir);${PWD_COMMAND})
fsrcpfx := $(shell cd $(srcdir);${PWD})/ fsrcpfx := $(shell cd $(srcdir);${PWD_COMMAND})/
fcurdir := $(shell ${PWD}) fcurdir := $(shell ${PWD_COMMAND})
fcurpfx := $(shell ${PWD})/ fcurpfx := $(shell ${PWD_COMMAND})/
# Top build directory, relative to here. # Top build directory, relative to here.
top_builddir = .. top_builddir = ..
......
...@@ -292,7 +292,7 @@ xscale-*-*) ...@@ -292,7 +292,7 @@ xscale-*-*)
;; ;;
i[34567]86-*-*) i[34567]86-*-*)
cpu_type=i386 cpu_type=i386
extra_headers="mmintrin.h xmmintrin.h emmintrin.h" extra_headers="mmintrin.h xmmintrin.h emmintrin.h pmmintrin.h"
;; ;;
x86_64-*-*) x86_64-*-*)
cpu_type=i386 cpu_type=i386
......
2003-07-04 H.J. Lu <hongjiu.lu@intel.com>
* Make-lang.in: Replace PWD with PWD_COMMAND.
2003-07-02 Neil Booth <neil@daikokuya.co.uk> 2003-07-02 Neil Booth <neil@daikokuya.co.uk>
* tree1.c (treelang_init_options): Update prototype. * tree1.c (treelang_init_options): Update prototype.
......
...@@ -156,7 +156,7 @@ treelang.dvi: $(srcdir)/treelang/treelang.texi \ ...@@ -156,7 +156,7 @@ treelang.dvi: $(srcdir)/treelang/treelang.texi \
$(srcdir)/doc/include/gpl.texi \ $(srcdir)/doc/include/gpl.texi \
$(srcdir)/doc/include/fdl.texi \ $(srcdir)/doc/include/fdl.texi \
$(srcdir)/doc/include/funding.texi $(srcdir)/doc/include/funding.texi
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
cd treelang && $(TEXI2DVI) -I $$s/doc/include $$s/treelang/treelang.texi cd treelang && $(TEXI2DVI) -I $$s/doc/include $$s/treelang/treelang.texi
treelang.generated-manpages: treelang.generated-manpages:
...@@ -293,23 +293,23 @@ treelang.check: $(TESTSUITEDIR)/site.exp ...@@ -293,23 +293,23 @@ treelang.check: $(TESTSUITEDIR)/site.exp
# patch files for new empty files as required for cvs. # patch files for new empty files as required for cvs.
# STAMP does not cut it here as I need an empty file. # STAMP does not cut it here as I need an empty file.
touch $(srcdir)/testsuite/treelang/{a01gcco01runpgmerr,a01gcc.out01,a01gcc.out01err} touch $(srcdir)/testsuite/treelang/{a01gcco01runpgmerr,a01gcc.out01,a01gcc.out01err}
-rootme=`${PWD}`; export rootme; \ -rootme=`${PWD_COMMAND}`; export rootme; \
srcdir=`cd ${srcdir}; ${PWD}` ; export srcdir ; \ srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
cd testsuite; \ cd testsuite; \
EXPECT=${EXPECT} ; export EXPECT ; \ EXPECT=${EXPECT} ; export EXPECT ; \
TRANSFORM=$(program_transform_name); export TRANSFORM; \ TRANSFORM=$(program_transform_name); export TRANSFORM; \
if [ -f $${rootme}/../expect/expect ] ; then \ if [ -f $${rootme}/../expect/expect ] ; then \
TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD}` ; \ TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
export TCL_LIBRARY ; fi ; \ export TCL_LIBRARY ; fi ; \
PATH=`cd ..;${PWD}`:$$PATH; export PATH; \ PATH=`cd ..;${PWD_COMMAND}`:$$PATH; export PATH; \
gcc_extras="-B`cd ..;${PWD}` -B`cd ..;${PWD}`/treelang"; export gcc_extras; \ gcc_extras="-B`cd ..;${PWD_COMMAND}` -B`cd ..;${PWD_COMMAND}`/treelang"; export gcc_extras; \
$(RUNTEST) --tool treelang $(RUNTESTFLAGS) $(RUNTEST) --tool treelang $(RUNTESTFLAGS)
rm $(srcdir)/testsuite/treelang/{a01gcco01runpgmerr,a01gcc.out01,a01gcc.out01err} rm $(srcdir)/testsuite/treelang/{a01gcco01runpgmerr,a01gcc.out01,a01gcc.out01err}
# GCC_EXTRAS="$(GCC_EXTRAS)"; export GCC_EXTRAS; \ # GCC_EXTRAS="$(GCC_EXTRAS)"; export GCC_EXTRAS; \
# copy the output files from the current test to source ie say the new results are OK # copy the output files from the current test to source ie say the new results are OK
treelang.check.fix: force treelang.check.fix: force
srcdir=`cd ${srcdir}; ${PWD}` ; export srcdir ; srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ;
-cp testsuite/treelang/*.out* t -cp testsuite/treelang/*.out* t
-cp testsuite/treelang/*runpgm* t -cp testsuite/treelang/*runpgm* t
-rm -f t/*nofilename -rm -f t/*nofilename
......
2003-07-04 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.in: Replace PWD with PWD_COMMAND.
2003-06-15 Nathanael Nerode <neroden@gcc.gnu.org> 2003-06-15 Nathanael Nerode <neroden@gcc.gnu.org>
* libU77/bes.c, libU77/dbes.c: Remove. * libU77/bes.c, libU77/dbes.c: Remove.
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#02111-1307, USA. #02111-1307, USA.
SHELL = @SHELL@ SHELL = @SHELL@
PWD = $${PWDCMD-pwd} PWD_COMMAND = $${PWDCMD-pwd}
MAKEOVERRIDES= MAKEOVERRIDES=
.NOEXPORTS: .NOEXPORTS:
...@@ -259,8 +259,8 @@ rebuilt: configure ...@@ -259,8 +259,8 @@ rebuilt: configure
installcheck installdirs all-unilib installcheck installdirs all-unilib
subdir_do: subdir_do:
@rootpre=`${PWD}`/; export rootpre; \ @rootpre=`${PWD_COMMAND}`/; export rootpre; \
srcrootpre=`cd $(srcdir); ${PWD}`/; export srcrootpre; \ srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
for i in .. $(DODIRS); do \ for i in .. $(DODIRS); do \
if [ x$$i != x.. ]; then \ if [ x$$i != x.. ]; then \
if [ -f ./$$i/Makefile ]; then \ if [ -f ./$$i/Makefile ]; then \
......
2003-07-04 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am: Replace PWD with PWD_COMMAND.
* Makefile.in: Regenerated.
* docs/html/Makefile: Likewise.
2003-07-04 Paolo Carlini <pcarlini@unitus.it> 2003-07-04 Paolo Carlini <pcarlini@unitus.it>
* include/bits/valarray_array.h: Fully qualify standard * include/bits/valarray_array.h: Fully qualify standard
......
...@@ -29,24 +29,24 @@ SUBDIRS = include libmath libsupc++ src po testsuite ...@@ -29,24 +29,24 @@ SUBDIRS = include libmath libsupc++ src po testsuite
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD = $${PWDCMD-pwd} PWD_COMMAND = $${PWDCMD-pwd}
# These rules are messy, but are hella worth it. # These rules are messy, but are hella worth it.
doxygen: doxygen:
-(srcdir=`cd ${top_srcdir}; ${PWD}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD}`; \ builddir=`${PWD_COMMAND}`; \
/bin/sh ${srcdir}/docs/doxygen/run_doxygen \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \
--mode=user $${srcdir} $${builddir}) --mode=user $${srcdir} $${builddir})
doxygen-maint: doxygen-maint:
-(srcdir=`cd ${top_srcdir}; ${PWD}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD}`; \ builddir=`${PWD_COMMAND}`; \
/bin/sh ${srcdir}/docs/doxygen/run_doxygen \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \
--mode=maint $${srcdir} $${builddir}) --mode=maint $${srcdir} $${builddir})
doxygen-man: doxygen-man:
-(srcdir=`cd ${top_srcdir}; ${PWD}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD}`; \ builddir=`${PWD_COMMAND}`; \
/bin/sh ${srcdir}/docs/doxygen/run_doxygen \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \
--mode=man $${srcdir} $${builddir}) --mode=man $${srcdir} $${builddir})
......
...@@ -151,7 +151,7 @@ SUBDIRS = include libmath libsupc++ src po testsuite ...@@ -151,7 +151,7 @@ SUBDIRS = include libmath libsupc++ src po testsuite
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD = $${PWDCMD-pwd} PWD_COMMAND = $${PWDCMD-pwd}
# Multilib support. # Multilib support.
MAKEOVERRIDES = MAKEOVERRIDES =
...@@ -278,7 +278,7 @@ maintainer-clean-hdr: ...@@ -278,7 +278,7 @@ maintainer-clean-hdr:
all-recursive install-data-recursive install-exec-recursive \ all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive install-info-recursive \ installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive: check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \ dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \ target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \ list='$(SUBDIRS)'; for subdir in $$list; do \
...@@ -298,7 +298,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: ...@@ -298,7 +298,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
mostlyclean-recursive clean-recursive distclean-recursive \ mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive: maintainer-clean-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \ dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \ rev="$$subdir $$rev"; \
...@@ -478,20 +478,20 @@ mostlyclean distclean maintainer-clean ...@@ -478,20 +478,20 @@ mostlyclean distclean maintainer-clean
# These rules are messy, but are hella worth it. # These rules are messy, but are hella worth it.
doxygen: doxygen:
-(srcdir=`cd ${top_srcdir}; ${PWD}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD}`; \ builddir=`${PWD_COMMAND}`; \
/bin/sh ${srcdir}/docs/doxygen/run_doxygen \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \
--mode=user $${srcdir} $${builddir}) --mode=user $${srcdir} $${builddir})
doxygen-maint: doxygen-maint:
-(srcdir=`cd ${top_srcdir}; ${PWD}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD}`; \ builddir=`${PWD_COMMAND}`; \
/bin/sh ${srcdir}/docs/doxygen/run_doxygen \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \
--mode=maint $${srcdir} $${builddir}) --mode=maint $${srcdir} $${builddir})
doxygen-man: doxygen-man:
-(srcdir=`cd ${top_srcdir}; ${PWD}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD}`; \ builddir=`${PWD_COMMAND}`; \
/bin/sh ${srcdir}/docs/doxygen/run_doxygen \ /bin/sh ${srcdir}/docs/doxygen/run_doxygen \
--mode=man $${srcdir} $${builddir}) --mode=man $${srcdir} $${builddir})
......
PWD=$${PWDCMD-pwd} PWD_COMMAND=$${PWDCMD-pwd}
MAKEINFO=makeinfo MAKEINFO=makeinfo
INC=../../../gcc/doc/include INC=../../../gcc/doc/include
...@@ -25,7 +25,7 @@ documentation.html: $(wildcard */howto.html) ...@@ -25,7 +25,7 @@ documentation.html: $(wildcard */howto.html)
rm tmp.top tmp.middle tmp.bottom rm tmp.top tmp.middle tmp.bottom
faq/index.txt: faq/index.html faq/index.txt: faq/index.html
lynx -dump $< | sed "s%file://localhost`${PWD}`%..%" > $@ lynx -dump $< | sed "s%file://localhost`${PWD_COMMAND}`%..%" > $@
17_intro/porting.html: 17_intro/porting.texi 17_intro/porting.html: 17_intro/porting.texi
${MAKEINFO} -I ${INC} --html --no-split $< -o $@ ${MAKEINFO} -I ${INC} --html --no-split $< -o $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment