Skip to content

Commit e641d0c

Browse files
author
ARC GNU Verification
committed
Merge branch 'arc-dev' into arc-staging
2 parents c04a849 + b78f640 commit e641d0c

File tree

7 files changed

+62
-12
lines changed

7 files changed

+62
-12
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ Latest stable release from https://kernel.org/ is recommended, and only
120120
versions >= 3.9 are supported. Linux sources should be located in the directory
121121
named `linux` that is the sibling of this `toolchain` directory. For example:
122122

123-
$ wget https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.2.tar.xz
124-
$ tar xf linux-4.8.2.tar.xz --transform=s/linux-4.8.2/linux/
123+
$ wget https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.13.tar.xz
124+
$ tar xf linux-4.9.13.tar.xz --transform=s/linux-4.9.13/linux/
125125

126126
### Using Git repositories
127127

@@ -163,7 +163,7 @@ config/arc-dev.sh file, which at the moment of this writing are:
163163
* gdb - arc-2016.09-gdb
164164
* newlib - arc-2017.03
165165
* uClibc - arc-2017.03
166-
* Linux - linux-4.8.y
166+
* Linux - linux-4.9.y
167167

168168
Note, however that if `build-all.sh` will try to checkout repositories to their
169169
latest state, which is a default behaviour, then it will anyway fetch

‎build-uclibc.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,15 @@ fi
337337

338338
# -----------------------------------------------------------------------------
339339
# Build Binutils - will be used by both state 1 and stage2
340+
# Note the --disable-shared option. It is used here, because binutils libraries
341+
# shouldn't be build as dynamic libs (this causes issues on macOS), however the
342+
# target libraries should be built as shared ones. But as far as I see same
343+
# option is used for both host and target, so --enable-shared should be used
344+
# for components that build target libraries (like gcc and libgcc), but
345+
# shouldn't be used for binutils, since it doesn't has target libraries and is
346+
# known to have troubles when shared libraries are used.
340347
build_dir_init binutils
341-
configure_uclibc_stage2 binutils binutils --disable-gdb
348+
configure_uclibc_stage2 binutils binutils --disable-gdb --disable-shared
342349
make_target building all
343350

344351
# Gas requires opcodes to be installed, LD requires BFD to be installed.

‎config/arc-dev.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
binutils=binutils:arc-2017.03
22
gcc=gcc:arc-2017.03
3-
gdb=gdb:arc-2016.09-gdb
3+
gdb=gdb:arc-2017.03-gdb
44
newlib=newlib:arc-2017.03
55
uclibc=uClibc:arc-2017.03
6-
linux=linux:linux-4.8.y
6+
linux=linux:linux-4.9.y

‎doc/linux/kernel-build.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Contents of this file should be following::
7979
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
8080
BR2_TOOLCHAIN_EXTERNAL_URL="http://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2017.03-rc1/arc_gnu_2017.03-rc1_prebuilt_uclibc_le_archs_linux_install.tar.gz"
8181
BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
82-
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8=y
82+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
8383
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
8484
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
8585
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
@@ -236,7 +236,7 @@ With those changes Buildroot defconfig for ARC HS VDK is::
236236
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
237237
BR2_TOOLCHAIN_EXTERNAL_URL="http://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2017.03-rc1/arc_gnu_2017.03-rc1_prebuilt_uclibc_le_archs_linux_install.tar.gz"
238238
BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
239-
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8=y
239+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
240240
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
241241
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
242242
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
@@ -325,7 +325,7 @@ defconfig is::
325325
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
326326
BR2_TOOLCHAIN_EXTERNAL_URL="http://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2017.03/arc_gnu_2017.03_prebuilt_uclibc_le_archs_linux_install.tar.gz"
327327
BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
328-
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8=y
328+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
329329
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
330330
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
331331
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y

‎extras/buildroot/axs103.defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BR2_archs38=y
33
BR2_TOOLCHAIN_EXTERNAL=y
44
BR2_TOOLCHAIN_EXTERNAL_PATH="$(ARC_TOOLCHAIN_PATH)"
55
BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
6-
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8=y
6+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
77
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
88
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
99
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y

‎github/create-release.py‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
logging.basicConfig(level=logging.INFO)
2424

2525
parser = argparse.ArgumentParser()
26-
parser.add_argument("assets", nargs="+")
26+
parser.add_argument("assets", nargs="*")
2727
parser.add_argument("--owner", required=True)
2828
parser.add_argument("--project", required=True)
2929
parser.add_argument("--tag", required=True)
30+
parser.add_argument("--release-id", help="Tag name without prefix and suffix")
3031
parser.add_argument("--name", required=True)
3132
parser.add_argument("--description", default="")
3233
parser.add_argument("--md5sum-file", help="File with md5sums for uploaded assets")
@@ -36,6 +37,43 @@
3637

3738
args = parser.parse_args()
3839

40+
# Download table.
41+
if args.release_id is not None:
42+
url = "//github.com/{0}/{1}/releases/download/{2}".format(args.owner, args.project, args.tag)
43+
fformat = "[{t}](" + url + "/arc_gnu_{release}_prebuilt_{type}_{cpu}_{host}_install.tar.gz)"
44+
ide_fformat = "[{t}](" + url + "/arc_gnu_{release}_ide_{host}_install.{ext})"
45+
le = "Little endian"
46+
be = "Big endian"
47+
48+
args.description += """
49+
| | Linux x86_64 | Windows x86_64 | macOS x86_64 | Linux ARC HS |
50+
| ------------------- | ------------ | -------------- | ------------ | ------------ |
51+
| Baremetal | {0} \ {1} | | {2} \ {3} | |
52+
| Linux/uClibc ARC700 | {4} \ {5} | | | |
53+
| Linux/uClibc ARC HS | {6} \ {7} | | {8} \ {9} | {10} |
54+
| IDE | {11} | {12} | | |
55+
""".format(
56+
fformat.format(t=le, release=args.release_id, type="baremetal", cpu="le", host="linux"),
57+
fformat.format(t=be, release=args.release_id, type="baremetal", cpu="be", host="linux"),
58+
fformat.format(t=le, release=args.release_id, type="baremetal", cpu="le", host="macos"),
59+
fformat.format(t=be, release=args.release_id, type="baremetal", cpu="be", host="macos"),
60+
fformat.format(t=le, release=args.release_id, type="uclibc", cpu="le_arc700",
61+
host="linux"),
62+
fformat.format(t=be, release=args.release_id, type="uclibc", cpu="be_arc700",
63+
host="linux"),
64+
fformat.format(t=le, release=args.release_id, type="uclibc", cpu="le_archs",
65+
host="linux"),
66+
fformat.format(t=be, release=args.release_id, type="uclibc", cpu="be_archs",
67+
host="linux"),
68+
fformat.format(t=le, release=args.release_id, type="uclibc", cpu="le_archs",
69+
host="macos"),
70+
fformat.format(t=be, release=args.release_id, type="uclibc", cpu="be_archs",
71+
host="macos"),
72+
fformat.format(t=le, release=args.release_id, type="uclibc", cpu="le_archs",
73+
host="native"),
74+
ide_fformat.format(t="Download", release=args.release_id, host="linux", ext="tar.gz"),
75+
ide_fformat.format(t="Download", release=args.release_id, host="win", ext="exe"))
76+
3977
if args.md5sum_file is not None:
4078
with open(args.md5sum_file, "r") as f:
4179
text = f.read()

‎release.mk‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ DIRS += $(BUILD_DIR)
624624
# Linux
625625
#
626626

627-
BUILDROOT_VERSION = 2016.11.2
627+
BUILDROOT_VERSION = 2017.02
628628
BUILDROOT_TAR = buildroot-$(BUILDROOT_VERSION).tar.bz2
629629
BUILDROOT_URL = https://buildroot.org/downloads/$(BUILDROOT_TAR)
630630
BUILDROOT_SRC_DIR = $(BUILD_DIR)/buildroot
@@ -821,11 +821,15 @@ $(BUILD_DIR)/libusb_linux_src: $(BUILD_DIR)/libusb-$(LIBUSB_VERSION).tar.bz2
821821
tar -C $(BUILD_DIR) -xf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_linux_src/'
822822

823823

824+
# udev should be disabled, to avoid dependency on libudev.so, because various
825+
# distributions might have different versions (CentOS 6 uses libudev.so.0,
826+
# while CentOS 7 uses libudev.so.1).
824827
.PHONY: libusb-linux-install
825828
libusb-linux-install: $(BUILD_DIR)/libusb_linux_install/lib/libusb-1.0.a
826829
$(BUILD_DIR)/libusb_linux_install/lib/libusb-1.0.a: $(BUILD_DIR)/libusb_linux_src
827830
cd $< && \
828831
./configure --disable-shared --enable-static \
832+
--disable-udev \
829833
--prefix=$(abspath $(BUILD_DIR)/libusb_linux_install)
830834
$(MAKE) -C $< -j1
831835
$(MAKE) -C $< install
@@ -1033,6 +1037,7 @@ endif
10331037
upload: $O/$(MD5SUM_FILE)
10341038
$(PYTHON) github/create-release.py --owner=foss-for-synopsys-dwc-arc-processors \
10351039
--project=toolchain --tag=$(RELEASE_TAG) --draft \
1040+
--release-id=$(RELEASE) \
10361041
--name="$(RELEASE_NAME)" \
10371042
--prerelease --oauth-token=$(shell cat ~/.github_oauth_token) \
10381043
--md5sum-file=$O/$(MD5SUM_FILE) \

0 commit comments

Comments
 (0)