Merge branch 'arc-dev' into arc-staging

Author: ARC GNU Verification

README.md

@@ -104,6 +104,13 @@ To build PDF documentation for toolchain TeX must be installed:
 If PDF documentation is not needed, pass option `--no-pdf` to build-all.sh to
 disable its build, then mactex is not required.
 
+> NB! Linux/uClibc toolchain built on macOS has different uClibc configuration
+> then the one built on Linux hosts - **local support is disabled**. The reason
+> is that when locale support is enabled, uClibc makefiles will build an
+> application called `genlocale` that will run on host system, but on macOS
+> this application fails to build, therefore support for locales is disabled
+> when Linux/uClibc toolchain is built on macOS.
+
 
 Getting sources
 ---------------

arc-external.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-# Copyright (C) 2013-2016 Synopsys Inc.
+# Copyright (C) 2013-2017 Synopsys Inc.
 
 # Contributor Anton Kolesov <[email protected]>
 

arc-init.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (C) 2007-2016 Synopsys Inc.
+# Copyright (C) 2007-2017 Synopsys Inc.
 
 # This file is a common initialization script for ARC tool chains.
 
@@ -540,6 +540,52 @@ build_expat() {
     make_target installing install
 }
 
+# $1 - a configuration file or a directory with .config
+# $2 - option to enable
+kconfig_enable_option() {
+    local config=$1
+    if [ -d "$1" ]; then
+        config=$1/.config
+    fi
+
+    # Delete occurrences of option $2 from $config and append
+    # "$2=y" to enable this option.
+    if ! grep -q "$2=y" $config ; then
+        # Config file must not be empty because sed does not work
+        # correctly with empty files.
+        echo >> $config
+
+        $SED -i \
+            -e "/# $2 is not set/d" \
+            -e "/$2=n/d" \
+            -e "\$a$2=y" \
+            $config
+    fi
+}
+
+# $1 - a configuration file or a directory with .config
+# $2 - option to disable
+kconfig_disable_option() {
+    local config=$1
+    if [ -d "$1" ]; then
+        config=$1/.config
+    fi
+
+    # Delete option $2 from $config and append "$2=n" to disable this
+    # option by force.
+    if ! grep -q "$2=n" $config ; then
+        # Config file must not be empty because sed does not work
+        # correctly with empty files.
+        echo >> $config
+
+        $SED -i \
+            -e "/# $2 is not set/d" \
+            -e "/$2=y/d" \
+            -e "\$a$2=n" \
+            $config
+    fi
+}
+
 # Create a common log directory for all logs in this and sub-scripts
 LOGDIR="$ARC_GNU/logs"
 mkdir -p "$LOGDIR"

arc-versions.sh

@@ -2,7 +2,7 @@
 
 # Script to specify versions of tools to use.
 
-# Copyright (C) 2012-2016 Synopsys Inc.
+# Copyright (C) 2012-2017 Synopsys Inc.
 
 # Contributor Jeremy Bennett <[email protected]>
 # Contributor Anton Kolesov <[email protected]>

build-all.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (C) 2012-2016 Synopsys Inc.
+# Copyright (C) 2012-2017 Synopsys Inc.
 
 # Contributor Jeremy Bennett <[email protected]>
 # Contributor Anton Kolesov <[email protected]>

build-cleanup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012-2016 Synopsys Inc.
+# Copyright (C) 2012-2017 Synopsys Inc.
 
 # Contributor Jeremy Bennett <[email protected]>
 

build-elf32.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Copyright (C) 2009, 2011, 2012, 2013 Embecosm Limited
-# Copyright (C) 2012-2016 Synopsys Inc.
+# Copyright (C) 2012-2017 Synopsys Inc.
 
 # Contributor Joern Rennecke <[email protected]>
 # Contributor Jeremy Bennett <[email protected]>

build-uclibc.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (C) 2010-2016 Synopsys Inc.
+# Copyright (C) 2010-2017 Synopsys Inc.
 
 # Contributor Brendan Kehoe <[email protected]>
 # Contributor Jeremy Bennett <[email protected]>
@@ -450,6 +450,13 @@ else
            -i $uc_dot_config
 fi
 
+# Remove locale support on macOS. uClibc runs an application on a host to
+# generate local files, but that application fails to build on macOS, therefore
+# locale support has to be disabled on macOS hosts.
+if [ "$IS_MAC_OS" = yes ]; then
+    kconfig_disable_option $uc_dot_config UCLIBC_HAS_LOCALE
+fi
+
 # Disable HARDWIRED_ABSPATH to avoid absolute path references to allow
 # relocatable toolchains.
 echo "HARDWIRED_ABSPATH=n" >> $uc_dot_config

dejagnu/arc-common.exp

@@ -1,4 +1,4 @@
-# Copyright (C) 2016 Synopsys Inc.
+# Copyright (C) 2016-2017 Synopsys Inc.
 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free

dejagnu/baseboards/arc-ashling-gdbserver.exp

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016 Synopsys, Inc.
+# Copyright (C) 2013-2017 Synopsys, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free