2002-12-23 Nathanael Nerode <neroden@gcc.gnu.org>

* Makefile.tpl: Use shared multilib.out.  Use move-if-change for it.
	Convert (cd foo; make) to (cd foo && make).  Clean up multilib.out.
	* Makefile.in: Regenerate.
	* configure.in: Remove unnecessary leftovers.

2002-12-22  Geoffrey Keating  <geoffk@apple.com>

	* config/mt-aix43: Delete.

2002-12-21  Geoffrey Keating  <geoffk@apple.com>

	* configure.in (extra_ranlibflags_for_target): New variable.
	(*-*-darwin): Add -c to ranlib commands.
	* configure (tooldir): Handle extra_ranlibflags_for_target.
This commit is contained in:
Nathanael Nerode 2002-12-23 17:53:41 +00:00
parent e2ddab05fc
commit 6dbec16756
6 changed files with 430 additions and 435 deletions

View File

@ -1,3 +1,20 @@
2002-12-23 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Use shared multilib.out. Use move-if-change for it.
Convert (cd foo; make) to (cd foo && make). Clean up multilib.out.
* Makefile.in: Regenerate.
* configure.in: Remove unnecessary leftovers.
2002-12-22 Geoffrey Keating <geoffk@apple.com>
* config/mt-aix43: Delete.
2002-12-21 Geoffrey Keating <geoffk@apple.com>
* configure.in (extra_ranlibflags_for_target): New variable.
(*-*-darwin): Add -c to ranlib commands.
* configure (tooldir): Handle extra_ranlibflags_for_target.
2002-12-20 Jeff Johnston <jjohnstn@redhat.com> 2002-12-20 Jeff Johnston <jjohnstn@redhat.com>
* COPYING.NEWLIB: Updated. * COPYING.NEWLIB: Updated.

File diff suppressed because it is too large Load Diff

View File

@ -589,13 +589,13 @@ do-[+target+]:
done; \ done; \
;; \ ;; \
esac ; \ esac ; \
if (cd ./$$i; \ (cd ./$$i && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \ "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
[+target+]); \ [+target+]) \
then true; else exit 1; fi; \ || exit 1; \
else true; fi; \ else true; fi; \
done done
# Break into two pieces # Break into two pieces
@ -607,13 +607,13 @@ do-[+target+]:
for flag in $(EXTRA_TARGET_FLAGS); do \ for flag in $(EXTRA_TARGET_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
if (cd $(TARGET_SUBDIR)/$$i; \ (cd $(TARGET_SUBDIR)/$$i && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \ "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
[+target+]); \ [+target+]) \
then true; else exit 1; fi; \ || exit 1; \
else true; fi; \ else true; fi; \
done done
[+ ENDFOR recursive_targets +] [+ ENDFOR recursive_targets +]
@ -643,6 +643,7 @@ local-clean:
local-distclean: local-distclean:
-rm -f Makefile config.status config.cache mh-frag mt-frag -rm -f Makefile config.status config.cache mh-frag mt-frag
-rm -f multilib.out multilib.ts multilib.tmp
-if [ "$(TARGET_SUBDIR)" != "." ]; then \ -if [ "$(TARGET_SUBDIR)" != "." ]; then \
rm -rf $(TARGET_SUBDIR); \ rm -rf $(TARGET_SUBDIR); \
else true; fi else true; fi
@ -671,7 +672,7 @@ $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
r=`${PWD}`; export r; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \ (cd $${dir} && $(MAKE) $(FLAGS_TO_PASS) clean); \
else \ else \
true; \ true; \
fi fi
@ -684,7 +685,7 @@ $(CLEAN_TARGET_MODULES):
r=`${PWD}`; export r; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \ (cd $(TARGET_SUBDIR)/$${dir} && $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
else \ else \
true; \ true; \
fi fi
@ -742,7 +743,7 @@ install.all: install-no-fixedincludes
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}` ; export r ; \ r=`${PWD}` ; export r ; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd ./gcc; \ (cd ./gcc && \
$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
else \ else \
true ; \ true ; \
@ -784,7 +785,6 @@ etags tags: TAGS
# built are. # built are.
TAGS: do-TAGS TAGS: do-TAGS
# -------------------------------------- # --------------------------------------
# Modules which run on the build machine # Modules which run on the build machine
# -------------------------------------- # --------------------------------------
@ -909,7 +909,7 @@ all-[+module+]: configure-[+module+]
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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
+] $(X11_FLAGS_TO_PASS)[+ +] $(X11_FLAGS_TO_PASS)[+
ENDIF with_x +] all) ENDIF with_x +] all)
@ -925,7 +925,7 @@ check-[+module+]:
r=`${PWD}`; export r; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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
+] $(X11_FLAGS_TO_PASS)[+ +] $(X11_FLAGS_TO_PASS)[+
ENDIF with_x +] check); \ ENDIF with_x +] check); \
@ -936,7 +936,7 @@ check-[+module+]:
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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
+] $(X11_FLAGS_TO_PASS)[+ +] $(X11_FLAGS_TO_PASS)[+
ENDIF with_x +] check) ENDIF with_x +] check)
@ -953,7 +953,7 @@ install-[+module+]: installdirs
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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
+] $(X11_FLAGS_TO_PASS)[+ +] $(X11_FLAGS_TO_PASS)[+
ENDIF with_x +] install) ENDIF with_x +] install)
@ -968,13 +968,10 @@ install-[+module+]: installdirs
maybe-configure-target-[+module+]: maybe-configure-target-[+module+]:
configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/Makefile configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/Makefile
# Don't manually override CC_FOR_TARGET at make time; get it set right # There's only one multilib.out. Cleverer subdirs shouldn't need it copied.
# at configure time. Otherwise multilibs may be wrong. $(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out
$(TARGET_SUBDIR)/[+module+]/multilib.out: maybe-all-gcc
@[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\ @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\
r=`${PWD}`; export r; \ cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out
echo "Configuring multilibs for [+module+]"; \
$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/[+module+]/multilib.out 2> /dev/null
$(TARGET_SUBDIR)/[+module+]/Makefile: config.status $(TARGET_SUBDIR)/[+module+]/multilib.out $(TARGET_SUBDIR)/[+module+]/Makefile: config.status $(TARGET_SUBDIR)/[+module+]/multilib.out
@[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\ @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\
@ -1046,7 +1043,7 @@ all-target-[+module+]: configure-target-[+module+]
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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) [+
IF raw_cxx IF raw_cxx
+] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+
@ -1062,7 +1059,7 @@ check-target-[+module+]:
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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) [+
IF raw_cxx IF raw_cxx
+] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+
@ -1081,7 +1078,7 @@ install-target-[+module+]: installdirs
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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)
[+ ENDIF no_install +] [+ ENDIF no_install +]
[+ ENDFOR target_modules +] [+ ENDFOR target_modules +]
@ -1146,12 +1143,12 @@ all-gcc: configure-gcc
r=`${PWD}`; export r; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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
# Building GCC uses some tools for rebuilding "source" files # Building GCC uses some tools for rebuilding "source" files
@ -1213,7 +1210,7 @@ check-gcc:
r=`${PWD}`; export r; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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 \
true; \ true; \
fi fi
@ -1224,7 +1221,7 @@ check-gcc-c++:
r=`${PWD}`; export r; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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 \
true; \ true; \
fi fi
@ -1239,7 +1236,7 @@ install-gcc:
r=`${PWD}`; export r; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; 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 \
true; \ true; \
fi fi
@ -1259,7 +1256,7 @@ gcc-no-fixedincludes:
r=`${PWD}`; export r; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}` ; export s; \ s=`cd $(srcdir); ${PWD}` ; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd ./gcc; \ (cd ./gcc && \
$(MAKE) $(GCC_FLAGS_TO_PASS) install); \ $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
rm -rf gcc/include; \ rm -rf gcc/include; \
mv gcc/tmp-include gcc/include 2>/dev/null; \ mv gcc/tmp-include gcc/include 2>/dev/null; \
@ -1395,6 +1392,23 @@ configure-target-qthreads: $(ALL_GCC_C)
# Regenerating top level configury # Regenerating top level configury
# -------------------------------- # --------------------------------
# Multilib.out tells target dirs what multilibs they should build.
# There is really only one copy. We use the 'timestamp' method to
# work around various timestamp bugs on some systems.
# 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.
multilib.out: multilib.ts
@if [ -f multilib.out] ; then : else \
rm -f multilib.ts; $(MAKE) multilib.ts; \
fi
multilib.ts: maybe-all-gcc
@r=`${PWD}`; export r; \
echo "Checking multilib configuration..."; \
$(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
$(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
echo timestamp > multilib.ts
# Rebuilding Makefile.in, using autogen. # Rebuilding Makefile.in, using autogen.
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def $(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
cd $(srcdir) && autogen Makefile.def cd $(srcdir) && autogen Makefile.def

View File

@ -1,4 +0,0 @@
# AIX 4.3 and above requires -X32_64 flag to all ar and nm commands
# to handle both 32-bit and 64-bit objects.
AR_FOR_TARGET=ar -X32_64
NM_FOR_TARGET=nm -B -X32_64

1
configure vendored
View File

@ -1013,6 +1013,7 @@ else
NM_FOR_TARGET='\$(USUAL_NM_FOR_TARGET)' NM_FOR_TARGET='\$(USUAL_NM_FOR_TARGET)'
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target} NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
RANLIB_FOR_TARGET='\$(USUAL_RANLIB_FOR_TARGET)' RANLIB_FOR_TARGET='\$(USUAL_RANLIB_FOR_TARGET)'
RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
WINDRES=windres WINDRES=windres
WINDRES_FOR_TARGET='\$(USUAL_WINDRES_FOR_TARGET)' WINDRES_FOR_TARGET='\$(USUAL_WINDRES_FOR_TARGET)'
LEX='\$(USUAL_LEX)' LEX='\$(USUAL_LEX)'

View File

@ -1146,6 +1146,7 @@ fi
extra_arflags_for_target= extra_arflags_for_target=
extra_nmflags_for_target= extra_nmflags_for_target=
extra_ranlibflags_for_target=
case "${target}" in case "${target}" in
i[3456]86-*-netware*) i[3456]86-*-netware*)
target_makefile_frag="config/mt-netware" target_makefile_frag="config/mt-netware"
@ -1163,6 +1164,10 @@ case "${target}" in
extra_arflags_for_target=" -X32_64" extra_arflags_for_target=" -X32_64"
extra_nmflags_for_target=" -B -X32_64" extra_nmflags_for_target=" -B -X32_64"
;; ;;
*-*-darwin*)
# ranlib from Darwin requires the -c flag to look at common symbols.
extra_ranlibflags_for_target=" -c"
;;
mips*-*-pe | sh*-*-pe | *arm-wince-pe) mips*-*-pe | sh*-*-pe | *arm-wince-pe)
target_makefile_frag="config/mt-wince" target_makefile_frag="config/mt-wince"
;; ;;
@ -1698,12 +1703,6 @@ qRAW_CXX_FOR_TARGET=`echo "$RAW_CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'`
qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'` qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
qqRAW_CXX_FOR_TARGET=`echo "$qRAW_CXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'` qqRAW_CXX_FOR_TARGET=`echo "$qRAW_CXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
# BASE_CC_FOR_TARGET is the actual program file of CC_FOR_TARGET,
# for use in dependencies. Replace $$r with a relative
# path if it's present.
set dummy $CC_FOR_TARGET; cc_for_target_first_word=$2
BASE_CC_FOR_TARGET=`echo "$cc_for_target_first_word" | sed -e 's,[$][$]r,.,'`
sedtemp=sed.$$ sedtemp=sed.$$
cat >$sedtemp <<EOF cat >$sedtemp <<EOF
s%@GDB_TK@%${GDB_TK}% s%@GDB_TK@%${GDB_TK}%
@ -1722,7 +1721,6 @@ s:@target_configdirs@:${target_configdirs}:
s%@target_configargs@%${targargs}% s%@target_configargs@%${targargs}%
s%@FLAGS_FOR_TARGET@%${FLAGS_FOR_TARGET}% s%@FLAGS_FOR_TARGET@%${FLAGS_FOR_TARGET}%
s%@CC_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}% s%@CC_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}%
s%@BASE_CC_FOR_TARGET@%${BASE_CC_FOR_TARGET}%
s%@GCJ_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}% s%@GCJ_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}%
s%@CXX_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}% s%@CXX_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}%
s%@RAW_CXX_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${qRAW_CXX_FOR_TARGET}% s%@RAW_CXX_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${qRAW_CXX_FOR_TARGET}%