From 875e9d648374c6047bd57356402b8af55abaa17a Mon Sep 17 00:00:00 2001
From: sermus <andrey.v.filimonov@gmail.com>
Date: Thu, 31 Mar 2016 10:50:22 +0300
Subject: [PATCH] crosstool-NG: Switched to xtensa-1.22.x upstream branch (gcc
 4.8.5).

1000-mforce-l32.patch retargetted to GCC 4.8.5.
---
 .gitmodules  | 2 +-
 Makefile     | 4 ++--
 crosstool-NG | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c6df93e..1432e25 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "crosstool-NG"]
 	path = crosstool-NG
 	url = https://github.com/jcmvbkbc/crosstool-NG
-	branch = lx106-g++
+	branch = xtensa-1.22.x
 [submodule "lx106-hal"]
 	path = lx106-hal
 	url = https://github.com/tommie/lx106-hal
diff --git a/Makefile b/Makefile
index 5445599..c5fa941 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ endif
 clean: clean-sdk
 	make -C crosstool-NG clean MAKELEVEL=0
 	-rm -rf crosstool-NG/.build/src
-	-rm -f crosstool-NG/local-patches/gcc/4.8.2/1000-*
+	-rm -f crosstool-NG/local-patches/gcc/4.8.5/1000-*
 	-rm -rf $(TOOLCHAIN)
 
 
@@ -109,7 +109,7 @@ esptool: toolchain
 toolchain: $(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc
 
 $(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc: crosstool-NG/ct-ng
-	cp -f 1000-mforce-l32.patch crosstool-NG/local-patches/gcc/4.8.2/
+	cp -f 1000-mforce-l32.patch crosstool-NG/local-patches/gcc/4.8.5/
 	make -C crosstool-NG -f ../Makefile _toolchain
 
 _toolchain:
diff --git a/crosstool-NG b/crosstool-NG
index feb1fb8..46f160f 160000
--- a/crosstool-NG
+++ b/crosstool-NG
@@ -1 +1 @@
-Subproject commit feb1fb829d5cb4f8739e488cbd2f0b72304705bb
+Subproject commit 46f160f7cdb6b993afca1a685ddff5b3aec656b6