OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.in (s-mlib): Don't build multilibs if --disable-multilib. 

* Makefile.in (s-mlib): Don't build multilibs if
	--disable-multilib.
	(DRIVER_DEFINES): Adjust accordingly.
	(gcc.o): Likewise.
	(protoize.o): Likewise.
	(unprotoize.o): Likewise.
	* configure.in: Recognize --enable-multilib.

	* Makefile.in (g++spec.o): Adjust use of DRIVER_DEFINES.

From-SVN: r39452
This commit is contained in:
Mark Mitchell 2001-02-05 09:48:00 +00:00 committed by Mark Mitchell
parent d23a3a6a30
commit 39d6f2e8a5
6 changed files with 291 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2001-02-05 Mark Mitchell <mark@codesourcery.com>
* Makefile.in (s-mlib): Don't build multilibs if
--disable-multilib.
(DRIVER_DEFINES): Adjust accordingly.
(gcc.o): Likewise.
(protoize.o): Likewise.
(unprotoize.o): Likewise.
* configure.in: Recognize --enable-multilib.
2001-02-04 Mark Mitchell <mark@codesourcery.com>
* Makefile.in (DRIVER_DEFINES): Fix quoting.

23
gcc/Makefile.in
View File

@ -1069,12 +1069,13 @@ libgcc.a: $(LIBGCC_DEPS)
multilib.h: s-mlib; @true
s-mlib: $(srcdir)/genmultilib Makefile
$(SHELL) $(srcdir)/genmultilib \
"$(MULTILIB_OPTIONS)" \
"$(MULTILIB_DIRNAMES)" \
"$(MULTILIB_MATCHES)" \
"$(MULTILIB_EXCEPTIONS)" \
"$(MULTILIB_EXTRA_OPTS)" \
"$(MULTILIB_EXCLUSIONS)" > tmp-mlib.h
"`test @enable_multilib@ = yes && echo $(MULTILIB_OPTIONS)`" \
"`test @enable_multilib@ = yes && echo $(MULTILIB_DIRNAMES)`" \
"`test @enable_multilib@ = yes && echo $(MULTILIB_MATCHES)`" \
"`test @enable_multilib@ = yes && echo $(MULTILIB_EXCEPTIONS)`" \
"`test @enable_multilib@ = yes && echo $(MULTILIB_EXTRA_OPTS)`" \
"`test @enable_multilib@ = yes && echo $(MULTILIB_EXCLUSIONS)`" \
> tmp-mlib.h
$(SHELL) $(srcdir)/move-if-change tmp-mlib.h multilib.h
touch s-mlib
@ -1269,11 +1270,13 @@ DRIVER_DEFINES = \
-DDEFAULT_TARGET_MACHINE=\"$(target_alias)\" \
-DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
-DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\" \
`test "$(SHLIB_LINK)" -a "@enable_shared@" = "yes" && echo "-DENABLE_SHARED_LIBGCC"` \
`test "$(SHLIB_MULTILIB)" && echo "-DNO_SHARED_LIBGCC_MULTILIB"`
`test "$${SHLIB_LINK}" -a "@enable_shared@" = "yes" && echo "-DENABLE_SHARED_LIBGCC"` \
`test "$${SHLIB_MULTILIB}" && echo "-DNO_SHARED_LIBGCC_MULTILIB"`
gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
Makefile $(lang_specs_files) prefix.h $(GCC_H)
SHLIB_LIB='$(SHLIB_LINK)' \
SHLIB_MULTILIB='$(SHLIB_MULTILIB)' \
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(DRIVER_DEFINES) \
-c $(srcdir)/gcc.c
@ -1977,12 +1980,16 @@ unprotoize$(exeext): unprotoize.o $(PROTO_OBJS) $(LIBDEPS)
protoize.o: protoize.c $(srcdir)/../include/getopt.h $(CONFIG_H) system.h \
Makefile version.h
SHLIB_LIB='$(SHLIB_LINK)' \
SHLIB_MULTILIB='$(SHLIB_MULTILIB)' \
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(DRIVER_DEFINES) $(PREPROCESSOR_DEFINES) \
$(srcdir)/protoize.c $(OUTPUT_OPTION)
unprotoize.o: unprotoize.c protoize.c $(srcdir)/../include/getopt.h \
$(CONFIG_H) system.h Makefile version.h
SHLIB_LIB='$(SHLIB_LINK)' \
SHLIB_MULTILIB='$(SHLIB_MULTILIB)' \
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(DRIVER_DEFINES) $(PREPROCESSOR_DEFINES) \
$(srcdir)/unprotoize.c $(OUTPUT_OPTION)

494
gcc/configure vendored
View File

File diff suppressed because it is too large Load Diff

6
gcc/configure.in
View File

@ -176,6 +176,12 @@ changequote([, ])dnl
fi
fi
# Determine whether or not multilibs are enabled.
AC_ARG_ENABLE(multilib,
[ --enable-multilib enable library support for multiple ABIs],
[], [enable_multilib=yes])
AC_SUBST(enable_multilib)
# Enable expensive internal checks
AC_ARG_ENABLE(checking,
[ --enable-checking[=LIST]

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2001-02-05 Mark Mitchell <mark@codesourcery.com>
* Makefile.in (g++spec.o): Adjust use of DRIVER_DEFINES.
Sun Feb 4 15:52:44 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* decl.c (pushdecl): Call abort instead of fatal.

2
gcc/cp/Make-lang.in
View File

@ -61,6 +61,8 @@ C++ c++: cc1plus$(exeext)
.PHONY: C++ c++
g++spec.o: $(srcdir)/cp/g++spec.c system.h $(GCC_H) $(CONFIG_H)
SHLIB_LIB='$(SHLIB_LINK)' \
SHLIB_MULTILIB='$(SHLIB_MULTILIB)' \
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
$(INCLUDES) $(srcdir)/cp/g++spec.c