diff -cNr gcc-5.2.0/libcilkrts/configure gcc-5.2.0-ejo/libcilkrts/configure
*** gcc-5.2.0/libcilkrts/configure	Mon Jan 26 14:54:31 2015
--- gcc-5.2.0-ejo/libcilkrts/configure	Wed Aug 12 14:34:23 2015
***************
*** 4945,4950 ****
--- 4945,4954 ----
      config_dir="x86"
      ;;
  
+   arm-*-*)
+     config_dir="arm"
+     ;;
+ 
    *)
      config_dir="generic"
      ;;
diff -cNr gcc-5.2.0/libcilkrts/configure.tgt gcc-5.2.0-ejo/libcilkrts/configure.tgt
*** gcc-5.2.0/libcilkrts/configure.tgt	Thu Nov 13 06:03:17 2014
--- gcc-5.2.0-ejo/libcilkrts/configure.tgt	Wed Aug 12 14:34:23 2015
***************
*** 37,42 ****
--- 37,44 ----
      ;;
    i?86-*-*)
      ;;
+   arm-*-*)
+     ;;
    *-*-*)
      UNSUPPORTED=1
      ;;
diff -cNr gcc-5.2.0/libcilkrts/runtime/config/arm/cilk-abi-vla.c gcc-5.2.0-ejo/libcilkrts/runtime/config/arm/cilk-abi-vla.c
*** gcc-5.2.0/libcilkrts/runtime/config/arm/cilk-abi-vla.c	Tue Oct 29 11:37:47 2013
--- gcc-5.2.0-ejo/libcilkrts/runtime/config/arm/cilk-abi-vla.c	Fri Aug 14 08:40:15 2015
***************
*** 103,107 ****
  
      // Just free the allocated memory to the heap since we don't know
      // how to expand/contract the calling frame
!     vla_internal_heap_free(t, full_size);
  }
--- 103,107 ----
  
      // Just free the allocated memory to the heap since we don't know
      // how to expand/contract the calling frame
!     vla_internal_heap_free(p, full_size);
  }
diff -cNr gcc-5.2.0/libcilkrts/runtime/config/arm/os-fence.h gcc-5.2.0-ejo/libcilkrts/runtime/config/arm/os-fence.h
*** gcc-5.2.0/libcilkrts/runtime/config/arm/os-fence.h	Tue Oct 29 11:37:47 2013
--- gcc-5.2.0-ejo/libcilkrts/runtime/config/arm/os-fence.h	Wed Aug 12 14:34:23 2015
***************
*** 49,53 ****
   * the CPUID instruction).
   */
  
! COMMON_SYSDEP void __cilkrts_fence(void); ///< MFENCE instruction
  
--- 49,54 ----
   * the CPUID instruction).
   */
  
! // COMMON_SYSDEP void __cilkrts_fence(void); ///< MFENCE instruction
! # define __cilkrts_fence() __asm__ __volatile__ ("mcr   p15,0,%[t],c7,c10,4\n" :: [t] "r" (0) : "memory");
  
diff -cNr gcc-5.2.0/libcilkrts/runtime/config/generic/cilk-abi-vla.c gcc-5.2.0-ejo/libcilkrts/runtime/config/generic/cilk-abi-vla.c
*** gcc-5.2.0/libcilkrts/runtime/config/generic/cilk-abi-vla.c	Tue Oct 29 11:37:47 2013
--- gcc-5.2.0-ejo/libcilkrts/runtime/config/generic/cilk-abi-vla.c	Fri Aug 14 08:40:00 2015
***************
*** 103,107 ****
  
      // Just free the allocated memory to the heap since we don't know
      // how to expand/contract the calling frame
!     vla_internal_heap_free(t, full_size);
  }
--- 103,107 ----
  
      // Just free the allocated memory to the heap since we don't know
      // how to expand/contract the calling frame
!     vla_internal_heap_free(p, full_size);
  }
diff -cNr gcc-5.2.0/libcilkrts/runtime/config/x86/os-unix-sysdep.c gcc-5.2.0-ejo/libcilkrts/runtime/config/x86/os-unix-sysdep.c
*** gcc-5.2.0/libcilkrts/runtime/config/x86/os-unix-sysdep.c	Mon Feb 10 08:56:54 2014
--- gcc-5.2.0-ejo/libcilkrts/runtime/config/x86/os-unix-sysdep.c	Wed Aug 12 14:34:23 2015
***************
*** 45,51 ****
  // will need to restore that state when we resume.
  #ifndef __MIC__
  # if defined(__i386__) || defined(__x86_64)
! #   define RESTORE_X86_FP_STATE
  # endif // defined(__i386__) || defined(__x86_64)
  #endif  // __MIC__
  
--- 45,51 ----
  // will need to restore that state when we resume.
  #ifndef __MIC__
  # if defined(__i386__) || defined(__x86_64)
! //#   define RESTORE_X86_FP_STATE
  # endif // defined(__i386__) || defined(__x86_64)
  #endif  // __MIC__
  
diff -cNr gcc-5.2.0/libcpp/charset.c gcc-5.2.0-ejo/libcpp/charset.c
*** gcc-5.2.0/libcpp/charset.c	Mon Jan  5 04:33:28 2015
--- gcc-5.2.0-ejo/libcpp/charset.c	Wed Aug 12 14:34:23 2015
***************
*** 1711,1717 ****
    struct _cpp_strbuf to;
    unsigned char *buffer;
  
!   input_cset = init_iconv_desc (pfile, SOURCE_CHARSET, input_charset);
    if (input_cset.func == convert_no_conversion)
      {
        to.text = input;
--- 1711,1717 ----
    struct _cpp_strbuf to;
    unsigned char *buffer;
  
!   input_cset = init_iconv_desc (pfile, "C99", input_charset);
    if (input_cset.func == convert_no_conversion)
      {
        to.text = input;