From 6e037acecaa86e4f73d9324f46c50578ed3228cb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 6 Aug 2016 12:31:25 +0100 Subject: [PATCH] Cross-compile GCC into stage3 chroot. --- .gitignore | 7 +- Makefile | 109 +++++++++++++++++++++++++++++--- fixed-gcc/README | 7 ++ fixed-gcc/riscv64-unknown-linux-gnu-c++ | 1 + fixed-gcc/riscv64-unknown-linux-gnu-cc | 1 + fixed-gcc/riscv64-unknown-linux-gnu-g++ | 1 + fixed-gcc/riscv64-unknown-linux-gnu-gcc | 1 + 7 files changed, 117 insertions(+), 10 deletions(-) create mode 100644 fixed-gcc/README create mode 100755 fixed-gcc/riscv64-unknown-linux-gnu-c++ create mode 100755 fixed-gcc/riscv64-unknown-linux-gnu-cc create mode 100755 fixed-gcc/riscv64-unknown-linux-gnu-g++ create mode 100755 fixed-gcc/riscv64-unknown-linux-gnu-gcc diff --git a/.gitignore b/.gitignore index 3096b55..81d9416 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *~ *.tar.gz +*.tar.lz *.tar.xz stamp-* @@ -15,4 +16,8 @@ stamp-* /stage3-disk.img.xz /bash-4.3/ -/coreutils-8.25/ \ No newline at end of file +/coreutils-8.25/ +/gmp-6.1.1/ +/mpc-1.0.3/ +/mpfr-3.1.4/ +/riscv-gcc-riscv-gcc-6.1.0/ diff --git a/Makefile b/Makefile index 74e91a0..eceb9ae 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ # Refer to the README file to understand how Fedora on RISC-V is # bootstrapped. +# Absolute path to the current directory. +ROOT := $(shell pwd) + # Note these are chosen very specifically to ensure the different # versions work together. Don't blindly update to the latest # versions. See also: @@ -38,6 +41,10 @@ STAGE3_PACKAGES = gcc rpm-build # Versions of cross-compiled packages. BASH_VERSION = 4.3 COREUTILS_VERSION = 8.25 +GMP_VERSION = 6.1.1 +MPFR_VERSION = 3.1.4 +MPC_VERSION = 1.0.3 +GCC_X_VERSION = 6.1.0 all: stage1 stage2 stage3 stage4 @@ -239,6 +246,10 @@ stage3: stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \ stage3-chroot/lib64/libc.so.6 \ stage3-chroot/bin/bash \ stage3-chroot/bin/ls \ + stage3-chroot/usr/lib64/libgmp.so.10 \ + stage3-chroot/usr/lib64/libmpfr.so.4 \ + stage3-chroot/usr/lib64/libmpc.so.3 \ + stage3-chroot/usr/bin/gcc \ stage3-chroot/init \ stage3-disk.img @@ -301,9 +312,11 @@ stage3-chroot/lib64/libc.so.6: stage3-chroot/bin/bash: bash-$(BASH_VERSION).tar.gz tar zxf $^ cd bash-$(BASH_VERSION) && \ - ./configure --host=riscv64-unknown-linux-gnu CFLAGS="--sysroot=/usr/sysroot" && \ - make - cp bash-$(BASH_VERSION)/bash stage3-chroot/bin/ + PATH=$(ROOT)/fixed-gcc:$$PATH \ + ./configure --host=riscv64-unknown-linux-gnu \ + --prefix=/usr --libdir=/usr/lib64 + cd bash-$(BASH_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make + cd bash-$(BASH_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot bash-$(BASH_VERSION).tar.gz: rm -f $@ $@-t @@ -319,20 +332,98 @@ stage3-chroot/bin/ls: coreutils-$(COREUTILS_VERSION).tar.xz rm -rf coreutils-$(COREUTILS_VERSION) tar Jxf $^ cd coreutils-$(COREUTILS_VERSION) && \ - ./configure --host=riscv64-unknown-linux-gnu CFLAGS="--sysroot=/usr/sysroot" - -cd coreutils-$(COREUTILS_VERSION) && make + PATH=$(ROOT)/fixed-gcc:$$PATH \ + ./configure --host=riscv64-unknown-linux-gnu \ + --prefix=/usr --libdir=/usr/lib64 + -cd coreutils-$(COREUTILS_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make cd coreutils-$(COREUTILS_VERSION)/man && \ for f in $(COREUTILS_PROGRAMS); do touch $$f.1; done - cd coreutils-$(COREUTILS_VERSION) && make - for f in $(COREUTILS_PROGRAMS); do \ - cp coreutils-$(COREUTILS_VERSION)/src/$$f stage3-chroot/bin/; \ - done + cd coreutils-$(COREUTILS_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make + cd coreutils-$(COREUTILS_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot coreutils-$(COREUTILS_VERSION).tar.xz: rm -f $@ $@-t wget -O $@-t ftp://ftp.gnu.org/gnu/coreutils/coreutils-$(COREUTILS_VERSION).tar.xz mv $@-t $@ +# Cross-compile GMP, MPFR and MPC (deps of GCC). +stage3-chroot/usr/lib64/libgmp.so.10: gmp-$(GMP_VERSION).tar.lz + rm -rf gmp-$(GMP_VERSION) + tar --lzip -xf gmp-$(GMP_VERSION).tar.lz + cd gmp-$(GMP_VERSION) && \ + PATH=$(ROOT)/fixed-gcc:$$PATH \ + ./configure --host=riscv64-unknown-linux-gnu \ + --prefix=/usr --libdir=/usr/lib64 + cd gmp-$(GMP_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make + cd gmp-$(GMP_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot + cd stage3-chroot/usr/lib && ln -s ../lib64/libgmp.so + +gmp-$(GMP_VERSION).tar.lz: + rm -f $@ $@-t + wget -O $@-t https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.lz + mv $@-t $@ + +stage3-chroot/usr/lib64/libmpfr.so.4: mpfr-$(MPFR_VERSION).tar.gz + rm -rf mpfr-$(MPFR_VERSION) + tar -zxf mpfr-$(MPFR_VERSION).tar.gz + cd mpfr-$(MPFR_VERSION) && \ + PATH=$(ROOT)/fixed-gcc:$$PATH \ + ./configure --host=riscv64-unknown-linux-gnu \ + --prefix=/usr --libdir=/usr/lib64 \ + --with-gmp=$(ROOT)/stage3-chroot/usr + cd mpfr-$(MPFR_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make + cd mpfr-$(MPFR_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot + cd stage3-chroot/usr/lib && ln -s ../lib64/libmpfr.so + +mpfr-$(MPFR_VERSION).tar.gz: + rm -f $@ $@-t + wget -O $@-t http://www.mpfr.org/mpfr-current/mpfr-$(MPFR_VERSION).tar.gz + mv $@-t $@ + +stage3-chroot/usr/lib64/libmpc.so.3: mpc-$(MPC_VERSION).tar.gz + rm -rf mpc-$(MPC_VERSION) + tar -zxf mpc-$(MPC_VERSION).tar.gz + cd mpc-$(MPC_VERSION) && \ + PATH=$(ROOT)/fixed-gcc:$$PATH \ + ./configure --host=riscv64-unknown-linux-gnu \ + --prefix=/usr --libdir=/usr/lib64 \ + --with-gmp=$(ROOT)/stage3-chroot/usr \ + --with-mpfr=$(ROOT)/stage3-chroot/usr + cd mpc-$(MPC_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make + cd mpc-$(MPC_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot + cd stage3-chroot/usr/lib && ln -s ../lib64/libmpc.so + +mpc-$(MPC_VERSION).tar.gz: + rm -f $@ $@-t + wget -O $@-t ftp://ftp.gnu.org/gnu/mpc/mpc-$(MPC_VERSION).tar.gz + mv $@-t $@ + +# Cross-compile GCC. +stage3-chroot/usr/bin/gcc: gcc-$(GCC_X_VERSION).tar.gz + rm -rf riscv-gcc-riscv-gcc-$(GCC_X_VERSION) + zcat $^ | tar xf - + mkdir riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build + cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && \ + PATH=$(ROOT)/fixed-gcc:$$PATH \ + ../configure \ + --host=riscv64-unknown-linux-gnu \ + --prefix=/usr --libdir=/usr/lib64 \ + --enable-shared \ + --enable-tls \ + --enable-languages=c,c++ \ + --disable-libmudflap \ + --disable-libssp \ + --disable-libquadmath \ + --disable-nls \ + --disable-multilib + cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && PATH=$(ROOT)/fixed-gcc:$$PATH make all-gcc + cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && make install-gcc DESTDIR=$(ROOT)/stage3-chroot + +gcc-$(GCC_X_VERSION).tar.gz: + rm -f $@ $@-t + wget -O $@-t https://github.com/riscv/riscv-gcc/archive/riscv-gcc-$(GCC_X_VERSION).tar.gz + mv $@-t $@ + # Create an /init script. stage3-chroot/init: init.sh install -m 0755 $^ $@ diff --git a/fixed-gcc/README b/fixed-gcc/README new file mode 100644 index 0000000..8f714f1 --- /dev/null +++ b/fixed-gcc/README @@ -0,0 +1,7 @@ +The versions of riscv64-unknown-linux-{gcc,g++} in the +riscv-gnu-toolchain RPM are (possibly) broken in that they require an +explicit --sysroot parameter. + +Work around that by setting $PATH to contain this directory. + +Note this should only be used when building stage3. diff --git a/fixed-gcc/riscv64-unknown-linux-gnu-c++ b/fixed-gcc/riscv64-unknown-linux-gnu-c++ new file mode 100755 index 0000000..6c44bb5 --- /dev/null +++ b/fixed-gcc/riscv64-unknown-linux-gnu-c++ @@ -0,0 +1 @@ +/usr/bin/riscv64-unknown-linux-gnu-g++ --sysroot=/home/rjones/d/fedora-riscv/stage3-chroot "$@" diff --git a/fixed-gcc/riscv64-unknown-linux-gnu-cc b/fixed-gcc/riscv64-unknown-linux-gnu-cc new file mode 100755 index 0000000..4125513 --- /dev/null +++ b/fixed-gcc/riscv64-unknown-linux-gnu-cc @@ -0,0 +1 @@ +/usr/bin/riscv64-unknown-linux-gnu-gcc --sysroot=/home/rjones/d/fedora-riscv/stage3-chroot "$@" diff --git a/fixed-gcc/riscv64-unknown-linux-gnu-g++ b/fixed-gcc/riscv64-unknown-linux-gnu-g++ new file mode 100755 index 0000000..6c44bb5 --- /dev/null +++ b/fixed-gcc/riscv64-unknown-linux-gnu-g++ @@ -0,0 +1 @@ +/usr/bin/riscv64-unknown-linux-gnu-g++ --sysroot=/home/rjones/d/fedora-riscv/stage3-chroot "$@" diff --git a/fixed-gcc/riscv64-unknown-linux-gnu-gcc b/fixed-gcc/riscv64-unknown-linux-gnu-gcc new file mode 100755 index 0000000..4125513 --- /dev/null +++ b/fixed-gcc/riscv64-unknown-linux-gnu-gcc @@ -0,0 +1 @@ +/usr/bin/riscv64-unknown-linux-gnu-gcc --sysroot=/home/rjones/d/fedora-riscv/stage3-chroot "$@" -- 1.8.3.1