nerves-project · fhunleth · Dec 15, 2022 · Oct 12, 2022 · Oct 12, 2022 · Apr 4, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Toolchain Releases
 
+## v1.7.0
+
+This release bumps GCC from 11.3 to 12.2.
+
+* Tool versions
+ * GCC 12.2 (https://gcc.gnu.org/gcc-12/changes.html#12.2)
+
+## v1.6.2
+
+This release adds a riscv64 glibc toolchain since that has more support than
+muslc in the RISC-V community at the moment.
+
+* Changes
+ * Removes Python scripting support in gdb (fixes toolchain compilation and
+ probably not used)
+ * Remove the static toolchain option since it was being ignored on MacOS. On
+ Linux, it disabled LTO. LTO is included on all platforms now (the default).
+ * Fixes runtime dependency on libzstd another way by forcibly turning it off
+ with a Crosstool-NG option rather than adding a configure flag. This is
+ possible now. Previously the option was hidden due to the static toolchain
+ option.
+ * Let gcc determine the correct option for SJLJ (setjmp/longjmp). The note
+ where it doesn't work doesn't apply to Nerves platforms.
+
 ## v1.6.1
 
 This release adds musl libc toolchains for aarch64 and armv7.

diff --git a/build_release.sh b/build_release.sh
@@ -30,6 +30,12 @@ for CONFIG in $CONFIGS; do
  cd $CONFIG
  mix deps.get
  mix nerves.artifact --path ../
+ echo "Done building $CONFIG"
+ # TMP
+ echo "df -h:"
+ df -h
+ echo "ls -lh *"
+ ls -lh *
  cd ../
 done
 

diff --git a/nerves_toolchain_aarch64_nerves_linux_gnu/VERSION b/nerves_toolchain_aarch64_nerves_linux_gnu/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_aarch64_nerves_linux_gnu/defconfig b/nerves_toolchain_aarch64_nerves_linux_gnu/defconfig
@@ -4,6 +4,5 @@ CT_ARCH_64=y
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
 CT_LIBC_GLIBC=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/nerves_toolchain_aarch64_nerves_linux_musl/VERSION b/nerves_toolchain_aarch64_nerves_linux_musl/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_aarch64_nerves_linux_musl/defconfig b/nerves_toolchain_aarch64_nerves_linux_musl/defconfig
@@ -5,4 +5,3 @@ CT_ARCH_64=y
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
 CT_LIBC_MUSL=y
-CT_GCC_V_11=y
diff --git a/nerves_toolchain_armv5_nerves_linux_musleabi/VERSION b/nerves_toolchain_armv5_nerves_linux_musleabi/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_armv5_nerves_linux_musleabi/defconfig b/nerves_toolchain_armv5_nerves_linux_musleabi/defconfig
@@ -7,6 +7,5 @@ CT_ARCH_ARCH="armv5te"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
 CT_LIBC_MUSL=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/nerves_toolchain_armv6_nerves_linux_gnueabihf/VERSION b/nerves_toolchain_armv6_nerves_linux_gnueabihf/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_armv6_nerves_linux_gnueabihf/defconfig b/nerves_toolchain_armv6_nerves_linux_gnueabihf/defconfig
@@ -8,6 +8,5 @@ CT_ARCH_FLOAT_HW=y
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
 CT_LIBC_GLIBC=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/nerves_toolchain_armv7_nerves_linux_gnueabihf/VERSION b/nerves_toolchain_armv7_nerves_linux_gnueabihf/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_armv7_nerves_linux_gnueabihf/defconfig b/nerves_toolchain_armv7_nerves_linux_gnueabihf/defconfig
@@ -6,6 +6,5 @@ CT_ARCH_FPU="vfpv3-d16"
 CT_ARCH_FLOAT_HW=y
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/nerves_toolchain_armv7_nerves_linux_musleabihf/VERSION b/nerves_toolchain_armv7_nerves_linux_musleabihf/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_armv7_nerves_linux_musleabihf/defconfig b/nerves_toolchain_armv7_nerves_linux_musleabihf/defconfig
@@ -8,6 +8,5 @@ CT_ARCH_FLOAT_HW=y
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
 CT_LIBC_MUSL=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/nerves_toolchain_ctng/build.sh b/nerves_toolchain_ctng/build.sh
@@ -208,6 +208,14 @@ gcc_tuple_underscores()
 
 build_gcc()
 {
+ if [[ $BUILD_OS = "freebsd" ]]; then
+ SED=/usr/local/bin/gsed
+ elif [[ $BUILD_OS = "darwin" ]]; then
+ SED=$HOMEBREW_PREFIX/bin/gsed
+ else
+ SED="sed"
+ fi
+
  # Build and install ct-ng to the work directory
  cd "$WORK_DIR"
  ln -sf "$DL_DIR" dl
@@ -237,10 +245,9 @@ build_gcc()
  ./bootstrap
  fi
  if [[ $BUILD_OS = "freebsd" ]]; then
- SED=/usr/local/bin/gsed
- SED=/usr/local/bin/gsed MAKE=/usr/local/bin/gmake PATCH=/usr/local/bin/gpatch ./configure --prefix="$LOCAL_INSTALL_DIR"
- gmake
- gmake install
+ SED=/usr/local/bin/gsed MAKE=/usr/local/bin/gmake PATCH=/usr/local/bin/gpatch ./configure --prefix="$LOCAL_INSTALL_DIR"
+ gmake
+ gmake install
  elif [[ $BUILD_OS = "darwin" ]]; then
  # Homebrew's gcc is gcc-12
  BINUTILS=$(brew --prefix binutils)
@@ -250,7 +257,6 @@ build_gcc()
  gmake
  gmake install
  else
- SED=sed
  ./configure --prefix="$LOCAL_INSTALL_DIR"
  make
  make install
@@ -295,6 +301,8 @@ build_gcc()
  # Configure logging when on CI (see crosstool-ng's build script)
  if [[ "$CI" = "true" ]]; then
  echo "Modifying logging for CI"
+ echo "In work dir: $WORK_DIR"
+
  $SED -i -e 's/^.*\(CT_LOG_ERROR\).*$/# \1 is not set/' \
  -e 's/^.*\(CT_LOG_WARN\).*$/# \1 is not set/' \
  -e 's/^.*\(CT_LOG_INFO\).*$/# \1 is not set/' \
@@ -308,6 +316,8 @@ build_gcc()
  "$WORK_DIR/build/.config"
  fi
 
+ echo "BEFORE DOTS"
+
  # Start building and print dots to keep CI from killing the build due
  # to console inactivity.
  $PREFIX "$CTNG" $CTNG_BUILD &
@@ -316,10 +326,13 @@ build_gcc()
  while ps -p $build_pid >/dev/null; do
  sleep 12
  printf "."
+ echo "DOT $(date)"
  done
  } &
  local keepalive_pid=$!
 
+ echo "Waiting for $build_pid build to finish"
+
  # Wait for the build to finish
  wait $build_pid 2>/dev/null
 
@@ -338,14 +351,17 @@ build_gcc()
  rm -f "$GCC_INSTALL_DIR/$TARGET_TUPLE/build.log.bz2"
 
  # Clean up crosstool-ng's work directory if we put it in a global location
- if [[ "$CI" = "true" ]]; then
- echo "Not cleaning up work directory since CI build"
- else
+ echo "Cleaning up work directory since CI build"
+ # if [[ "$CI" = "true" ]]; then
+ # echo "Not cleaning up work directory since CI build"
+ # else
  if [[ -e "$CT_WORK_DIR" ]]; then
  chmod -R u+w "$CT_WORK_DIR"
  rm -fr "$CT_WORK_DIR"
  fi
- fi
+ # fi
+ df -h
+ du -hs *
 }
 
 toolchain_base_name()
@@ -359,7 +375,9 @@ save_build_info()
  # Save useful information if we ever need to reproduce the toolchain
  TARGET_TUPLE=$(gcc_tuple)
  echo "$NERVES_TOOLCHAIN_VERSION" > "$GCC_INSTALL_DIR/$TARGET_TUPLE/nerves-toolchain.tag"
+ echo "running: cp $CTNG_CONFIG $GCC_INSTALL_DIR/$TARGET_TUPLE/ct-ng.defconfig"
  cp "$CTNG_CONFIG" "$GCC_INSTALL_DIR/$TARGET_TUPLE/ct-ng.defconfig"
+ echo "running: cp $WORK_DIR/build/.config $GCC_INSTALL_DIR/$TARGET_TUPLE/ct-ng.config"
  cp "$WORK_DIR/build/.config" "$GCC_INSTALL_DIR/$TARGET_TUPLE/ct-ng.config"
 }
 

diff --git a/nerves_toolchain_ctng/scripts/unmerge_defconfig.exs b/nerves_toolchain_ctng/scripts/unmerge_defconfig.exs
@@ -43,10 +43,14 @@ defmodule Unmerger do
  def main([original_defconfig, fragment_defconfig, resulting_defconfig]) do
  IO.puts("Unmerging #{resulting_defconfig} into #{original_defconfig} using #{fragment_defconfig}\n")
  orig = load(original_defconfig)
+ IO.inspect(orig, label: "orig")
  frag = load(fragment_defconfig)
+ IO.inspect(frag, label: "frag")
  result = load(resulting_defconfig)
+ IO.inspect(result, label: "result")
 
  desired = remove_fragments(result, frag)
+ IO.inspect(desired, label: "desired")
 
  if !is_similar_enough(orig, desired) do
  IO.puts("\n\nDifferences detected between the original defconfig and the resulting one!!!")

diff --git a/nerves_toolchain_i586_nerves_linux_gnu/VERSION b/nerves_toolchain_i586_nerves_linux_gnu/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_i586_nerves_linux_gnu/defconfig b/nerves_toolchain_i586_nerves_linux_gnu/defconfig
@@ -4,6 +4,5 @@ CT_ARCH_ARCH="i586"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
 CT_LIBC_GLIBC=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/nerves_toolchain_mipsel_nerves_linux_musl/VERSION b/nerves_toolchain_mipsel_nerves_linux_musl/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_mipsel_nerves_linux_musl/defconfig b/nerves_toolchain_mipsel_nerves_linux_musl/defconfig
@@ -7,6 +7,5 @@ CT_ARCH_FLOAT_SW=y
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
 CT_LIBC_MUSL=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/nerves_toolchain_riscv64_nerves_linux_gnu/VERSION b/nerves_toolchain_riscv64_nerves_linux_gnu/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_riscv64_nerves_linux_musl/VERSION b/nerves_toolchain_riscv64_nerves_linux_musl/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_riscv64_nerves_linux_musl/defconfig b/nerves_toolchain_riscv64_nerves_linux_musl/defconfig
@@ -7,6 +7,5 @@ CT_ARCH_ARCH="rv64gc"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_5_10=y
 CT_LIBC_MUSL=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/nerves_toolchain_x86_64_nerves_linux_gnu/VERSION b/nerves_toolchain_x86_64_nerves_linux_gnu/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_x86_64_nerves_linux_gnu/defconfig b/nerves_toolchain_x86_64_nerves_linux_gnu/defconfig
@@ -3,6 +3,5 @@ CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/nerves_toolchain_x86_64_nerves_linux_musl/VERSION b/nerves_toolchain_x86_64_nerves_linux_musl/VERSION
@@ -1 +1 @@
-1.6.2-dev
+1.7.0
diff --git a/nerves_toolchain_x86_64_nerves_linux_musl/defconfig b/nerves_toolchain_x86_64_nerves_linux_musl/defconfig
@@ -5,6 +5,5 @@ CT_ARCH_64=y
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_19=y
 CT_LIBC_MUSL=y
-CT_GCC_V_11=y
 CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set