Skip to content

Commit 5969043

Browse files
author
ARC GNU Verification
committed
Merge branch 'arc-dev' into arc-staging
2 parents 3dfb435 + 15f2093 commit 5969043

File tree

6 files changed

+40
-2
lines changed

6 files changed

+40
-2
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ New Features and Enhancements
2626
* Removed obsolete unsupported scripts.
2727
* macOS support.
2828
* Import documentation from wiki. Build it with Sphinx.
29+
* Added tcftool binary to toolchain for Windows and x86 Linux hosts.
2930

3031
* GCC
3132
* Update to version 6.3.0.

build-all.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,4 +1124,33 @@ if [ -d "${INSTALLDIR}/" ]; then
11241124
cp "${ARC_GNU}/toolchain/Synopsys_FOSS_Notices.pdf" "${INSTALLDIR}/"
11251125
fi
11261126

1127+
# Copy TCFtool.
1128+
if [ -d "$INSTALLDIR/bin" ]; then
1129+
# Use config.{guess,sub} from GCC sources.
1130+
if [ "$TOOLCHAIN_HOST" ]; then
1131+
triplet=$($ARC_GNU/gcc/config.sub $TOOLCHAIN_HOST)
1132+
else
1133+
triplet=$($ARC_GNU/gcc/config.guess)
1134+
fi
1135+
1136+
# Convert triplet to tcftool filename components.
1137+
case $triplet in
1138+
i?86-*|x86_64-*)
1139+
fname_arch=x86 ;;
1140+
esac
1141+
1142+
case $triplet in
1143+
*-linux-gnu)
1144+
fname_os=linux ;;
1145+
*-mingw32)
1146+
fname_os=windows
1147+
fname_ext=.exe ;;
1148+
esac
1149+
1150+
if [ -n "$fname_arch" -a -n "$fname_os" ]; then
1151+
cp -a "$ARC_GNU/toolchain/extras/tcftool/tcftool_${fname_arch}_${fname_os}${fname_ext}" \
1152+
$INSTALLDIR/bin/tcftool${fname_ext}
1153+
fi
1154+
fi
1155+
11271156
# vim: noexpandtab sts=4 ts=8:

build-elf32.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,12 @@ then
243243
# "/usr/bin/texi2dvi: pdfetex exited with bad status, quitting."
244244
# Hence we have to invoke make trice - once for each PDF to be built, and then to install
245245
# them. Detection is based on texinfo version instead of the OS.
246-
make_target_ordered "generating PDF documentation" install-pdf-target-newlib || true
247-
make_target_ordered "generating PDF documentation" install-pdf-target-newlib || true
246+
# `make_target_ordered` will emit it's own error messages on make failures, so they should
247+
# be suppressed, so that users will not be confused.
248+
make_target_ordered "generating PDF documentation" \
249+
install-pdf-target-newlib &>/dev/null || true
250+
make_target_ordered "generating PDF documentation" \
251+
install-pdf-target-newlib &>/dev/null || true
248252
make_target_ordered "generating PDF documentation" install-pdf-target-newlib
249253
else
250254
make_target "generating PDF documentation" install-pdf-target-newlib

extras/tcftool/README.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
This is a MetaWare TCFtool which can be used to extract information from TCFs.
2+
Only binaries are provided, and they are copied into toolchain bin/ folder. As
3+
a result this tool is available only for Windows and macOS - no macOS and no
4+
non-x86 hosts.

extras/tcftool/tcftool_x86_linux

116 KB
Binary file not shown.
109 KB
Binary file not shown.

0 commit comments

Comments
 (0)