From f773bb84823cda94fa49d3a4d3026276a54e9446 Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Fri, 5 Dec 2008 08:01:58 +0000 Subject: re PR bootstrap/38262 (GCC components unnecessarily link with shared gmp/mpfr) 2008-11-07 Sebastian Pop PR bootstrap/38262 * java/Make-lang.in (jc1): Add BACKENDLIBS, remove GMPLIBS. * objc/Make-lang.in (cc1obj-dummy, cc1obj): Same. * objcp/Make-lang.in (cc1objplus-dummy, cc1objplus): Same. * cp/Make-lang.in (cc1plus-dummy, cc1plus): Same. * ada/gcc-interface/Make-lang.in (gnat1): Same. * fortran/Make-lang.in (f951): Same. * Makefile.in (LIBS): Remove GMPLIBS, CLOOGLIBS and PPLLIBS. (BACKENDLIBS): New. (cc1-dummy, cc1): Add BACKENDLIBS, remove GMPLIBS. From-SVN: r142464 --- gcc/ChangeLog | 13 +++++++++++++ gcc/Makefile.in | 9 ++++----- gcc/ada/gcc-interface/Make-lang.in | 2 +- gcc/cp/Make-lang.in | 4 ++-- gcc/fortran/Make-lang.in | 2 +- gcc/java/Make-lang.in | 2 +- gcc/objc/Make-lang.in | 4 ++-- gcc/objcp/Make-lang.in | 4 ++-- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 01f7f07..53290c5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2008-11-07 Sebastian Pop + + PR bootstrap/38262 + * java/Make-lang.in (jc1): Add BACKENDLIBS, remove GMPLIBS. + * objc/Make-lang.in (cc1obj-dummy, cc1obj): Same. + * objcp/Make-lang.in (cc1objplus-dummy, cc1objplus): Same. + * cp/Make-lang.in (cc1plus-dummy, cc1plus): Same. + * ada/gcc-interface/Make-lang.in (gnat1): Same. + * fortran/Make-lang.in (f951): Same. + * Makefile.in (LIBS): Remove GMPLIBS, CLOOGLIBS and PPLLIBS. + (BACKENDLIBS): New. + (cc1-dummy, cc1): Add BACKENDLIBS, remove GMPLIBS. + 2008-12-05 Ben Elliston * c-parser.c (c_parser_enum_specifier): Initialise ident_loc and diff --git a/gcc/Makefile.in b/gcc/Makefile.in index b50d1f4..097159c 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -920,9 +920,8 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY) # How to link with both our special library facilities # and the system's installed libraries. -LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER) \ - $(GMPLIBS) $(CLOOGLIBS) $(PPLLIBS) - +LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER) +BACKENDLIBS = $(GMPLIBS) $(CLOOGLIBS) $(PPLLIBS) # Any system libraries needed just for GNAT. SYSLIBS = @GNAT_LIBEXC@ @@ -1654,7 +1653,7 @@ dummy-checksum.o : dummy-checksum.c cc1-dummy$(exeext): $(C_OBJS) dummy-checksum.o $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) dummy-checksum.o \ - $(BACKEND) $(LIBS) $(GMPLIBS) + $(BACKEND) $(LIBS) $(BACKENDLIBS) cc1-checksum.c : cc1-dummy$(exeext) build/genchecksum$(build_exeext) build/genchecksum$(build_exeext) cc1-dummy$(exeext) > $@ @@ -1663,7 +1662,7 @@ cc1-checksum.o : cc1-checksum.c cc1$(exeext): $(C_OBJS) cc1-checksum.o $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) cc1-checksum.o \ - $(BACKEND) $(LIBS) $(GMPLIBS) + $(BACKEND) $(LIBS) $(BACKENDLIBS) # # Build libgcc.a. diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 908efad..a7470c9 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -299,7 +299,7 @@ TARGET_ADA_SRCS = # Since the RTL should be built with the latest compiler, remove the # stamp target in the parent directory whenever gnat1 is rebuilt gnat1$(exeext): $(TARGET_ADA_SRCS) $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBDEPS) - $(GCC_LINK) -o $@ $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBS) $(SYSLIBS) $(GMPLIBS) $(CFLAGS) + $(GCC_LINK) -o $@ $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBS) $(SYSLIBS) $(BACKENDLIBS) $(CFLAGS) $(RM) stamp-gnatlib2-rts stamp-tools gnatbind$(exeext): ada/b_gnatb.o $(CONFIG_H) $(GNATBIND_OBJS) diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index b6ccb3e..38aec6c 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -93,7 +93,7 @@ cp-warn = $(STRICT_WARN) cc1plus-dummy$(exeext): $(CXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(CXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBS) $(GMPLIBS) + $(CXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS) cc1plus-checksum.c : cc1plus-dummy$(exeext) build/genchecksum$(build_exeext) build/genchecksum$(build_exeext) cc1plus-dummy$(exeext) > $@ @@ -102,7 +102,7 @@ cc1plus-checksum.o : cc1plus-checksum.c cc1plus$(exeext): $(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBS) $(GMPLIBS) + $(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS) # Special build rules. $(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index 6288732..ff5d03e 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -98,7 +98,7 @@ gfortran-cross$(exeext): gfortran$(exeext) f951$(exeext): $(F95_OBJS) \ $(BACKEND) $(LIBDEPS) attribs.o $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(F95_OBJS) $(BACKEND) $(LIBS) attribs.o $(GMPLIBS) + $(F95_OBJS) $(BACKEND) $(LIBS) attribs.o $(BACKENDLIBS) gt-fortran-trans.h : s-gtype; @true # diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 45f3afb..605f7e3 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -101,7 +101,7 @@ jvspec.o-warn = -Wno-error jc1$(exeext): $(JAVA_OBJS) $(BACKEND) $(LIBDEPS) attribs.o rm -f $@ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(JAVA_OBJS) $(BACKEND) $(ZLIB) $(LIBICONV) $(LIBS) attribs.o $(GMPLIBS) + $(JAVA_OBJS) $(BACKEND) $(ZLIB) $(LIBICONV) $(LIBS) attribs.o $(BACKENDLIBS) jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIBDEPS) rm -f $@ diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index c5de9d8..4f854ea 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -54,7 +54,7 @@ objc_OBJS = $(OBJC_OBJS) cc1obj-checksum.o cc1obj-dummy$(exeext): $(OBJC_OBJS) $(C_AND_OBJC_OBJS) dummy-checksum.o $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ $(OBJC_OBJS) $(C_AND_OBJC_OBJS) dummy-checksum.o \ - $(BACKEND) $(LIBS) $(GMPLIBS) + $(BACKEND) $(LIBS) $(BACKENDLIBS) cc1obj-checksum.c : cc1obj-dummy$(exeext) build/genchecksum$(build_exeext) build/genchecksum$(build_exeext) cc1obj-dummy$(exeext) > $@ @@ -64,7 +64,7 @@ cc1obj-checksum.o : cc1obj-checksum.c cc1obj$(exeext): $(OBJC_OBJS) $(C_AND_OBJC_OBJS) cc1obj-checksum.o $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ $(OBJC_OBJS) $(C_AND_OBJC_OBJS) cc1obj-checksum.o \ - $(BACKEND) $(LIBS) $(GMPLIBS) + $(BACKEND) $(LIBS) $(BACKENDLIBS) # Objective C language specific files. diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in index fb7cffe..6e3290c 100644 --- a/gcc/objcp/Make-lang.in +++ b/gcc/objcp/Make-lang.in @@ -56,7 +56,7 @@ obj-c++_OBJS = $(OBJCXX_OBJS) cc1objplus-checksum.o cc1objplus-dummy$(exeext): $(OBJCXX_OBJS) dummy-checksum.o $(BACKEND) \ $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(OBJCXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBS) $(GMPLIBS) + $(OBJCXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS) cc1objplus-checksum.c : cc1objplus-dummy$(exeext) build/genchecksum$(build_exeext) build/genchecksum$(build_exeext) cc1objplus-dummy$(exeext) > $@ @@ -65,7 +65,7 @@ cc1objplus-checksum.o : cc1objplus-checksum.c cc1objplus$(exeext): $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBS) $(GMPLIBS) + $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS) # Objective C++ language specific files. -- cgit v1.1