archive/dragora-installer/parts/MakeFS

@@ -147,6 +147,21 @@ $(fdisk -l "$devname" | head -n 1)" 13 55 1 \
     unset -v helper devname progressfile
 }
 
+_mkreiser4()
+{
+    devname=$1
+    progressfile="${SUBTMPDIR}/MakeFS-mkfs.reiser4.progress.${RANDOM-0}$$"
+
+    slowcmd "mkfs.reiser4 -yf $devname" "$progressfile" | \
+     dialog --colors \
+      --backtitle "\\ZbPartitions: Formatting partitions" \
+      --title "PROGRESS" \
+      --sleep 3 --progressbox \
+"Formatting $devname - No bad blocks support." $(( LINES / 2 )) $COLUMNS
+
+    unset -v devname progressfile
+}
+
 _mkxfs()
 {
     devname=$1
@@ -170,11 +185,12 @@ formatMenu()
      --default-item "ext3" \
      --item-help --cr-wrap --menu \
 "Choose a file system for '${1}':" 13 58 6 \
-"ext2" "Second extended filesystem"       "ext2 remains the preferred file system for flash-based storage media due to its lack of a journal"  \
-"ext3" "Third  extended filesystem"       "ext3 is suitable for both 32-bit and 64-bit systems"                                                \
-"ext4" "Fourth extended filesystem"       "We suggest using it more for a 64-bit system than for a 32-bit system"                              \
-"jfs"  "A Journaled file system"          "Actual usage of jfs in GNU/Linux is uncommon, as ext4 typically offers better performance"          \
-"xfs"  "A 64-bit journaling file system"  "xfs is a high-performance 64-bit journaling file system suitable for real-time applications"        \
+"ext2"     "Second extended filesystem"       "ext2 remains the preferred file system for flash-based storage media due to its lack of a journal" \
+"ext3"     "Third  extended filesystem"       "ext3 is suitable for both 32-bit and 64-bit systems" \
+"ext4"     "Fourth extended filesystem"       "We suggest using it more for a 64-bit system than for a 32-bit system" \
+"reiser4"  "Reiser4 filesystem"               "Reiser4 is a successor of ReiserFS (a general-purpose, journaling file system)" \
+"jfs"      "JFS filesystem"                   "Actual usage of jfs in GNU/Linux is uncommon, as ext4 typically offers better performance" \
+"xfs"      "XFS filesystem"                   "xfs is a high-performance 64-bit journaling file system suitable for real-time applications" \
     2> "${SUBTMPDIR}/return-MakeFS_formatMenu" || _status=$?
 
     if test -n "$_status" && test $_status -ne 0
@@ -188,11 +204,24 @@ formatMenu()
 
     # Check for selected options to give the proper format
     case "$(cat -- "${SUBTMPDIR}"/return-MakeFS_formatMenu)" in
-    ext2)  _mkfs  mkfs.ext2 "$1" ;;
-    ext3)  _mkfs  mkfs.ext3 "$1" ;;
-    ext4)  _mkfs  mkfs.ext4 "$1" ;;
-     jfs)  _mkfs  jfs_mkfs  "$1" ;;
-     xfs)  _mkxfs "$1" ;;
+    ext2)
+        _mkfs mkfs.ext2 "$1"
+        ;;
+    ext3)
+        _mkfs mkfs.ext3 "$1"
+        ;;
+    ext4)
+        _mkfs mkfs.ext4 "$1"
+        ;;
+    reiser4)
+        _mkreiser4 "$1"
+        ;;
+    jfs)
+        _mkfs jfs_mkfs "$1"
+        ;;
+    xfs)
+        _mkxfs "$1"
+        ;;
     esac
 }
 

archive/fuse/rc.fuse

@@ -2,7 +2,7 @@
 #
 # Load the fuse module (if exists) and mount the fuse control file system
 #
-# Copyright (c) 2019 Matias Fonzo, <selk@dragora.org>.
+# Copyright (c) 2019-2020 Matias Fonzo, <selk@dragora.org>.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 PROGRAM="${0##*/}"
 
 # Sanity check
-if ! type fusermount > /dev/null 2>&1
+if ! command -v fusermount > /dev/null
 then
     echo "${0}: Error: fusermount(1) is not available." 1>&2
     exit 127;

archive/kernel/config-amd64_generic

@@ -1,18 +1,17 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.28-gnu Kernel Configuration
+# Linux/x86_64 5.4.61-gnu Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: gcc (GCC) 10.2.1 20200822
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -701,6 +700,7 @@ CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
 CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 
 #
 # Tegra firmware driver
@@ -843,7 +843,10 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -1027,6 +1030,7 @@ CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -2601,7 +2605,6 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -4511,6 +4514,7 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_SLAVE=y
 CONFIG_SPI_SLAVE_TIME=m
 CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_DYNAMIC=y
 # CONFIG_SPMI is not set
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
@@ -7772,15 +7776,15 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 CONFIG_INFINIBAND_USNIC=m
 CONFIG_INFINIBAND_HFI1=m
 # CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
-# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_SDMA_VERBOSITY=y
 CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_RDMAVT=m
 CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_ISER=m
@@ -9416,6 +9420,8 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
+CONFIG_REISER4_FS=y
+# CONFIG_REISER4_DEBUG is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_PROC_INFO is not set
@@ -9815,6 +9821,10 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization

archive/kernel/config-c201-v11

@@ -1,18 +1,17 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.28-gnu Kernel Configuration
+# Linux/arm 5.4.61-gnu Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: gcc (GCC) 10.2.1 20200822
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
@@ -1459,7 +1458,6 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 # CONFIG_CHR_DEV_ST is not set
 CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_SCH=m
 # CONFIG_SCSI_CONSTANTS is not set
@@ -2110,6 +2108,7 @@ CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
 CONFIG_PPS=y
@@ -4608,6 +4607,8 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
+CONFIG_REISER4_FS=y
+# CONFIG_REISER4_DEBUG is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_PROC_INFO is not set

archive/kernel/config-i586_generic

@@ -1,18 +1,17 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.4.28-gnu Kernel Configuration
+# Linux/i386 5.4.61-gnu Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: gcc (GCC) 10.2.1 20200822
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -653,6 +652,7 @@ CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
 CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 
 #
 # Tegra firmware driver
@@ -935,6 +935,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -2508,7 +2509,6 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -4452,6 +4452,7 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_SLAVE=y
 CONFIG_SPI_SLAVE_TIME=m
 CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_DYNAMIC=y
 # CONFIG_SPMI is not set
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
@@ -7801,9 +7802,9 @@ CONFIG_INFINIBAND_USNIC=m
 CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_ISER=m
@@ -8588,7 +8589,6 @@ CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_HYPERV_IOMMU=y
@@ -9366,6 +9366,8 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
+CONFIG_REISER4_FS=y
+# CONFIG_REISER4_DEBUG is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_PROC_INFO is not set

patches/gcc/0003-libatomic-test-fix.patch

@@ -1,72 +0,0 @@
-From 661a844afb178f30b2bea01700a92bb80b4c5173 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 7 May 2016 22:39:20 +0000
-Subject: [PATCH 03/13] libatomic test fix
-
----
- libatomic/testsuite/Makefile.am       | 6 ++++++
- libatomic/testsuite/Makefile.in       | 5 +++++
- libatomic/testsuite/lib/libatomic.exp | 3 +++
- 3 files changed, 14 insertions(+)
-
-diff --git a/libatomic/testsuite/Makefile.am b/libatomic/testsuite/Makefile.am
-index 41cfbc46e4b..16f82bdf691 100644
---- a/libatomic/testsuite/Makefile.am
-+++ b/libatomic/testsuite/Makefile.am
-@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
- _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
- 	     echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
- RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
-+
-+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
-+
-+extra.exp:
-+	echo 'set BUILD_CC "$(CC)"' > $@.tmp
-+	mv $@.tmp $@
-diff --git a/libatomic/testsuite/Makefile.in b/libatomic/testsuite/Makefile.in
-index 73b9d521225..2dccc4c5d21 100644
---- a/libatomic/testsuite/Makefile.in
-+++ b/libatomic/testsuite/Makefile.in
-@@ -277,6 +277,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
- 	     echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
- 
- RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
-+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
- all: all-am
- 
- .SUFFIXES:
-@@ -484,6 +485,10 @@ uninstall-am:
- .PRECIOUS: Makefile
- 
- 
-+extra.exp:
-+	echo 'set BUILD_CC "$(CC)"' > $@.tmp
-+	mv $@.tmp $@
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp
-index 38f3e5673e2..02ec2e8b48a 100644
---- a/libatomic/testsuite/lib/libatomic.exp
-+++ b/libatomic/testsuite/lib/libatomic.exp
-@@ -77,6 +77,7 @@ proc libatomic_init { args } {
-     global ALWAYS_CFLAGS
-     global CFLAGS
-     global TOOL_EXECUTABLE TOOL_OPTIONS
-+    global BUILD_CC
-     global GCC_UNDER_TEST
-     global TESTING_IN_BUILD_TREE
-     global target_triplet
-@@ -92,6 +93,8 @@ proc libatomic_init { args } {
-     if ![info exists GCC_UNDER_TEST] then {
- 	if [info exists TOOL_EXECUTABLE] {
- 	    set GCC_UNDER_TEST $TOOL_EXECUTABLE
-+	} elseif [info exists BUILD_CC] {
-+	    set GCC_UNDER_TEST $BUILD_CC
- 	} else {
- 	    set GCC_UNDER_TEST "[find_gcc]"
- 	}
-2.21.0
-

patches/gcc/0004-libgomp-test-fix.patch

@@ -1,75 +0,0 @@
-From 61c15ebc2895bdee5f4460a17b015bb47177fa90 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sun, 6 Nov 2016 03:11:18 +0000
-Subject: [PATCH 04/13] libgomp test fix
-
----
- libgomp/testsuite/Makefile.am     | 6 ++++++
- libgomp/testsuite/Makefile.in     | 5 +++++
- libgomp/testsuite/lib/libgomp.exp | 3 +++
- 3 files changed, 14 insertions(+)
-
-diff --git a/libgomp/testsuite/Makefile.am b/libgomp/testsuite/Makefile.am
-index 2100f49e53b..fa25b3a0604 100644
---- a/libgomp/testsuite/Makefile.am
-+++ b/libgomp/testsuite/Makefile.am
-@@ -12,6 +12,12 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
- 	     echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
- RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
- 
-+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
-+
-+extra.exp:
-+	echo 'set BUILD_CC "$(CC)"' > $@.tmp
-+	mv $@.tmp $@
-+
- # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the
- # following variables have to be "routed through" this Makefile, for expansion
- # of the several (Makefile) variables used therein.
-diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in
-index 80315b15a7d..cdbf35695f7 100644
---- a/libgomp/testsuite/Makefile.in
-+++ b/libgomp/testsuite/Makefile.in
-@@ -303,6 +303,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
- 	     echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
- 
- RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
-+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
- all: all-am
- 
- .SUFFIXES:
-@@ -464,6 +465,10 @@ uninstall-am:
- .PRECIOUS: Makefile
- 
- 
-+extra.exp:
-+	echo 'set BUILD_CC "$(CC)"' > $@.tmp
-+	mv $@.tmp $@
-+
- # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the
- # following variables have to be "routed through" this Makefile, for expansion
- # of the several (Makefile) variables used therein.
-diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
-index 14d9b5f1305..186b0ba0b57 100644
---- a/libgomp/testsuite/lib/libgomp.exp
-+++ b/libgomp/testsuite/lib/libgomp.exp
-@@ -68,6 +68,7 @@ proc libgomp_init { args } {
-     global ALWAYS_CFLAGS
-     global CFLAGS
-     global TOOL_EXECUTABLE TOOL_OPTIONS
-+    global BUILD_CC
-     global GCC_UNDER_TEST
-     global TESTING_IN_BUILD_TREE
-     global target_triplet
-@@ -90,6 +91,8 @@ proc libgomp_init { args } {
-     if ![info exists GCC_UNDER_TEST] then {
- 	if [info exists TOOL_EXECUTABLE] {
- 	    set GCC_UNDER_TEST $TOOL_EXECUTABLE
-+	} elseif [info exists BUILD_CC] {
-+	    set GCC_UNDER_TEST $BUILD_CC
- 	} else {
- 	    set GCC_UNDER_TEST "[find_gcc]"
- 	}
-2.21.0
-

patches/gcc/0005-libitm-test-fix.patch

@@ -1,72 +0,0 @@
-From 300560c8d4a63c9bb43a01289269cec707e5ea6d Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sun, 6 Nov 2016 03:13:26 +0000
-Subject: [PATCH 05/13] libitm test fix
-
----
- libitm/testsuite/Makefile.am    | 6 ++++++
- libitm/testsuite/Makefile.in    | 5 +++++
- libitm/testsuite/lib/libitm.exp | 3 +++
- 3 files changed, 14 insertions(+)
-
-diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am
-index 41cfbc46e4b..16f82bdf691 100644
---- a/libitm/testsuite/Makefile.am
-+++ b/libitm/testsuite/Makefile.am
-@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
- _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
- 	     echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
- RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
-+
-+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
-+
-+extra.exp:
-+	echo 'set BUILD_CC "$(CC)"' > $@.tmp
-+	mv $@.tmp $@
-diff --git a/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in
-index 991f02c0b3b..fa331cabfc4 100644
---- a/libitm/testsuite/Makefile.in
-+++ b/libitm/testsuite/Makefile.in
-@@ -285,6 +285,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
- 	     echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
- 
- RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
-+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
- all: all-am
- 
- .SUFFIXES:
-@@ -492,6 +493,10 @@ uninstall-am:
- .PRECIOUS: Makefile
- 
- 
-+extra.exp:
-+	echo 'set BUILD_CC "$(CC)"' > $@.tmp
-+	mv $@.tmp $@
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp
-index b3d247b9f98..47c2cd55dac 100644
---- a/libitm/testsuite/lib/libitm.exp
-+++ b/libitm/testsuite/lib/libitm.exp
-@@ -77,6 +77,7 @@ proc libitm_init { args } {
-     global ALWAYS_CFLAGS
-     global CFLAGS
-     global TOOL_EXECUTABLE TOOL_OPTIONS
-+    global BUILD_CC
-     global GCC_UNDER_TEST
-     global TESTING_IN_BUILD_TREE
-     global target_triplet
-@@ -92,6 +93,8 @@ proc libitm_init { args } {
-     if ![info exists GCC_UNDER_TEST] then {
- 	if [info exists TOOL_EXECUTABLE] {
- 	    set GCC_UNDER_TEST $TOOL_EXECUTABLE
-+	} elseif [info exists BUILD_CC] {
-+	    set GCC_UNDER_TEST $BUILD_CC
- 	} else {
- 	    set GCC_UNDER_TEST "[find_gcc]"
- 	}
-2.21.0
-