From 22d73aafedce62f32605b66d2802fe5e97a92f81 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 17 Aug 2016 01:06:10 +0200 Subject: [PATCH] Updated riscv-gnu-toolchain to git rev 7e48594 --- Makefile | 32 ++++++++++++++++++++++---------- README.md | 7 ++++--- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index da42271..f41044e 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,8 @@ -RISCV_GNU_TOOLCHAIN_REV = 13f52d2 -GCC_URL = http://mirrors.kernel.org/gnu/gcc/gcc-6.1.0/gcc-6.1.0.tar.gz +RISCV_GNU_TOOLCHAIN_REV = 7e48594 NEWLIB_URL = ftp://sourceware.org/pub/newlib/newlib-2.2.0.tar.gz -BINUTILS_URL = http://mirrors.kernel.org/gnu/binutils/binutils-2.26.tar.gz +SHELL = bash TEST_OBJS = $(addsuffix .o,$(basename $(wildcard tests/*.S))) FIRMWARE_OBJS = firmware/start.o firmware/irq.o firmware/print.o firmware/sieve.o firmware/multest.o firmware/stats.o GCC_WARNS = -Werror -Wall -Wextra -Wshadow -Wundef -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings @@ -77,9 +76,14 @@ tests/%.o: tests/%.S tests/riscv_test.h tests/test_macros.h -DTEST_FUNC_TXT='"$(notdir $(basename $<))"' -DTEST_FUNC_RET=$(notdir $(basename $<))_ret $< download-tools: - sudo bash -c 'set -ex; mkdir -p /var/cache/distfiles; $(foreach URL,$(GCC_URL) $(NEWLIB_URL) $(BINUTILS_URL), \ + sudo bash -c 'set -ex; mkdir -p /var/cache/distfiles; $(foreach URL,$(NEWLIB_URL), \ if ! test -f /var/cache/distfiles/$(notdir $(URL)); then wget -O /var/cache/distfiles/$(notdir $(URL)).part $(URL); \ - mv /var/cache/distfiles/$(notdir $(URL)).part /var/cache/distfiles/$(notdir $(URL)); fi;)' + mv /var/cache/distfiles/$(notdir $(URL)).part /var/cache/distfiles/$(notdir $(URL)); fi;) \ + $(foreach REPO,riscv-gnu-toolchain riscv-binutils-gdb riscv-dejagnu riscv-gcc riscv-glibc, \ + if ! test -d /var/cache/distfiles/$(REPO).git; then rm -rf /var/cache/distfiles/$(REPO).git.part; \ + git clone --bare https://github.com/riscv/$(REPO) /var/cache/distfiles/$(REPO).git.part; \ + mv /var/cache/distfiles/$(REPO).git.part /var/cache/distfiles/$(REPO).git; else \ + (cd /var/cache/distfiles/$(REPO).git; git fetch https://github.com/riscv/$(REPO)); fi;)' define build_tools_template build-$(1)-tools: @@ -88,11 +92,19 @@ build-$(1)-tools: $(MAKE) build-$(1)-tools-bh build-$(1)-tools-bh: - set -ex; if ! test -d riscv-gnu-toolchain-$(1); then git clone https://github.com/riscv/riscv-gnu-toolchain riscv-gnu-toolchain-$(1); \ - else cd riscv-gnu-toolchain-$(1); git checkout master; git pull; fi - set -ex; cd riscv-gnu-toolchain-$(1); rm -rf build; git checkout $(RISCV_GNU_TOOLCHAIN_REV); mkdir -p build - set -ex; cd riscv-gnu-toolchain-$(1)/build; ../configure --with-arch=$(2) --prefix=/opt/$(1) - +set -ex; cd riscv-gnu-toolchain-$(1)/build; make + +set -ex; \ + if [ -d /var/cache/distfiles/riscv-gnu-toolchain.git ]; then reference_riscv_gnu_toolchain="--reference /var/cache/distfiles/riscv-gnu-toolchain.git"; else reference_riscv_gnu_toolchain=""; fi; \ + if [ -d /var/cache/distfiles/riscv-binutils-gdb.git ]; then reference_riscv_binutils_gdb="--reference /var/cache/distfiles/riscv-binutils-gdb.git"; else reference_riscv_binutils_gdb=""; fi; \ + if [ -d /var/cache/distfiles/riscv-dejagnu.git ]; then reference_riscv_dejagnu="--reference /var/cache/distfiles/riscv-dejagnu.git"; else reference_riscv_dejagnu=""; fi; \ + if [ -d /var/cache/distfiles/riscv-gcc.git ]; then reference_riscv_gcc="--reference /var/cache/distfiles/riscv-gcc.git"; else reference_riscv_gcc=""; fi; \ + if [ -d /var/cache/distfiles/riscv-glibc.git ]; then reference_riscv_glibc="--reference /var/cache/distfiles/riscv-glibc.git"; else reference_riscv_glibc=""; fi; \ + rm -rf riscv-gnu-toolchain-$(1); git clone $$$$reference_riscv_gnu_toolchain https://github.com/riscv/riscv-gnu-toolchain riscv-gnu-toolchain-$(1); \ + cd riscv-gnu-toolchain-$(1); git checkout $(RISCV_GNU_TOOLCHAIN_REV); \ + git submodule update --init $$$$reference_riscv_binutils_gdb riscv-binutils-gdb; \ + git submodule update --init $$$$reference_riscv_dejagnu riscv-dejagnu; \ + git submodule update --init $$$$reference_riscv_gcc riscv-gcc; \ + git submodule update --init $$$$reference_riscv_glibc riscv-glibc; \ + mkdir build; cd build; ../configure --with-arch=$(2) --prefix=/opt/$(1); make .PHONY: build-$(1)-tools endef diff --git a/README.md b/README.md index 9260acf..49d68bb 100644 --- a/README.md +++ b/README.md @@ -583,14 +583,15 @@ pure RV32I target, and install it in `/opt/riscv32i`: # Ubuntu packages needed: sudo apt-get install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev \ - libgmp-dev gawk build-essential bison flex texinfo gperf + libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc sudo mkdir /opt/riscv32i sudo chown $USER /opt/riscv32i git clone https://github.com/riscv/riscv-gnu-toolchain riscv-gnu-toolchain-rv32i cd riscv-gnu-toolchain-rv32i - git checkout 13f52d2 + git checkout 7e48594 + git submodule update --init --recursive mkdir build; cd build ../configure --with-arch=RV32I --prefix=/opt/riscv32i @@ -616,7 +617,7 @@ By default calling any of those make targets will (re-)download the toolchain sources. Run `make download-tools` to download the sources to `/var/cache/distfiles/` once in advance. -*Note: This instructions are for git rev 13f52d2 (2016-05-31) of riscv-gnu-toolchain.* +*Note: This instructions are for git rev 7e48594 (2016-08-16) of riscv-gnu-toolchain.* Evaluation: Timing and Utilization on Xilinx 7-Series FPGAs