Skip to content

Commit 6163070

Browse files
Merge branch 'arc-4.8-dev' into arc-releases
2 parents 5a31d3e + b9fc95a commit 6163070

File tree

4 files changed

+40
-6
lines changed

4 files changed

+40
-6
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2014-12-12 Anton Kolesov <[email protected]>
2+
3+
* README.md: Add git to prerequisites.
4+
15
2014-12-08 Anton Kolesov <[email protected]>
26

37
* arc-versions.sh: Change Linux version to 3.13.

Makefile.release

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ LINUX_BE_700_TGZ := $(LINUX_BE_700_NAME).tar.gz
6363
LINUX_LE_HS_TGZ := $(LINUX_LE_HS_NAME).tar.gz
6464
LINUX_BE_HS_TGZ := $(LINUX_BE_HS_NAME).tar.gz
6565
# Baremetal for Windows
66-
WIN_ELF_LE_DIR := arc-elf32_windows
66+
WIN_ELF_NAME := arc_gnu_$(RELEASE)_prebuilt_elf32_windows_install
67+
WIN_ELF_LE_DIR := arc_gnu_$(RELEASE)_prebuilt_elf32_windows_install
68+
WIN_ELF_TGZ := $(WIN_ELF_NAME).tar.gz
6769
# Big endian toolchain is installed to same directory as little endian
6870
#WIN_ELF_BE_DIR := $O/arceb-elf32_windows
6971
# md5sum
@@ -87,8 +89,9 @@ $O/$(MD5SUM_FILE): \
8789
$O/.stamp_elf_le_tarball $O/.stamp_elf_be_tarball \
8890
$O/.stamp_linux_le_700_tarball $O/.stamp_linux_be_700_tarball \
8991
$O/.stamp_linux_le_hs_tarball $O/.stamp_linux_be_hs_tarball \
90-
$O/.stamp_elf_le_windows_built $O/.stamp_elf_be_windows_built
91-
cd $O && md5sum *.tar.gz > $@
92+
$O/.stamp_elf_windows_tarball
93+
cd $O && md5sum *linux_install.tar.gz *sources.tar.gz *.zip > $@
94+
9295

9396
checkout: $O/.stamp_checked_out
9497

@@ -204,6 +207,11 @@ $O/.stamp_elf_be_windows_built: $O/.stamp_unisrc build-all-windows.sh $O/.stamp_
204207
--install-dir $O/$(WIN_ELF_LE_DIR) --no-uclibc --big-endian --no-sim --release-name $(RELEASE)
205208
touch $@
206209

210+
$O/.stamp_elf_windows_tarball: $O/.stamp_elf_le_windows_built $O/.stamp_elf_be_windows_built
211+
cd $O && tar czf $(WIN_ELF_TGZ) --transform='s#$(WIN_ELF_LE_DIR)#$(WIN_ELF_NAME)#' $(WIN_ELF_LE_DIR)/
212+
cd $O && zip -q -r $(WIN_ELF_NAME).zip $(WIN_ELF_LE_DIR)/
213+
touch $@
214+
207215
#
208216
# Clean
209217
#

README.md

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ ARC GNU tool chain user guide or on the
4141
On Ubuntu 12.04/14.04 LTS you can install those with following command (as root):
4242

4343
# apt-get install texinfo byacc flex libncurses5-dev zlib1g-dev \
44-
libexpat1-dev libx11-dev texlive build-essential
44+
libexpat1-dev libx11-dev texlive build-essential git
4545

4646
On Fedora 17 you can install those with following command (as root):
4747

4848
# yum groupinstall "Development Tools"
4949
# yum install texinfo-tex byacc flex ncurses-devel zlib-devel expat-devel \
50-
libX11-devel
50+
libX11-devel git
5151

5252
GCC depends on the GMP, MPFR and MPC packages, however there are problems with
5353
availability of those packages on the RHEL/CentOS systems (packages has too old
@@ -253,6 +253,28 @@ And in another console (GDB output is omitted):
253253
(gdb) continue
254254
(gdb) q
255255

256+
If one of the HS TCFs is used, then it is required to add `-on
257+
nsim_isa_ll64_option` to nSIM options, because GCC for ARC automatically
258+
generates double-world memory operations, which are not enabled in TCFs
259+
supplied with nSIM:
260+
261+
$ $NSIM_HOME/bin/nsimdrv -gdb -port 51000 \
262+
-tcf $NSIM_HOME/etc/tcf/templates/hs36.tcf -on nsim_emt \
263+
-on nsim_isa_ll64_option
264+
265+
nSIM distribution doesn't containt big-endian TCFs, so `-on
266+
nsim_isa_big_endian` should be added to nSIM options to simulate big-endian
267+
cores:
268+
269+
$ $NSIM_HOME/bin/nsimdrv -gdb -port 51000 \
270+
-tcf $NSIM_HOME/etc/tcf/templates/em6_gp.tcf -on nsim_emt \
271+
-on nsim_isa_big_endian
272+
273+
Default linker script of GNU Tool chain for ARC is not compatible with memory
274+
maps of cores that only has CCM memory (EM4, EM5D, HS34), thus to run
275+
application on nSIM with those TCFs it is required to link application with
276+
linker script appropriate for selected core.
277+
256278
Please note that in case of gdbserver-based usage all execution, input and
257279
output happens on the side of host that runs gdbserver, so "hello world" string
258280
will be printed on the server side.

windows-installer/setup-base.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
; Settings
3434

3535
# File and Installer Name
36-
outfile "${entry_name}_${arcver}_win_install.exe"
36+
outfile "${entry_name}_ide_${arcver}_win_install.exe"
3737
Name "${arctitle} ${arcver}"
3838

3939
# Default directory

0 commit comments

Comments
 (0)