diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 5 | ||||
| -rw-r--r-- | gcc/c/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c/Make-lang.in | 3 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/Make-lang.in | 3 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/Make-lang.in | 3 | ||||
| -rw-r--r-- | gcc/go/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/go/Make-lang.in | 3 | ||||
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 3 |
12 files changed, 33 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 47fc4d70aa7..854249539d3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2013-09-25 Tom Tromey <tromey@redhat.com> + * Makefile.in (DRIVER_DEFINES): Use $(and), not shell code, + to add -DENABLE_SHARED_LIBGCC. + (gcc.o): Don't use subshell. + +2013-09-25 Tom Tromey <tromey@redhat.com> + * Makefile.in (OUTPUT_OPTION): Define as "-o $@". * configure.ac: Don't invoke AM_PROG_CC_C_O. (NO_MINUS_C_MINUS_O, OUTPUT_OPTION): Don't subst. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 154fe241750..a3ae57b43c1 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2089,16 +2089,15 @@ DRIVER_DEFINES = \ -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \ @TARGET_SYSTEM_ROOT_DEFINE@ \ $(VALGRIND_DRIVER_DEFINES) \ - `test "X$${SHLIB}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"` \ + $(and $(SHLIB),$(filter yes,@enable_shared@),-DENABLE_SHARED_LIBGCC) \ -DCONFIGURE_SPECS="\"@CONFIGURE_SPECS@\"" gcc.o: gcc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) intl.h multilib.h \ Makefile $(lang_specs_files) specs.h prefix.h $(GCC_H) $(FLAGS_H) \ configargs.h $(OBSTACK_H) $(OPTS_H) $(DIAGNOSTIC_H) $(VEC_H) $(PARAMS_H) - (SHLIB='$(SHLIB)'; \ $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ $(DRIVER_DEFINES) \ - -c $(srcdir)/gcc.c $(OUTPUT_OPTION)) + -c $(srcdir)/gcc.c $(OUTPUT_OPTION) specs.h : s-specs ; @true s-specs : Makefile diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 81b2018e8c0..07cd2744ec3 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,7 @@ +2013-09-25 Tom Tromey <tromey@redhat.com> + + * Make-lang.in (c/gccspec.o): Don't use subshell. + 2013-09-18 Marek Polacek <polacek@redhat.com> PR sanitize/58443 diff --git a/gcc/c/Make-lang.in b/gcc/c/Make-lang.in index 1161742c274..86deb1d9033 100644 --- a/gcc/c/Make-lang.in +++ b/gcc/c/Make-lang.in @@ -46,10 +46,9 @@ c: cc1$(exeext) # is to cc1 as e.g. g++ is to cc1plus, or gfortran is to f951). c/gccspec.o: c/gccspec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) \ $(OPTS_H) - (SHLIB='$(SHLIB)'; \ $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ $(DRIVER_DEFINES) \ - -c $(srcdir)/c/gccspec.c $(OUTPUT_OPTION)) + -c $(srcdir)/c/gccspec.c $(OUTPUT_OPTION) # The C compiler itself. diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5cbc070040e..fc43db0b94c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2013-09-25 Tom Tromey <tromey@redhat.com> + + * Make-lang.in (g++spec.o): Don't use subshell. + 2013-09-25 Marek Polacek <polacek@redhat.com> PR c++/58516 diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 985f22b72d9..770f27257c6 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -53,9 +53,8 @@ c++: cc1plus$(exeext) g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) \ $(CONFIG_H) $(OPTS_H) - (SHLIB='$(SHLIB)'; \ $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ - $(INCLUDES) $(srcdir)/cp/g++spec.c) + $(INCLUDES) $(srcdir)/cp/g++spec.c # Create the compiler driver for g++. GXX_OBJS = $(GCC_OBJS) g++spec.o diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5b032d9a466..f97532ee807 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2013-09-25 Tom Tromey <tromey@redhat.com> + + * Make-lang.in (gfortranspec.o): Don't use subshell. + 2013-09-23 Janus Weil <janus@gcc.gnu.org> PR fortran/58355 diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index 47deca61c6f..b738ff42201 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -78,9 +78,8 @@ fortran: f951$(exeext) gfortranspec.o: $(srcdir)/fortran/gfortranspec.c $(SYSTEM_H) $(TM_H) $(GCC_H) \ $(CONFIG_H) coretypes.h intl.h $(OPTS_H) - (SHLIB='$(SHLIB)'; \ $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ - $(INCLUDES) $(srcdir)/fortran/gfortranspec.c) + $(INCLUDES) $(srcdir)/fortran/gfortranspec.c # Create the compiler driver gfortran. GFORTRAN_D_OBJS = $(GCC_OBJS) gfortranspec.o diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog index c730ecaa183..bce1ce51c00 100644 --- a/gcc/go/ChangeLog +++ b/gcc/go/ChangeLog @@ -1,3 +1,7 @@ +2013-09-25 Tom Tromey <tromey@redhat.com> + + * Make-lang.in (gospec.o): Don't use subshell. + 2013-08-28 Ian Lance Taylor <iant@google.com> * go-gcc.cc (Gcc_backend::immutable_struct): Set TREE_PUBLIC if diff --git a/gcc/go/Make-lang.in b/gcc/go/Make-lang.in index 3cb18d6adcf..015ed7a03bb 100644 --- a/gcc/go/Make-lang.in +++ b/gcc/go/Make-lang.in @@ -32,9 +32,8 @@ go: go1$(exeext) gospec.o: $(srcdir)/go/gospec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) \ $(CONFIG_H) opts.h - (SHLIB='$(SHLIB)'; \ $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ - $(INCLUDES) $(srcdir)/go/gospec.c) + $(INCLUDES) $(srcdir)/go/gospec.c GCCGO_OBJS = $(GCC_OBJS) gospec.o gccgo$(exeext): $(GCCGO_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 9cc34c51a5a..78adee9c5bc 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2013-09-25 Tom Tromey <tromey@redhat.com> + + * Make-lang.in (jvspec.o): Don't use subshell. + 2013-06-05 Jan Hubicka <jh@suse.cz> * class.c (emit_register_classes_in_jcr_section): Use DECL_PRESERVE_P diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 8a6210fea3b..078f6d43379 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -57,9 +57,8 @@ JAVA_TARGET_INDEPENDENT_BIN_TOOLS = jcf-dump jvspec.o: $(srcdir)/java/jvspec.c $(SYSTEM_H) coretypes.h $(TM_H) \ $(GCC_H) $(CONFIG_H) java/jcf.h java/javaop.h $(OPTS_H) - (SHLIB='$(SHLIB)'; \ $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ - $(INCLUDES) $(srcdir)/java/jvspec.c $(OUTPUT_OPTION)) + $(INCLUDES) $(srcdir)/java/jvspec.c $(OUTPUT_OPTION) # Create the compiler driver for $(XGCJ). $(XGCJ)$(exeext): $(GCC_OBJS) jvspec.o java/jcf-path.o \ |