diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 308c0eb20d2805ca992ab50466aead076752d874..1caedf2c8665007b3bbfc815ddca3a7eff7d8334 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-29  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.c (ix86_mode_after): Make static.
+
 2015-01-29  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/64844
@@ -242,32 +246,32 @@
 
 2015-01-27  Dominik Vogt  <vogt@linux.vnet.ibm.com>
 
-        * doc/extend.texi: s/390: Update documentation of hotpatch attribute.
-        * doc/invoke.texi (-mhotpatch): s/390: Update documentation of
-        -mhotpatch= option.
-        * config/s390/s390.opt (mhotpatch): s/390: Remove -mhotpatch and
-        -mno-hotpatch options.  Change syntax of -mhotpatch= option.
-        * config/s390/s390.c (s390_hotpatch_trampoline_halfwords_default):
-        Renamed.
-        (s390_hotpatch_trampoline_halfwords_max): Renamed.
-        (s390_hotpatch_hw_max): New name.
-        (s390_hotpatch_trampoline_halfwords): Renamed.
-        (s390_hotpatch_hw_before_label): New name.
-        (get_hotpatch_attribute): Removed.
-        (s390_hotpatch_hw_after_label): New name.
-        (s390_handle_hotpatch_attribute): Add second parameter to hotpatch
-        attribute.
-        (s390_attribute_table): Ditto.
-        (s390_function_num_hotpatch_trampoline_halfwords): Renamed.
-        (s390_function_num_hotpatch_hw): New name.
-        Remove special handling of inline functions and hotpatching.
-        Return number of nops before and after the function label.
-        (s390_can_inline_p): Removed.
-        (s390_asm_output_function_label): Emit a configurable number of nops
-        after the function label.
-        (s390_option_override): Update -mhotpatch= syntax and remove -mhotpatch.
-        (TARGET_CAN_INLINE_P) Removed.
-        (TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P): New.
+	* doc/extend.texi: s/390: Update documentation of hotpatch attribute.
+	* doc/invoke.texi (-mhotpatch): s/390: Update documentation of
+	-mhotpatch= option.
+	* config/s390/s390.opt (mhotpatch): s/390: Remove -mhotpatch and
+	-mno-hotpatch options.  Change syntax of -mhotpatch= option.
+	* config/s390/s390.c (s390_hotpatch_trampoline_halfwords_default):
+	Renamed.
+	(s390_hotpatch_trampoline_halfwords_max): Renamed.
+	(s390_hotpatch_hw_max): New name.
+	(s390_hotpatch_trampoline_halfwords): Renamed.
+	(s390_hotpatch_hw_before_label): New name.
+	(get_hotpatch_attribute): Removed.
+	(s390_hotpatch_hw_after_label): New name.
+	(s390_handle_hotpatch_attribute): Add second parameter to hotpatch
+	attribute.
+	(s390_attribute_table): Ditto.
+	(s390_function_num_hotpatch_trampoline_halfwords): Renamed.
+	(s390_function_num_hotpatch_hw): New name.
+	Remove special handling of inline functions and hotpatching.
+	Return number of nops before and after the function label.
+	(s390_can_inline_p): Removed.
+	(s390_asm_output_function_label): Emit a configurable number of nops
+	after the function label.
+	(s390_option_override): Update -mhotpatch= syntax and remove -mhotpatch.
+	(TARGET_CAN_INLINE_P) Removed.
+	(TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P): New.
 
 2015-01-27  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
 	    Jiong Wang  <jiong.wang@arm.com>
@@ -374,7 +378,7 @@
 
 2015-01-26  Uros Bizjak  <ubizjak@gmail.com>
 
-        PR target/64795
+	PR target/64795
 	* config/i386/i386.md (*movdi_internal): Also check operand 0
 	to determine TYPE_LEA operand.
 	(*movsi_internal): Ditto.
@@ -407,7 +411,7 @@
 	* config/arm/arm.c (arm_file_start): Update the assignment of
 	Tag_ABI_HardFP_use.
 
-2014-01-25  James Greenhalgh  <james.greenhalgh@arm.com>
+2015-01-25  James Greenhalgh  <james.greenhalgh@arm.com>
 
 	* config/arm/arm-cores.def (cortex-a57): Use the new Cortex-A57
 	pipeline model.
@@ -814,8 +818,7 @@
 
 2015-01-21  Alan Hayward  <alan.hayward@arm.com>
 
-	* rtlanal.c (subreg_get_info): Exit early for simple and common
-	cases.
+	* rtlanal.c (subreg_get_info): Exit early for simple and common cases.
 
 2015-01-21  Richard Henderson  <rth@redhat.com>
 
@@ -920,11 +923,13 @@
 
 2015-01-20  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
-	* config/tilegx/mul-tables.c: Move symtab.h include after coretypes.h include.
-	* config/tilepro/mul-tables.c: Add includes hashtab.h, hash-set.h, vec.h,
-	machmode.h, tm.h, hard-reg-set.h, input.h, function.h, rtl.h, flags.h, statistics.h,
-	double-int.h, real.h, fixed-value.h, alias.h, wide-int.h, inchash.h, tree.h,
-	insn-config.h, expmed.h, dojump.h, explow.h, calls.h, emit-rtl.h, varasm.h, stmt.h.
+	* config/tilegx/mul-tables.c: Move symtab.h include after
+	coretypes.h include.
+	* config/tilepro/mul-tables.c: Add includes hashtab.h, hash-set.h,
+	vec.h, machmode.h, tm.h, hard-reg-set.h, input.h, function.h, rtl.h,
+	flags.h, statistics.h, double-int.h, real.h, fixed-value.h, alias.h,
+	wide-int.h, inchash.h, tree.h, insn-config.h, expmed.h, dojump.h,
+	explow.h, calls.h, emit-rtl.h, varasm.h, stmt.h.
 
 2015-01-20  Igor Zamyatin  <igor.zamyatin@intel.com>
 
@@ -1146,8 +1151,8 @@
 	freciprocal-math, fvect-cost-model, fsimd-cost-model): Mark as
 	Optimization
 	(fauto-profile, fcommon, fdata-sections, fipa-icf-variables,
-        ftoplevel-reorder, funit-at-a-time, fwhole-program): Do not mark as
-        Optimization.
+	ftoplevel-reorder, funit-at-a-time, fwhole-program): Do not mark as
+	Optimization.
 	* ipa-icf.c (gate, sem_item_optimizer::filter_removed_items):
 	Fix for IPA.
 
@@ -1256,15 +1261,15 @@
 	(xorqi3): Likewise.
 	* config/rl78/rl78-protos.h (rl78_sfr_p): New.
 
-        * config/rl78/constrains (Qs8): New constraint.
-        * config/rl78/rl78.c (rl78_flags_already_set): New function.
-        * config/rl78/rl78-protos.h (rl78_flags_already_set): New prototype.
-        * config/rl78/rl78-real.md (update_Z): New attribute.
-        Update patterns to set it.
-        (cbranchqi4_real): Call rl78_flags_already_set() to determine if a
-        shorter compare and branch sequence can be used.
-        (cbranchhi4_real): Likewise.
-        (cbranchhi4_real_inverted): Likewise.
+	* config/rl78/constrains (Qs8): New constraint.
+	* config/rl78/rl78.c (rl78_flags_already_set): New function.
+	* config/rl78/rl78-protos.h (rl78_flags_already_set): New prototype.
+	* config/rl78/rl78-real.md (update_Z): New attribute.
+	Update patterns to set it.
+	(cbranchqi4_real): Call rl78_flags_already_set() to determine if a
+	shorter compare and branch sequence can be used.
+	(cbranchhi4_real): Likewise.
+	(cbranchhi4_real_inverted): Likewise.
 
 	* config/rl78/predicates.md (uword_operand): Allow symbol_refs.
 	* config/rl78/rl78-c.c (rl78_register_pragmas): Register __near
@@ -1288,7 +1293,8 @@
 	(rl78_asm_init_sections): Initialize it.
 	(rl78_select_section): Put __far readonly symbols in .frodata.
 	(rl78_make_type_far): New.
-	(rl78_insert_attributes): Force all readonly symbols to be __far when -mes0.
+	(rl78_insert_attributes): Force all readonly symbols to be
+	__far when -mes0.
 	(rl78_asm_out_integer): New.
 	* config/rl78/rl78.h (ADDR_SPACE_NEAR): New.
 	* config/rl78/rl78.opt (-mes0): New.
@@ -1430,7 +1436,7 @@
 	introduced in revision 219724.
 
 2015-01-16  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
-            Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
+	    Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
 
 	PR target/64263
 	* config/aarch64/aarch64.md (*movsi_aarch64): Don't split if the
@@ -1954,7 +1960,7 @@
 	* config/arm/aarch-cost-tables.h: Add cost tables for APM XGene-1
 	* doc/invoke.texi: Document -mcpu=xgene1.
 
-2015-10-15  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+2015-01-15  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
 	* dojump.h: New header file.
 	* explow.h: Likewise.
@@ -1979,20 +1985,22 @@
 	(tree_expr_size): Likewise.
 	Include calls.h dojump.h emit-rtl.h explow.h expmed.h
 	fixed-value.h hashtab.h statistics.h stmt.h varasm.h.
-	* genemit.c (main): Generate includes statistics.h, real.h, fixed-value.h,
-	insn-config.h, expmed.h, dojump.h, explow.h, emit-rtl.h, stmt.h.
-	* genopinit.c (main): Generate includes hashtab.h, hard-reg-set.h, function.h,
-	statistics.h, real.h, fixed-value.h, expmed.h, dojump.h, explow.h, emit-rtl.h,
+	* genemit.c (main): Generate includes statistics.h, real.h,
+	fixed-value.h, insn-config.h, expmed.h, dojump.h, explow.h, emit-rtl.h,
 	stmt.h.
+	* genopinit.c (main): Generate includes hashtab.h, hard-reg-set.h,
+	function.h, statistics.h, real.h, fixed-value.h, expmed.h, dojump.h,
+	explow.h, emit-rtl.h, stmt.h.
 	* genoutput.c (main): Generate includes hashtab.h, statistics.h, real.h,
 	fixed-value.h, expmed.h, dojump.h, explow.h, emit-rtl.h, stmt.h.
-	* genemit.c (open_base_files): Generate includes flags.h, statistics.h, real.h,
-	fixed-value.h, tree.h, expmed.h, dojump.h, explow.h, calls.h, emit-rtl.h, varasm.h,
-	stmt.h.
-	* config/tilepro/gen-mul-tables.cc: Generate includes hashtab.h, hash-set.h, vec.h,
-	machmode.h, tm.h, hard-reg-set.h, input.h, function.h, rtl.h, flags.h, statistics.h,
-	double-int.h, real.h, fixed-value.h, alias.h, wide-int.h, inchash.h, tree.h,
-	insn-config.h, expmed.h, dojump.h, explow.h, calls.h, emit-rtl.h, varasm.h, stmt.h.
+	* genemit.c (open_base_files): Generate includes flags.h, statistics.h,
+	real.h, fixed-value.h, tree.h, expmed.h, dojump.h, explow.h, calls.h,
+	emit-rtl.h, varasm.h, stmt.h.
+	* config/tilepro/gen-mul-tables.cc: Generate includes hashtab.h,
+	hash-set.h, vec.h, machmode.h, tm.h, hard-reg-set.h, input.h,
+	function.h, rtl.h, flags.h, statistics.h, double-int.h, real.h,
+	fixed-value.h, alias.h, wide-int.h, inchash.h, tree.h, insn-config.h,
+	expmed.h, dojump.h, explow.h, calls.h, emit-rtl.h, varasm.h, stmt.h.
 	* config/tilegx/mul-tables.c: Include alias.h calls.h dojump.h
 	double-int.h emit-rtl.h explow.h expmed.h fixed-value.h flags.h
 	function.h hard-reg-set.h hash-set.h hashtab.h inchash.h input.h
@@ -2002,12 +2010,12 @@
 	explow.h expmed.h fixed-value.h flags.h function.h hard-reg-set.h
 	hash-set.h hashtab.h inchash.h input.h insn-config.h machmode.h
 	real.h statistics.h stmt.h tree.h varasm.h vec.h wide-int.h.
-	* cfgloopanal.c: Include alias.h calls.h dojump.h double-int.h emit-rtl.h
-	explow.h expmed.h fixed-value.h flags.h inchash.h insn-config.h
-	real.h statistics.h stmt.h tree.h varasm.h wide-int.h.
+	* cfgloopanal.c: Include alias.h calls.h dojump.h double-int.h
+	emit-rtl.h explow.h expmed.h fixed-value.h flags.h inchash.h
+	insn-config.h real.h statistics.h stmt.h tree.h varasm.h wide-int.h.
 	* loop-iv.c: Likewise.
-	* lra-assigns.c: Include alias.h calls.h dojump.h double-int.h emit-rtl.h
-	explow.h expmed.h fixed-value.h flags.h inchash.h real.h
+	* lra-assigns.c: Include alias.h calls.h dojump.h double-int.h
+	emit-rtl.h explow.h expmed.h fixed-value.h flags.h inchash.h real.h
 	statistics.h stmt.h tree.h varasm.h wide-int.h.
 	* lra-constraints.c: Likewise.
 	* lra-eliminations.c: Likewise.
@@ -2024,9 +2032,9 @@
 	* reload.c: Include alias.h calls.h dojump.h double-int.h emit-rtl.h
 	explow.h expmed.h fixed-value.h inchash.h real.h rtl.h
 	statistics.h stmt.h tree.h varasm.h wide-int.h.
-	* caller-save.c: Include alias.h calls.h dojump.h double-int.h emit-rtl.h
-	explow.h expmed.h fixed-value.h inchash.h real.h statistics.h
-	stmt.h tree.h varasm.h wide-int.h.
+	* caller-save.c: Include alias.h calls.h dojump.h double-int.h
+	emit-rtl.h explow.h expmed.h fixed-value.h inchash.h real.h
+	statistics.h stmt.h tree.h varasm.h wide-int.h.
 	* combine-stack-adj.c: Likewise.
 	* cse.c: Likewise.
 	* ddg.c: Likewise.
@@ -2068,9 +2076,9 @@
 	insn-config.h real.h rtl.h statistics.h stmt.h tm.h varasm.h.
 	* rtl-chkp.c: Likewise.
 	* tree-chkp-opt.c: Likewise.
-	* config/arm/arm-builtins.c: Include calls.h dojump.h emit-rtl.h explow.h
-	expmed.h fixed-value.h flags.h function.h hard-reg-set.h hashtab.h
-	insn-config.h real.h statistics.h stmt.h varasm.h.
+	* config/arm/arm-builtins.c: Include calls.h dojump.h emit-rtl.h
+	explow.h expmed.h fixed-value.h flags.h function.h hard-reg-set.h
+	hashtab.h insn-config.h real.h statistics.h stmt.h varasm.h.
 	* ipa-icf.c: Include calls.h dojump.h emit-rtl.h explow.h expmed.h
 	fixed-value.h flags.h hashtab.h insn-config.h real.h rtl.h
 	statistics.h stmt.h.
@@ -2232,23 +2240,24 @@
 	* config/nvptx/nvptx.c: Include dojump.h emit-rtl.h explow.h expmed.h
 	fixed-value.h flags.h hard-reg-set.h insn-config.h real.h
 	statistics.h stmt.h varasm.h.
-	* gimplify.c: Include dojump.h emit-rtl.h explow.h expmed.h fixed-value.h
-	flags.h hashtab.h insn-config.h real.h rtl.h statistics.h.
+	* gimplify.c: Include dojump.h emit-rtl.h explow.h expmed.h
+	fixed-value.h flags.h hashtab.h insn-config.h real.h rtl.h statistics.h.
 	* asan.c: Include dojump.h emit-rtl.h explow.h expmed.h fixed-value.h
 	flags.h hashtab.h insn-config.h real.h rtl.h statistics.h stmt.h.
 	* ipa-devirt.c: Include dojump.h emit-rtl.h explow.h expmed.h
 	fixed-value.h flags.h hashtab.h insn-config.h real.h rtl.h
 	statistics.h stmt.h varasm.h.
 	* ipa-polymorphic-call.c: Likewise.
-	* config/aarch64/aarch64.c: Include dojump.h emit-rtl.h explow.h expmed.h
-	fixed-value.h flags.h hashtab.h insn-config.h real.h statistics.h
-	stmt.h.
-	* config/c6x/c6x.c: Likewise.
-	* config/aarch64/aarch64-builtins.c: Include dojump.h emit-rtl.h explow.h
+	* config/aarch64/aarch64.c: Include dojump.h emit-rtl.h explow.h
 	expmed.h fixed-value.h flags.h hashtab.h insn-config.h real.h
+	statistics.h stmt.h.
+	* config/c6x/c6x.c: Likewise.
+	* config/aarch64/aarch64-builtins.c: Include dojump.h emit-rtl.h
+	explow.h expmed.h fixed-value.h flags.h hashtab.h insn-config.h real.h
 	statistics.h stmt.h varasm.h.
-	* ipa-prop.c: Include dojump.h emit-rtl.h explow.h expmed.h fixed-value.h
-	hashtab.h insn-config.h real.h rtl.h statistics.h stmt.h varasm.h.
+	* ipa-prop.c: Include dojump.h emit-rtl.h explow.h expmed.h
+	fixed-value.h hashtab.h insn-config.h real.h rtl.h statistics.h
+	stmt.h varasm.h.
 	* ipa-split.c: Likewise.
 	* tree-eh.c: Likewise.
 	* tree-ssa-dce.c: Likewise.
@@ -2312,8 +2321,8 @@
 	fixed-value.h insn-config.h real.h statistics.h stmt.h varasm.h.
 	* tree-inline.c: Include dojump.h emit-rtl.h explow.h expmed.h
 	fixed-value.h real.h rtl.h statistics.h stmt.h varasm.h.
-	* builtins.c: Include dojump.h emit-rtl.h explow.h expmed.h fixed-value.h
-	real.h statistics.h stmt.h.
+	* builtins.c: Include dojump.h emit-rtl.h explow.h expmed.h
+	fixed-value.h real.h statistics.h stmt.h.
 	* config/arc/arc.c: Include dojump.h emit-rtl.h explow.h expmed.h
 	fixed-value.h statistics.h stmt.h.
 	* config/visium/visium.c: Include dojump.h emit-rtl.h explow.h expmed.h
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index fecb855322ce7513379b8b31c92f3c8ef85c998e..7f5796ab52e7644651e2c8227c3da232bbba9b90 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -16719,7 +16719,7 @@ ix86_avx_u128_mode_after (int mode, rtx_insn *insn)
 
 /* Return the mode that an insn results in.  */
 
-int
+static int
 ix86_mode_after (int entity, int mode, rtx_insn *insn)
 {
   switch (entity)