Merge branch 'arc-dev' into arc-staging

Author: ARC GNU Verification

NEWS

@@ -20,6 +20,7 @@ New Features and Enhancements
 
 * Toolchain Build  Scripts
 	* Removed obsolete unsupported scripts.
+	* macOS support.
 
 [[TBD]]
 

README.md

@@ -74,6 +74,37 @@ instead versions of those libraries installed on the build host will be used.
 In most cases this is not required.
 
 
+### macOS Prerequisites
+
+By default HFS on macOS is configured to be case-insensitive, which is known to
+cause issues with Linux sources (there are files which differ only in character
+case). As a result to build uClibc toolchain for ARC it is required to use
+partition that is configured to be case sensitive (use Disk Utility to create a
+new partition, at least 16 GiB are needed to build uClibc toolchain, 32 GiB are
+needed to build a complete baremetal toolchain. With baremetal (elf) toolchain
+there are no such problems.
+
+To build toolchain on macOS it is required to install several prerequisites
+which are either not installed by default or non-GNU-compatible versions are
+installed by default. This easily can be done with Homebrew:
+
+	# Install homebrew itself (https://brew.sh/)
+	$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
+	# Install wget
+	$ brew install wget
+
+	# Install GNU sed
+	$ brew install gnu-sed
+
+To build PDF documentation for toolchain TeX must be installed:
+
+	$ brew cask install mactex
+
+If PDF documentation is not needed, pass option `--no-pdf` to build-all.sh to
+disable its build, then mactex is not required.
+
+
 Getting sources
 ---------------
 
@@ -90,7 +121,7 @@ versions >= 3.9 are supported. Linux sources should be located in the directory
 named `linux` that is the sibling of this `toolchain` directory. For example:
 
     $ wget https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.2.tar.xz
-    $ tar xaf linux-4.8.2.tar.xz --transform=s/linux-4.8.2/linux/
+    $ tar xf linux-4.8.2.tar.xz --transform=s/linux-4.8.2/linux/
 
 ### Using Git repositories
 

arc-external.sh

@@ -41,7 +41,7 @@ for url in ${urls} ; do
             if [ ! -f "${filename}" ]; then
                 $WGET "${url}"
             fi
-            tar xaf "${filename}"
+            tar xf "${filename}"
         fi
         mv "${dirname}" "${toolname}"
     fi

build-all.sh

@@ -448,8 +448,11 @@ esac
 
 if [ x`uname -s` = "xDarwin" ]
 then
+    IS_MAC_OS=yes
     #You can install gsed with 'brew install gnu-sed'
     SED=gsed
+else
+    IS_MAC_OS=no
 fi
 
 # Parse options
@@ -835,9 +838,13 @@ then
     fi
 fi
 
-# Default parallellism
-make_load="`(echo processor; cat /proc/cpuinfo 2>/dev/null echo processor) \
-           | grep -c processor`"
+# Default parallellism (number of cores + 1).
+if [ "$IS_MAC_OS" != yes ]; then
+    make_load="$( (echo processor; cat /proc/cpuinfo 2>/dev/null) \
+               | grep -c processor )"
+else
+    make_load="$(( $(sysctl -n hw.ncpu) + 1))"
+fi
 
 if [ "x${jobs}" = "x" ]
 then
@@ -908,18 +915,23 @@ if [ $DO_PDF = --pdf ]; then
     # Texi is a major source of toolchain build errors -- PDF regularly do not
     # work with particular versions of texinfo, but work with others. To
     # workaround those issues build scripts should be aware of texi version.
-    export TEXINFO_VERSION_MAJOR=$(texi2pdf --version | grep -Po '(?<=Texinfo )[0-9]+')
-    # Grep perl look-behind expressions must have a fixed length, so to future
-    # proof for texinfo versions 10+, we have to read variable, because that
-    # wouldn't work: (?<=Texinfo [0-9]+\.)
-    export TEXINFO_VERSION_MINOR=$(texi2pdf --version |
-	grep -Po "(?<=Texinfo $TEXINFO_VERSION_MAJOR\.)[0-9]+")
+    export TEXINFO_VERSION_MAJOR=$(texi2pdf --version | \
+	perl -ne 'print $1 if /Texinfo ([0-9]+)/')
+    export TEXINFO_VERSION_MINOR=$(texi2pdf --version | \
+	perl -ne 'print $2 if /Texinfo ([0-9]+)\.([0-9]+)/')
 
     # There are issues with Texinfo v4 and non-C locales.
     # See http://lists.gnu.org/archive/html/bug-texinfo/2010-03/msg00031.html
-    if [ 4 = $TEXINFO_VERSION_MAJOR ]; then
+    if [ 4 = "$TEXINFO_VERSION_MAJOR" ]; then
 	export LC_ALL=C
     fi
+
+    # On macOS TeX binary might not be in the PATH even when texi2pdf is.
+    if [ $IS_MAC_OS = yes ]; then
+	if ! which tex &>/dev/null ; then
+	    export PATH=/Library/TeX/texbin:$PATH
+	fi
+    fi
 fi
 
 # Standard setup
@@ -958,6 +970,7 @@ export BUILD_OPTSIZE_NEWLIB
 export BUILD_OPTSIZE_LIBSTDCXX
 export DO_STRIP_TARGET_LIBRARIES
 export IS_CROSS_COMPILING
+export IS_MAC_OS
 export IS_NATIVE
 export UCLIBC_IN_SRC_TREE
 

build-uclibc.sh

@@ -245,6 +245,24 @@ DEFCFG_DIR=$ARC_GNU/uClibc/extra/Configs/defconfigs/arc/
 rm -rf "$build_dir"
 mkdir -p "$build_dir"
 
+# -----------------------------------------------------------------------------
+# Black magic for macOS. The problem is that default sed on macOS is not
+# compatible with GNU, while some scripts use GNU-specific extensions. GNU sed
+# can be installed with Homebrew, but by default it will have a name `gsed`, so
+# scripts should be modified to use it. While this can be done in ARC scripts,
+# we don't have full control over other projects, Linux in particular, which
+# also require GNU sed. Therefore in followind lines a new directory is
+# created, a link named `sed` is created and is pointed to `gsed` and directory
+# is added to the PATH, so GNU sed will be used by Linux.  Alternative solution
+# would be to install GNU sed as `sed` in Homebrew, however that might have
+# some negative effect on other applications, so I don't think it is wise to
+# require this from the user.
+if [ "$IS_MAC_OS" = yes ]; then
+    mkdir $build_dir/macos_aliases
+    ln -s $(which gsed) $build_dir/macos_aliases/sed
+    export PATH=$build_dir/macos_aliases:$PATH
+fi
+
 # -----------------------------------------------------------------------------
 # Install the Linux headers
 
@@ -593,7 +611,7 @@ if [ $DO_NATIVE_GDB = yes ]; then
     fi
 
     build_dir_init ncurses
-    tar xaf $toolchain_build_dir/_download_tmp/$ncurses_tar --strip-components=1
+    tar xf $toolchain_build_dir/_download_tmp/$ncurses_tar --strip-components=1
 
     # GCC 5 introduced some changes to the preprocessor output, that causes a
     # compilation error in files generated by ncurses. See GCC commit:

doc/linux/kernel-build.rst

@@ -10,7 +10,7 @@ single question "How to confirm, that I can build Linux kernel with *that*
 toolchain?"
 
 To learn how to configure Linux, debug kernel itself and build extra software
-please see `<https://github.com/foss-for-synopsys-dwc-arc-processors/linux/wiki>`.
+please see `https://github.com/foss-for-synopsys-dwc-arc-processors/linux/wiki`.
 
 
 Prerequisites
@@ -58,7 +58,7 @@ Synopsys will be used.
 Configuring
 -----------
 
-Check `Buildroot downloads page <http://buildroot.org/download.html>` for
+Check `Buildroot downloads page <http://buildroot.org/download.html>`_ for
 latest release. This guide further assumes latest snapshot. Get Buildroot
 sources::
 
@@ -81,6 +81,7 @@ Contents of this file should be following::
     BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
     BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8=y
     BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+    BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
     BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
     BR2_TOOLCHAIN_EXTERNAL_CXX=y
     BR2_LINUX_KERNEL=y
@@ -115,10 +116,13 @@ Building
 To build Linux kernel image using that defconfig::
 
     $ cd buildroot
-    $ make O=../output_hs defconfig DEFCONFIG=../hs_defconfig
+    $ make O=`readlink -e ../output_hs` defconfig DEFCONFIG=`readlink -e ../hs_defconfig`
     $ cd ../output_hs
     $ make
 
+It's necessary to pass an absolute path to Buildroot, because there is the issue
+with a relative path.
+
 After that there will be Linux kernel image file
 ``arc-2017.03-linux-guide/output/images/vmlinux``.
 
@@ -234,6 +238,7 @@ With those changes Buildroot defconfig for ARC HS VDK is::
     BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
     BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8=y
     BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+    BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
     BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
     BR2_TOOLCHAIN_EXTERNAL_CXX=y
     BR2_LINUX_KERNEL=y
@@ -249,7 +254,7 @@ Save this defconfig to some file (for example ``vdk_defconfig``). Then use same
 process as in :ref:`linux-building-label` section.::
 
     $ cd buildroot
-    $ make O=../output_vdk defconfig DEFCONFIG=<path-to-VDK-defconfig-file>
+    $ make O=`readlink -e ../output_vdk` defconfig DEFCONFIG=<path-to-VDK-defconfig-file>
     $ cd ../output_vdk
     $ make
 
@@ -335,5 +340,5 @@ defconfig is::
 
 This defconfig will create a uImage file instead of vmlinux. Please refer to
 `ARC Linux wiki
-<https://github.com/foss-for-synopsys-dwc-arc-processors/linux/wiki/Getting-Started-with-Linux-on-ARC-AXS103-Software-Development-Platform-(SDP)>`
+<https://github.com/foss-for-synopsys-dwc-arc-processors/linux/wiki/Getting-Started-with-Linux-on-ARC-AXS103-Software-Development-Platform-(SDP)>`_
 for more details on using u-boot with AXS103.

release.mk

@@ -711,7 +711,7 @@ $O/$(ECLIPSE_VANILLA_ZIP_WIN):
 # in sync.
 $O/.stamp_ide_linux_eclipse: $O/$(ECLIPSE_VANILLA_TGZ_LINUX) $O/$(IDE_PLUGINS_ZIP)
 	mkdir -m775 -p $O/$(IDE_INSTALL_LINUX)
-	tar xaf $< -C $O/$(IDE_INSTALL_LINUX)
+	tar xf $< -C $O/$(IDE_INSTALL_LINUX)
 	$O/$(IDE_INSTALL_LINUX)/eclipse/eclipse \
 	    -application org.eclipse.equinox.p2.director \
 	    -noSplash \
@@ -733,7 +733,7 @@ $O/.stamp_ide_linux_tar: \
 	cp -al $O/$(TOOLS_LINUXLE_HS_DIR_LINUX)/* $O/$(IDE_INSTALL_LINUX)
 	cp -al $O/$(TOOLS_LINUXBE_HS_DIR_LINUX)/* $O/$(IDE_INSTALL_LINUX)
 	mkdir -m775 $O/$(IDE_INSTALL_LINUX)/eclipse/jre
-	tar xaf $O/$(JRE_TGZ_LINUX) -C $O/$(IDE_INSTALL_LINUX)/eclipse/jre \
+	tar xf $O/$(JRE_TGZ_LINUX) -C $O/$(IDE_INSTALL_LINUX)/eclipse/jre \
 	    --strip-components=1
 	cp -al $O/$(OOCD_DIR_LINUX)/* $O/$(IDE_INSTALL_LINUX)
 	tar caf $O/$(IDE_TGZ_LINUX) -C $O $(IDE_INSTALL_LINUX)
@@ -818,7 +818,7 @@ $(BUILD_DIR)/libusb-$(LIBUSB_VERSION).tar.bz2:
 
 
 $(BUILD_DIR)/libusb_linux_src: $(BUILD_DIR)/libusb-$(LIBUSB_VERSION).tar.bz2
-	tar -C $(BUILD_DIR) -xaf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_linux_src/'
+	tar -C $(BUILD_DIR) -xf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_linux_src/'
 
 
 .PHONY: libusb-linux-install
@@ -832,7 +832,7 @@ $(BUILD_DIR)/libusb_linux_install/lib/libusb-1.0.a: $(BUILD_DIR)/libusb_linux_sr
 
 
 $(BUILD_DIR)/libusb_win_src: $(BUILD_DIR)/libusb-$(LIBUSB_VERSION).tar.bz2
-	tar -C $(BUILD_DIR) -xaf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_win_src/'
+	tar -C $(BUILD_DIR) -xf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_win_src/'
 
 
 # It looks like that libusb Makefile is not parallel-friendly, it fails with error