From 59a784c5724c2e10a02994fb985540db1b16fd63 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 11 Jan 2017 10:18:32 -0800
Subject: No need to copy header; libc_start_file does it.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
index 947d4af..3daa407 100644
--- a/scripts/build/cc/100-gcc.sh
+++ b/scripts/build/cc/100-gcc.sh
@@ -409,9 +409,6 @@ do_gcc_core_backend() {
             ;;
     esac
 
-    CT_DoLog DEBUG "Copying headers to install area of core C compiler"
-    CT_DoExecLog ALL cp -a "${CT_HEADERS_DIR}" "${prefix}/${CT_TARGET}/include"
-
     for tmp in ARCH ABI CPU TUNE FPU FLOAT; do
         eval tmp="\${CT_ARCH_WITH_${tmp}}"
         if [ -n "${tmp}" ]; then
-- 
cgit v0.10.2-6-g49f6


From ec9ddee933d16b5126dc6ba6c94ed428dd01ab75 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 11 Jan 2017 10:20:02 -0800
Subject: Remove 2nd copy of the option.

Added above, as part of the list.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh
index 0a87581..7a6b194 100644
--- a/scripts/build/libc/newlib.sh
+++ b/scripts/build/libc/newlib.sh
@@ -119,8 +119,6 @@ ENABLE_TARGET_OPTSPACE:target-optspace
     [ "${CT_LIBC_NEWLIB_LTO}" = "y" ] && \
         CT_LIBC_NEWLIB_TARGET_CFLAGS="${CT_LIBC_NEWLIB_TARGET_CFLAGS} -flto"
 
-    [ "${CT_LIBC_NEWLIB_ENABLE_TARGET_OPTSPACE}" = "y" ] && newlib_opts+=("--enable-target-optspace")
-
     cflags_for_target="${CT_TARGET_CFLAGS} ${CT_LIBC_NEWLIB_TARGET_CFLAGS}"
 
     # Note: newlib handles the build/host/target a little bit differently
-- 
cgit v0.10.2-6-g49f6


From 01a4bed794d3474df1e1f7ab03aa925b69668fbf Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 11 Jan 2017 10:24:06 -0800
Subject: install_root has no effect on newlib install.

And never had, at least since newlib 1.17 (first version added to
crosstool-ng). Apparently, copy-pasted from glibc.sh.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh
index 7a6b194..e0e42e2 100644
--- a/scripts/build/libc/newlib.sh
+++ b/scripts/build/libc/newlib.sh
@@ -142,7 +142,7 @@ ENABLE_TARGET_OPTSPACE:target-optspace
     CT_DoExecLog ALL make ${JOBSFLAGS}
 
     CT_DoLog EXTRA "Installing C library"
-    CT_DoExecLog ALL make install install_root="${CT_SYSROOT_DIR}"
+    CT_DoExecLog ALL make install
 
     if [ "${CT_BUILD_MANUALS}" = "y" ]; then
         local -a doc_dir="${CT_BUILD_DIR}/build-libc/${CT_TARGET}"
-- 
cgit v0.10.2-6-g49f6


From fddbf8f99e5e4ca6d38ab89064b7017111031182 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 11 Jan 2017 16:56:12 -0800
Subject: AVR32 support has been retired.

Scripts no longer download avr-headers.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh
index e0e42e2..100dc1a 100644
--- a/scripts/build/libc/newlib.sh
+++ b/scripts/build/libc/newlib.sh
@@ -5,10 +5,6 @@
 # Edited by Martin Lund <mgl@doredevelopment.dk>
 #
 
-LIBC_NEWLIB_AVR_HDRS_URI="http://www.atmel.com/Images"
-LIBC_NEWLIB_AVR_HDRS_BASE="avr-headers-3.2.3.970"
-LIBC_NEWLIB_AVR_HDRS_EXT=".zip"
-
 do_libc_get() {
     local libc_src="{http://mirrors.kernel.org/sourceware/newlib,
                      ftp://sourceware.org/pub/newlib}"
-- 
cgit v0.10.2-6-g49f6


From 01bae4871994429725a34298787a04221fd1368d Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 11 Jan 2017 22:29:34 -0800
Subject: Do not use sysroot in bare metal.

None of the bare metal C library choices (avr-libc, newlib) support
installing into sysroot. Nor does it make any sense, since sysroot
implies a file system, which in turn implies an OS.

diff --git a/config/toolchain.in b/config/toolchain.in
index b8c1b4a..5a5f929 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -4,12 +4,13 @@ comment "General toolchain options"
 
 config FORCE_SYSROOT
     bool
-    default y if !OBSOLETE
+    default y if !OBSOLETE && !BARE_METAL
     select USE_SYSROOT
 
 config USE_SYSROOT
     bool
     prompt "Use sysroot'ed toolchain"
+    depends on !BARE_METAL
     default y
     help
       Use the 'shinny new' sysroot feature of gcc: libraries split between
-- 
cgit v0.10.2-6-g49f6