Merge branch 'arc-dev' into arc-staging

Author: anthony-kolesov

Makefile.release

@@ -219,15 +219,15 @@ $O/.stamp_elf_le_windows_built: $O/.stamp_checked_out $O/.stamp_elf_le_built
 	PATH=$(shell readlink -e $O/$(TOOLS_ELFLE_DIR_LINUX)/bin):$$PATH \
 	     ./build-all.sh $(BUILDALLFLAGS) \
 	     --install-dir $O/$(TOOLS_ELFLE_DIR_WIN) --no-uclibc --no-sim \
-	     --release-name $(RELEASE) --host i686-w64-mingw32
+	     --release-name $(RELEASE) --host i686-w64-mingw32 --no-system-expat
 	touch $@
 
 $O/.stamp_elf_be_windows_built: $O/.stamp_checked_out $O/.stamp_elf_be_built
 	# Install toolchain in the same dir as little endian
 	PATH=$(shell readlink -e $O/$(TOOLS_ELFBE_DIR_LINUX))/bin:$$PATH \
 	     ./build-all.sh $(BUILDALLFLAGS) \
 	     --install-dir $O/$(TOOLS_ELFBE_DIR_WIN) --no-uclibc --big-endian --no-sim \
-	     --release-name $(RELEASE) --host i686-w64-mingw32
+	     --release-name $(RELEASE) --host i686-w64-mingw32 --no-system-expat
 	touch $@
 
 $O/.stamp_elf_le_windows_tarball: $O/.stamp_elf_le_windows_built

README.md

@@ -128,6 +128,10 @@ consumed and time to clone the repository.
 By default `toolchain` repository will be checked out to the current
 development branch `arc-dev`.
 
+If current working directory is not a "toolchain" directory, then change to it:
+
+    $ cd toolchain
+
 Following command will check out repository to the latest release:
 
     $ git checkout arc-releases
@@ -257,20 +261,24 @@ officially supported and not recommended by Synopsys, due to severe performance
 penalty of those environments on build time and possible compatibility issue.
 
 Some limitation apply:
-* CGEN simulator is not support on Windows hosts, thus should be disabled with
-  `--no-sim` option.
-* Only bare metal (elf32) tool chain can be built this way.
-* It is required to have tool chain for Linux hosts in the `PATH` for Canadian
+- CGEN simulator is not supported on Windows hosts, thus should be disabled
+  with `--no-sim` option.
+- Only bare metal (elf32) tool chain can be built this way.
+- It is required to have tool chain for Linux hosts in the `PATH` for Canadian
   cross-build to succeed - it will be used to compile standard library of tool
   chain.
+- Expat library is required for GDB to parse XML target description files. This
+  library might be not available in some Mingw setup. Easiest solution is to
+  let `build-all.sh` script to build Expat by passing option
+  `--no-system-expat`.
 
-To cross-compile tool chain on Linux, mingw tool chain should be installed. On
+To cross-compile tool chain on Linux, Mingw tool chain should be installed. On
 Ubuntu that can be done with `mingw-w64` package:
 
     # apt-get install mingw-w64
 
-RHEL 6 has a very antique mingw (4.4-something), so it is recommended to first
-add EPEL repository, then install mingw from it. In CentOS:
+RHEL 6 has a very antique Mingw (4.4-something), so it is recommended to first
+add EPEL repository, then install Mingw from it. In CentOS:
 
     # yum install epel-release
     # yum install mingw-binutils-generic mingw-filesystem-base \
@@ -283,7 +291,8 @@ For instruction how to install EPEL on RHEL, see
 
 After prerequisites are installed and Linux tools are in the `PATH`, do:
 
-    $ ./build-all.sh --no-uclibc --no-sim --host i686-w64-mingw32
+    $ ./build-all.sh --no-uclibc --no-sim --host i686-w64-mingw32 \
+      --no-system-expat
 
 Note that value of host triplet depends on what mingw tool chain is being used.
 Triplet `i686-w64-mingw32` is valid for mingw tool chain currently used in
@@ -304,7 +313,7 @@ been added to the PATH:
 
 Build application:
 
-    $ arc-elf32-gcc hello_world.c -marc700
+    $ arc-elf32-gcc hello_world.c -marc700 -g
 
 To run it on CGEN-based simulator without debugger:
 

arc-clone-all.sh

@@ -96,8 +96,8 @@ parse_args () {
 
 # -----------------------------------------------------------------------------
 # Function to clone a tool and (optionally) its upstream. The ARC branches of
-# the tool will be from a remote called "arc", the upstream branches from a
-# remote called "upstream".
+# the tool will be from a remote with default name ("origin"), the upstream
+# branches from a remote called "upstream".
 
 # With the creation of the binutils-gdb combined repo, the name of the repo
 # and the name of the tool are no longer the same, so we need a third argument.
@@ -130,9 +130,9 @@ clone_tool () {
 
     # Clone the ARC repo
     if [ ${is_dev} = "false" ] \
-	|| ! git clone -q -o arc ${ssh_repo} ${tool} >> ${logfile} 2>&1
+	|| ! git clone -q ${ssh_repo} ${tool} >> ${logfile} 2>&1
     then
-	if ! git clone -q -o arc ${http_repo} ${tool} >> ${logfile} 2>&1
+	if ! git clone -q ${http_repo} ${tool} >> ${logfile} 2>&1
 	then
 	    echo "Warning: Failed to clone ${http_repo}" | tee -a ${logfile}
 	    return 1

arc-init.sh

@@ -174,7 +174,7 @@ temp_file_in_dir () {
     PATTERN=$2
     FILE=$(cd ${DIR} && mktemp "${PATTERN}")
     STATUS=$?
-    if [ ${STATUS} == 0 ]
+    if [ ${STATUS} = 0 ]
     then
         echo ${DIR}/${FILE}
     else
@@ -315,7 +315,14 @@ configure_elf32() {
 	local src=$tool
     fi
     echo "  configuring..."
-    config_path="$(calcConfigPath "$ARC_GNU/$src")"
+    # If there is / in srcdir - that this is already a path. Otherwise
+    # construct path from a directory name.
+    if echo "$src" | grep -q -e /
+    then
+	config_path="$(calcConfigPath $src)"
+    else
+	config_path="$(calcConfigPath "$ARC_GNU/$src")"
+    fi
 
     if [ "$TOOLCHAIN_HOST" ]; then
 	host_opt="--host=$TOOLCHAIN_HOST"
@@ -408,7 +415,14 @@ configure_uclibc_stage2() {
 	local src=$tool
     fi
     echo "  configuring..."
-    config_path="$(calcConfigPath "$ARC_GNU/$src")"
+    # If there is / in srcdir - that this is already a path. Otherwise
+    # construct path from a directory name.
+    if echo "$src" | grep -q -e /
+    then
+	config_path="$(calcConfigPath $src)"
+    else
+	config_path="$(calcConfigPath "$ARC_GNU/$src")"
+    fi
     if ! "$config_path/configure" \
 	--target=$triplet \
 	--with-cpu=${ISA_CPU} \
@@ -446,6 +460,14 @@ configure_for_arc() {
 
     local srcdir=$1
     local triplet=$2
+
+    # Cannto do a simple "CFLAGS=$CFLAGS_FOR_TARGET, because if latter is empty
+    # that would reset CFLAGS unnecessarily.
+    local cflags=
+    if [ "$CFLAGS_FOR_TARGET" ]
+    then
+	cflags="CFLAGS=$CFLAGS_FOR_TARGET"
+    fi
     shift 2
 
     # --prefix must correspond to prefix on *target* system, not where it will
@@ -457,7 +479,7 @@ configure_for_arc() {
     if ! $srcdir/configure --prefix=/usr --host=$triplet \
 	    --with-pkgversion="$UCLIBC_TOOLS_VERSION"\
 	    --with-bugurl="$ARC_COMMON_BUGURL" \
-	    CFLAGS="$CFLAGS_FOR_TARGET" $* \
+	    $cflags $* \
 	    >> "$logfile" 2>&1
     then
 	echo "ERROR: failed while configuring."

arc-versions.sh

@@ -136,8 +136,14 @@ do
     if [ "x${autopull}" = "x--auto-pull" ]
     then
 	# Fetch any new tags and branches.
+	# Note the usage of --all. Without this option and without explicit
+	# remote name `git fetch` will succeed only if there is remote named
+	# "origin", and it will fetch only it (which might be really not what
+	# is desired). And if there is no remote named "origin" then `git
+	# fetch` will fail even if there is only a single remote in git
+	# configuration.
 	echo "  fetching tags"
-	if ! git fetch --tags
+	if ! git fetch --tags --all
 	then
 	    exit 1
 	fi

build-all.sh

@@ -51,6 +51,7 @@
 #                  [--checkout-config <config>]
 #                  [--host <triplet>]
 #                  [--native-gdb | --no-native-gdb]
+#                  [--system-expat | --no-system-expat]
 
 # This script is a convenience wrapper to build the ARC GNU 4.4 tool
 # chains. It utilizes Joern Rennecke's build-elf32.sh script and Bendan
@@ -289,6 +290,15 @@
 #       manually with your ncurses. Buildroot handles this nicely.
 #     - Due to a bug ncurses has to be built without C++ bindings.
 
+# --system-expat | --no-system-expat
+
+#    Whether to use expat library installed into system or build it in this
+#    script. expat is used by GDB to parse XML, therefore is needed to work
+#    with XML Target descriptions. Usually using system expat is sufficient,
+#    however it may cause issues if system doesn't have expat or it is of wrong
+#    version. Notable use case for --no-system-expat is mingw32 build, if mingw
+#    installation lacks expat. Default value is to use system expat.
+
 # Where directories are specified as arguments, they are relative to the
 # current directory, unless specified as absolute names.
 
@@ -364,6 +374,7 @@ is_tarball=
 NPTL_SUPPORT="yes"
 CHECKOUT_CONFIG=
 TOOLCHAIN_HOST=
+SYSTEM_EXPAT=yes
 
 # Default multilib usage and conversion for toolchain building
 case "x${DISABLE_MULTILIB}" in
@@ -578,6 +589,14 @@ case ${opt} in
 	DO_NATIVE_GDB=no
 	;;
 
+    --system-expat)
+	SYSTEM_EXPAT=yes
+	;;
+
+    --no-system-expat)
+	SYSTEM_EXPAT=no
+	;;
+
     ?*)
 	echo "Unknown argument $1"
 	echo
@@ -612,6 +631,7 @@ case ${opt} in
 	echo "                      [--checkout-config <config>]"
 	echo "                      [--host <triplet>]"
 	echo "                      [--native-gdb | --no-native-gdb]"
+	echo "                      [--system-expat | --no-system-expat]"
 	exit 1
 	;;
 
@@ -796,6 +816,7 @@ export CHECKOUT_CONFIG
 # Used by configure funcs in arc-init.sh
 export TOOLCHAIN_HOST
 export UCLIBC_TOOLS_VERSION
+export SYSTEM_EXPAT
 
 # Set up a logfile
 logfile="${LOGDIR}/all-build-$(date -u +%F-%H%M).log"
@@ -896,7 +917,7 @@ fi
 # Patch RPATHs so they are relative
 if [ "x${rel_rpaths}" = "x--rel-rpaths" ]
 then
-    if ! "${ARC_GNU}"/toolchain/rel-rpaths.sh >> "${logfile}" 2>&1
+    if ! "${ARC_GNU}"/toolchain/rel-rpaths.sh ${INSTALLDIR} >> "${logfile}" 2>&1
     then
 	echo "ERROR: Unable to make RPATHs relative. Is patchelf installed?"
 	exit 1

build-elf32.sh

@@ -120,6 +120,7 @@ echo "START ELF32: $(date)" | tee -a "$logfile"
 
 # Initialize common variables and functions.
 . "${ARC_GNU}"/toolchain/arc-init.sh
+toolchain_build_dir=$PWD/toolchain
 
 # variables to control whether the simulator is build. Note that we actively
 # edit in the requirement for a simulator library in case it has been left
@@ -128,7 +129,7 @@ if [ "x${DO_SIM}" = "x--sim" ]
 then
     sim_config="--enable-sim --enable-sim-endian=no"
     sim_build=all-sim
-    # CGEN doesn't have install-strip target.
+    # NB: CGEN doesn't have install-strip target.
     sim_install=install-sim
     ${SED} -i "${ARC_GNU}"/gdb/gdb/configure.tgt \
 	   -e 's!# gdb_sim=../sim/arc/libsim.a!gdb_sim=../sim/arc/libsim.a!'
@@ -176,7 +177,8 @@ make_target building all-binutils all-gas all-ld
 # is required that binutils is installed before ld and gas. That order
 # denedency showed up only with Linux toolchain so far, but for safety same
 # patch is applied to baremetal toolchain.
-make_target_ordered installing install-binutils install-ld install-gas
+make_target_ordered installing ${HOST_INSTALL}-binutils ${HOST_INSTALL}-ld \
+    ${HOST_INSTALL}-gas
 if [ "$DO_PDF" = "--pdf" ]
 then
     make_target "generating PDF documentation" install-pdf-binutils \
@@ -257,11 +259,29 @@ make_target installing install-target-libstdc++-v3
 # Don't build libstdc++ documentation because it requires additional software
 # on build host.
 
+# Expat if requested
+if [ "$SYSTEM_EXPAT" = no ]
+then
+    mkdir -p $toolchain_build_dir/_download_tmp
+    expat_version=2.1.0
+    expat_tar=expat-${expat_version}.tar.gz
+    if [ ! -s $toolchain_build_dir/_download_tmp/$expat_tar ]; then
+	wget -nv -O $toolchain_build_dir/_download_tmp/$expat_tar \
+	  http://sourceforge.net/projects/expat/files/expat/$expat_version/$expat_tar/download
+    fi
+
+    build_dir_init expat
+    tar xzf $toolchain_build_dir/_download_tmp/$expat_tar --strip-components=1
+    configure_elf32 expat $PWD
+    make_target building all
+    make_target installing install
+fi
+
 # GDB and CGEN simulator (maybe)
 build_dir_init gdb
 configure_elf32 gdb
 make_target building all-gdb ${sim_build}
-make_target installing ${sim_install} install-gdb
+make_target installing ${sim_install} ${HOST_INSTALL}-gdb
 if [ "$DO_PDF" = "--pdf" ]
 then
     make_target "generating PDF documentation" install-pdf-gdb