* Makefile.in (ALL_HOST_BACKEND_OBJS): Add $(GENGTYPE_OBJS),

	gcc-ar.o, gcc-nm.o and gcc-ranlib.o.
	(GENGTYPE_OBJS): New.
	(gengtype-lex.o, gengtype-parse.o, gengtype-state.o, gengtype.o):
	Remove explicit dependencies.
	(CFLAGS-gengtype-lex.o, CFLAGS-gengtype-parse.o,
	CFLAGS-gengtype-state.o, CFLAGS-gengtype.o): Add -DHOST_GENERATOR_FILE
	instead of -DGENERATOR_FILE.
	(CFLAGS-errors.o): New.
	* gengtype.c: Instead of testing GENERATOR_FILE define, test
	HOST_GENERATOR_FILE.  If defined, include config.h and define
	GENERATOR_FILE afterwards, otherwise include bconfig.h.
	* gengtype-parse.c: Likewise.
	* gengtype-state.c: Likewise.
	* gengtype-lex.l: Likewise.
	* errors.c: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218325 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f361ce2..5110db9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,22 @@
+2014-12-03  Jakub Jelinek  <jakub@redhat.com>
+
+       * Makefile.in (ALL_HOST_BACKEND_OBJS): Add $(GENGTYPE_OBJS),
+       gcc-ar.o, gcc-nm.o and gcc-ranlib.o.
+       (GENGTYPE_OBJS): New.
+       (gengtype-lex.o, gengtype-parse.o, gengtype-state.o, gengtype.o):
+       Remove explicit dependencies.
+       (CFLAGS-gengtype-lex.o, CFLAGS-gengtype-parse.o,
+       CFLAGS-gengtype-state.o, CFLAGS-gengtype.o): Add -DHOST_GENERATOR_FILE
+       instead of -DGENERATOR_FILE.
+       (CFLAGS-errors.o): New.
+       * gengtype.c: Instead of testing GENERATOR_FILE define, test
+       HOST_GENERATOR_FILE.  If defined, include config.h and define
+       GENERATOR_FILE afterwards, otherwise include bconfig.h.
+       * gengtype-parse.c: Likewise.
+       * gengtype-state.c: Likewise.
+       * gengtype-lex.l: Likewise.
+       * errors.c: Likewise.
+
 2014-12-03  Joern Rennecke  <joern.rennecke@embecosm.com>
 
        * config/epiphany/epiphany.c (epiphany_override_options):
@@ -10,8 +29,8 @@
        Revert:
 
        2014-09-17  Andrew Stubbs  <ams@codesourcery.com>
-       * config/arm/arm.c (arm_option_override): Reject -mfpu=neon
-       when architecture is older than ARMv7.
+       * config/arm/arm.c (arm_option_override): Reject -mfpu=neon
+       when architecture is older than ARMv7.
 
 2014-12-03  Richard Biener  <rguenther@suse.de>
 
@@ -5079,16 +5098,16 @@
        separation class.
        (generate_luj_sepclass_opt): Build the separation class option.
        (generate_luj_options): Set unroll and jam options.
-        (set_options): Support for unroll and jam options.
+       (set_options): Support for unroll and jam options.
        (scop_to_isl_ast): Likewise
        * graphite-optimize-isl.c (getPrevectorMap_full): New function for
-        computing the separating class map.
+       computing the separating class map.
        (optimize_isl): Support for the separating class map.
        (apply_schedule_map_to_scop): Likewise.
        (getScheduleMap): Likewise.
        (getScheduleForBand): Likewise.
        (getScheduleForBandList): Likewise.
-        * graphite.c (gate_graphite_transforms): Add unroll and jam flag.
+       * graphite.c (gate_graphite_transforms): Add unroll and jam flag.
        * toplev.c (process_options) Likewise.
 
 2014-11-15  Eric Botcazou  <ebotcazou@adacore.com>
@@ -5498,15 +5517,15 @@
 2014-11-14  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
 
        PR target/63724
-        * config/aarch64/aarch64.c (aarch64_expand_mov_immediate): Split out
-        numerical immediate handling to...
-        (aarch64_internal_mov_immediate): ...this. New.
-        (aarch64_rtx_costs): Use aarch64_internal_mov_immediate.
-        (aarch64_mov_operand_p): Relax predicate.
-        * config/aarch64/aarch64.md (mov<mode>:GPI): Do not expand CONST_INTs.
-        (*movsi_aarch64): Turn into define_insn_and_split and new alternative
-        for 'n'.
-        (*movdi_aarch64): Likewise.
+       * config/aarch64/aarch64.c (aarch64_expand_mov_immediate): Split out
+       numerical immediate handling to...
+       (aarch64_internal_mov_immediate): ...this. New.
+       (aarch64_rtx_costs): Use aarch64_internal_mov_immediate.
+       (aarch64_mov_operand_p): Relax predicate.
+       * config/aarch64/aarch64.md (mov<mode>:GPI): Do not expand CONST_INTs.
+       (*movsi_aarch64): Turn into define_insn_and_split and new alternative
+       for 'n'.
+       (*movdi_aarch64): Likewise.
 
 2014-11-14  Richard Biener  <rguenther@suse.de>
 
@@ -5627,22 +5646,20 @@
 
 2014-11-13  Alan Lawrence  <alan.lawrence@arm.com>
 
-        * tree-vectorizer.h (vect_gen_perm_mask): Remove.
-        (vect_gen_perm_mask_checked, vect_gen_perm_mask_any): New.
+       * tree-vectorizer.h (vect_gen_perm_mask): Remove.
+       (vect_gen_perm_mask_checked, vect_gen_perm_mask_any): New.
 
-        tree_vec_data_refs.c (vect_permute_load_chain, vec_permute_store_chain,
-        vec_shift_permute_load_chain): Replace vect_gen_perm_mask & assert
-        with vect_gen_perm_mask_checked.
+       * tree_vec_data_refs.c (vect_permute_load_chain,
+       vec_permute_store_chain, vec_shift_permute_load_chain): Replace
+       vect_gen_perm_mask & assert with vect_gen_perm_mask_checked.
 
-        * tree-vect-stmts.c (vectorizable_mask_load_store, vectorizable_load):
-        Likewise.
-
-        (vect_gen_perm_mask_checked): New.
-        (vect_gen_perm_mask): Remove can_vec_perm_p check, rename to...
-        (vect_gen_perm_mask_any): ...this.
-
-        (perm_mask_for_reverse): Call can_vec_perm_p and
-        vect_gen_perm_mask_checked.
+       * tree-vect-stmts.c (vectorizable_mask_load_store, vectorizable_load):
+       Likewise.
+       (vect_gen_perm_mask_checked): New.
+       (vect_gen_perm_mask): Remove can_vec_perm_p check, rename to...
+       (vect_gen_perm_mask_any): ...this.
+       (perm_mask_for_reverse): Call can_vec_perm_p and
+       vect_gen_perm_mask_checked.
 
 2014-11-13  Felix Yang  <felix.yang@huawei.com>
 
@@ -6459,7 +6476,7 @@
 
 2014-11-11  Evgeny Stupachenko  <evstupac@gmail.com>
 
-        * tree-vect-data-refs.c (vect_shift_permute_load_chain): Extend shift
+       * tree-vect-data-refs.c (vect_shift_permute_load_chain): Extend shift
        permutations on power of 2 cases.
 
 2014-11-11  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 204bd85..3820d0b 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1509,7 +1509,8 @@ ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS))
 ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \
   $(OBJS-libcommon-target) @TREEBROWSER@ main.o c-family/cppspec.o \
   $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \
-  $(GCOV_TOOL_OBJS) lto-wrapper.o collect-utils.o
+  $(GCOV_TOOL_OBJS) $(GENGTYPE_OBJS) gcc-ar.o gcc-nm.o gcc-ranlib.o \
+  lto-wrapper.o collect-utils.o
 
 # This lists all host object files, whether they are included in this
 # compilation or not.
@@ -2484,30 +2485,31 @@ build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) $(SYSTEM_H) rtl.def
 # on BCONFIG_H.  For the build objects, add -DGENERATOR_FILE manually,
 # the build-%: rule doesn't apply to them.
 
+GENGTYPE_OBJS = gengtype.o gengtype-parse.o gengtype-state.o \
+  gengtype-lex.o errors.o
+
 gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H)
-gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H)
-CFLAGS-gengtype-lex.o += -DGENERATOR_FILE
+CFLAGS-gengtype-lex.o += -DHOST_GENERATOR_FILE
 build/gengtype-lex.o: $(BCONFIG_H)
 
 gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \
   $(SYSTEM_H)
-gengtype-parse.o: $(CONFIG_H)
-CFLAGS-gengtype-parse.o += -DGENERATOR_FILE
+CFLAGS-gengtype-parse.o += -DHOST_GENERATOR_FILE
 build/gengtype-parse.o: $(BCONFIG_H)
 
 gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \
   gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \
   $(XREGEX_H)
-gengtype-state.o: $(CONFIG_H)
-CFLAGS-gengtype-state.o += -DGENERATOR_FILE
+CFLAGS-gengtype-state.o += -DHOST_GENERATOR_FILE
 build/gengtype-state.o: $(BCONFIG_H)
 gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h        \
   rtl.def insn-notes.def errors.h double-int.h version.h               \
   $(HASHTAB_H) $(OBSTACK_H) $(XREGEX_H)
-gengtype.o: $(CONFIG_H)
-CFLAGS-gengtype.o += -DGENERATOR_FILE
+CFLAGS-gengtype.o += -DHOST_GENERATOR_FILE
 build/gengtype.o: $(BCONFIG_H)
 
+CFLAGS-errors.o += -DHOST_GENERATOR_FILE
+
 build/genmddeps.o: genmddeps.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h    \
   errors.h $(READ_MD_H)
 build/genmodes.o : genmodes.c $(BCONFIG_H) $(SYSTEM_H) errors.h                \

diff --git a/gcc/errors.c b/gcc/errors.c
index be38b1f..a6a30fe 100644 (file)
--- a/gcc/errors.c
+++ b/gcc/errors.c
@@ -21,10 +21,11 @@ along with GCC; see the file COPYING3.  If not see
    in the generator programs; the compiler has a more elaborate suite
    of diagnostic printers, found in diagnostic.c.  */
 
-#ifdef GENERATOR_FILE
-#include "bconfig.h"
-#else
+#ifdef HOST_GENERATOR_FILE
 #include "config.h"
+#define GENERATOR_FILE 1
+#else
+#include "bconfig.h"
 #endif
 #include "system.h"
 #include "errors.h"

diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l
index 5e12885..0866603 100644 (file)
--- a/gcc/gengtype-lex.l
+++ b/gcc/gengtype-lex.l
@@ -21,10 +21,11 @@ along with GCC; see the file COPYING3.  If not see
 %option noinput
 
 %{
-#ifdef GENERATOR_FILE
-#include "bconfig.h"
-#else
+#ifdef HOST_GENERATOR_FILE
 #include "config.h"
+#define GENERATOR_FILE 1
+#else
+#include "bconfig.h"
 #endif
 #include "system.h"
 

diff --git a/gcc/gengtype-parse.c b/gcc/gengtype-parse.c
index 0f11cec..87b6917 100644 (file)
--- a/gcc/gengtype-parse.c
+++ b/gcc/gengtype-parse.c
@@ -17,10 +17,11 @@
    along with GCC; see the file COPYING3.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#ifdef GENERATOR_FILE
-#include "bconfig.h"
-#else
+#ifdef HOST_GENERATOR_FILE
 #include "config.h"
+#define GENERATOR_FILE 1
+#else
+#include "bconfig.h"
 #endif
 #include "system.h"
 #include "gengtype.h"

diff --git a/gcc/gengtype-state.c b/gcc/gengtype-state.c
index 5b7017f..7634f74 100644 (file)
--- a/gcc/gengtype-state.c
+++ b/gcc/gengtype-state.c
@@ -23,10 +23,11 @@
    and Basile Starynkevitch <basile@starynkevitch.net>
 */
 
-#ifdef GENERATOR_FILE
-#include "bconfig.h"
-#else
+#ifdef HOST_GENERATOR_FILE
 #include "config.h"
+#define GENERATOR_FILE 1
+#else
+#include "bconfig.h"
 #endif
 #include "system.h"
 #include "errors.h"    /* For fatal.  */

diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 2dc857e..39d2918 100644 (file)
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -17,10 +17,11 @@
    along with GCC; see the file COPYING3.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#ifdef GENERATOR_FILE
-#include "bconfig.h"
-#else
+#ifdef HOST_GENERATOR_FILE
 #include "config.h"
+#define GENERATOR_FILE 1
+#else
+#include "bconfig.h"
 #endif
 #include "system.h"
 #include "errors.h"            /* for fatal */