diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 1 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/Make-lang.in | 1 | ||||
| -rw-r--r-- | gcc/fortran/cpp.c | 6 |
5 files changed, 19 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 01c3d9a..333a17f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-10-21 Tobias Burnus <burnus@net-b.de> + + PR fortran/54725 + * Makefile.in (TARGET_SYSTEM_ROOT_DEFINE): New. + 2012-10-21 Chung-Lin Tang <cltang@codesourcery.com> * config/xtensa/xtensa.c (xtensa_expand_builtin): Remove unused 'arg' diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 7ae3bb9..e18dc8f 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -468,6 +468,7 @@ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ] # Directory for prefix to system directories, for # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ +TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ xmake_file=@xmake_file@ tmake_file=@tmake_file@ diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2ba0506..14f78d5 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2012-10-21 Tobias Burnus <burnus@net-b.de> + + PR fortran/54725 + * Make-lang.in (CFLAGS-cpp.o): Use TARGET_SYSTEM_ROOT_DEFINE. + * cpp.o (gfc_cpp_init_options): Use it for + setting gfc_cpp_option.sysroot. + 2012-10-21 Thomas König <tkoenig@gcc.gnu.org> PR fortran/54465 diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index a74eb7f..4201e45 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -341,6 +341,7 @@ GFORTRAN_TRANS_DEPS = fortran/gfortran.h fortran/libgfortran.h \ $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(TM_H) coretypes.h $(GGC_H) \ fortran/iso-c-binding.def fortran/iso-fortran-env.def +CFLAGS-fortran/cpp.o += $(TARGET_SYSTEM_ROOT_DEFINE) fortran/f95-lang.o: $(GFORTRAN_TRANS_DEPS) fortran/mathbuiltins.def \ gt-fortran-f95-lang.h gtype-fortran.h $(CGRAPH_H) $(TARGET_H) fortran/cpp.h \ $(BUILTINS_DEF) fortran/types.def \ diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c index c45af39..f54ba96 100644 --- a/gcc/fortran/cpp.c +++ b/gcc/fortran/cpp.c @@ -38,6 +38,10 @@ along with GCC; see the file COPYING3. If not see #include "cppbuiltin.h" #include "mkdeps.h" +#ifndef TARGET_SYSTEM_ROOT +# define TARGET_SYSTEM_ROOT NULL +#endif + #ifndef TARGET_CPU_CPP_BUILTINS # define TARGET_CPU_CPP_BUILTINS() #endif @@ -267,7 +271,7 @@ gfc_cpp_init_options (unsigned int decoded_options_count, gfc_cpp_option.multilib = NULL; gfc_cpp_option.prefix = NULL; - gfc_cpp_option.sysroot = NULL; + gfc_cpp_option.sysroot = TARGET_SYSTEM_ROOT; gfc_cpp_option.deferred_opt = XNEWVEC (gfc_cpp_deferred_opt_t, decoded_options_count); |