diff --git a/ChangeLog b/ChangeLog
index d7680d491c5..9e4c916db46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,13 @@
+2014-06-23  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	Fix include path for in-tree cloog.
+	* config/cloog.m4 (CLOOG_INIT_FLAGS): Remove bogus include path.
+	* configure: Regenerate.
+
 2014-06-18  Richard Henderson  <rth@redhat.com>
 
 	* .gitignore: Import gcc_update output.
 
-2014-06-18  Olivier Hainque  <hainque@adacore.com>
-
-	* tree-core.h (tree_block): Add an "end_locus" field, allowing
-	memorization of the end of block source location.
-	* tree.h (BLOCK_SOURCE_END_LOCATION): New accessor.
-	* gimplify.c (gimplify_bind_expr): Propagate the block start and
-	end source location info we have on the block entry/exit code we
-	generate.
-
 2014-06-13  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* config-ml.in: Robustify ac_configure_args parsing.
@@ -58,21 +55,6 @@
 
 	* MAINTAINERS (Write After Approval): Add myself.
 
-2014-05-28  Olivier Hainque  <hainque@adacore.com>
-
-	* config/rs6000/vxworks.h (VXCPU_FOR_8548): New. Default to PPC85XX.
-	(CPP_SPEC): Add entry for -mcpu=8548.
-	* config/rs6000/vxworksae.h: Reinstate. Override	VXCPU_FOR_8548.
-	* config.gcc (powerpc-wrs-vxworksae, tm_file): Add back vxworksae.h.
-
-2014-05-26  Richard Sandiford  <rdsandiford@googlemail.com>
-	    Olivier Hainque  <hainque@adacore.com>
-
-	* rtl.h (set_for_reg_notes): Declare.
-	* emit-rtl.c (set_for_reg_notes): New function.
-	(set_unique_reg_note): Use it.
-	* optabs.c (add_equal_note): Likewise
-
 2014-05-22  Maxim Kuvyrkov  <maxim.kuvyrkov@linaro.org>
 
 	* MAINTAINERS: Update my affiliation/email.
@@ -316,7 +298,7 @@
 2013-09-12  DJ Delorie  <dj@redhat.com>
 
 	* MAINTAINERS: Add Nick Clifton and DJ Delorie as msp430
-        maintainers.
+	maintainers.
 
 2013-09-03  Richard Biener  <rguenther@suse.de>
 
diff --git a/config/cloog.m4 b/config/cloog.m4
index 670cd652fcb..d67465c3f22 100644
--- a/config/cloog.m4
+++ b/config/cloog.m4
@@ -63,7 +63,7 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
   if test "x${clooginc}" = x && test "x${clooglibs}" = x \
      && test -d ${srcdir}/cloog; then
      clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
-     clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
+     clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include'
     ENABLE_CLOOG_CHECK=no
     AC_MSG_WARN([using in-tree CLooG, disabling version check])
   fi
diff --git a/configure b/configure
index cf6457ad4a8..fd7c866991f 100755
--- a/configure
+++ b/configure
@@ -6109,7 +6109,7 @@ fi
         if test "x${clooginc}" = x && test "x${clooglibs}" = x \
      && test -d ${srcdir}/cloog; then
      clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
-     clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
+     clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include'
     ENABLE_CLOOG_CHECK=no
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree CLooG, disabling version check" >&5
 $as_echo "$as_me: WARNING: using in-tree CLooG, disabling version check" >&2;}
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 24a7f6b6387..8995702c487 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -676,6 +676,15 @@
 	* config/arm/arm.c (thumb1_reorg): Move to next basic block if we
 	reach the head.
 
+2014-06-18  Olivier Hainque  <hainque@adacore.com>
+
+	* tree-core.h (tree_block): Add an "end_locus" field, allowing
+	memorization of the end of block source location.
+	* tree.h (BLOCK_SOURCE_END_LOCATION): New accessor.
+	* gimplify.c (gimplify_bind_expr): Propagate the block start and
+	end source location info we have on the block entry/exit code we
+	generate.
+
 2014-06-18  Richard Biener  <rguenther@suse.de>
 
 	* common.opt (fssa-phiopt): New option.
@@ -3067,6 +3076,13 @@
 	* tree-vrp.c (vrp_visit_phi_node): If the compare of old and
 	new range fails, drop to varying.
 
+2014-05-28  Olivier Hainque  <hainque@adacore.com>
+
+	* config/rs6000/vxworks.h (VXCPU_FOR_8548): New. Default to PPC85XX.
+	(CPP_SPEC): Add entry for -mcpu=8548.
+	* config/rs6000/vxworksae.h: Reinstate. Override VXCPU_FOR_8548.
+	* config.gcc (powerpc-wrs-vxworksae, tm_file): Add back vxworksae.h.
+
 2014-05-28  Tom de Vries  <tom@codesourcery.com>
 
 	* lra-int.h (struct lra_reg): Add field actual_call_used_reg_set.
@@ -3145,6 +3161,14 @@
 	* doc/extend.texi (Local Labels): Note that label differences are
 	not supported for AVR.
 
+2014-05-28  Richard Sandiford  <rdsandiford@googlemail.com>
+	    Olivier Hainque  <hainque@adacore.com>
+
+	* rtl.h (set_for_reg_notes): Declare.
+	* emit-rtl.c (set_for_reg_notes): New function.
+	(set_unique_reg_note): Use it.
+	* optabs.c (add_equal_note): Likewise
+
 2014-05-27  Andrew Pinski  <apinski@cavium.com>
 
 	* config/aarch64/aarch64.md (stack_protect_set_<mode>):