mirror of https://github.com/xemu-project/xemu.git
tests/docker: Add debian-nios2-cross image
Build the entire cross tool chain from source. For this reason, default to caching. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> [AJB: honour NOUSER in cached fetch and build, update MAINTAINERS] Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20211014224435.2539547-6-richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Willian Rampazzo <willianr@redhat.com> Message-Id: <20211026102234.3961636-6-alex.bennee@linaro.org>
This commit is contained in:
parent
b1fd92137e
commit
2eb4461ad5
|
@ -250,6 +250,7 @@ F: target/nios2/
|
||||||
F: hw/nios2/
|
F: hw/nios2/
|
||||||
F: disas/nios2.c
|
F: disas/nios2.c
|
||||||
F: configs/devices/nios2-softmmu/default.mak
|
F: configs/devices/nios2-softmmu/default.mak
|
||||||
|
F: tests/docker/dockerfiles/debian-nios2-cross.d/build-toolchain.sh
|
||||||
|
|
||||||
OpenRISC TCG CPUs
|
OpenRISC TCG CPUs
|
||||||
M: Stafford Horne <shorne@gmail.com>
|
M: Stafford Horne <shorne@gmail.com>
|
||||||
|
|
|
@ -171,10 +171,34 @@ docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cross.dock
|
||||||
qemu/debian-hexagon-cross --add-current-user, \
|
qemu/debian-hexagon-cross --add-current-user, \
|
||||||
"PREPARE", "debian-hexagon-cross"))
|
"PREPARE", "debian-hexagon-cross"))
|
||||||
|
|
||||||
|
debian-toolchain-run = \
|
||||||
|
$(if $(NOCACHE), \
|
||||||
|
$(call quiet-command, \
|
||||||
|
$(DOCKER_SCRIPT) build -t qemu/$1 -f $< \
|
||||||
|
$(if $V,,--quiet) --no-cache \
|
||||||
|
--registry $(DOCKER_REGISTRY) --extra-files \
|
||||||
|
$(DOCKER_FILES_DIR)/$1.d/build-toolchain.sh, \
|
||||||
|
"BUILD", $1), \
|
||||||
|
$(call quiet-command, \
|
||||||
|
$(DOCKER_SCRIPT) fetch $(if $V,,--quiet) \
|
||||||
|
qemu/$1 $(DOCKER_REGISTRY), \
|
||||||
|
"FETCH", $1) \
|
||||||
|
$(call quiet-command, \
|
||||||
|
$(DOCKER_SCRIPT) update $(if $V,,--quiet) \
|
||||||
|
qemu/$1 \
|
||||||
|
$(if $(NOUSER),,--add-current-user) \
|
||||||
|
"PREPARE", $1))
|
||||||
|
debian-toolchain = $(call debian-toolchain-run,$(patsubst docker-image-%,%,$1))
|
||||||
|
|
||||||
|
docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \
|
||||||
|
$(DOCKER_FILES_DIR)/debian-nios2-cross.d/build-toolchain.sh
|
||||||
|
$(call debian-toolchain, $@)
|
||||||
|
|
||||||
# Specialist build images, sometimes very limited tools
|
# Specialist build images, sometimes very limited tools
|
||||||
docker-image-debian-tricore-cross: docker-image-debian10
|
docker-image-debian-tricore-cross: docker-image-debian10
|
||||||
docker-image-debian-all-test-cross: docker-image-debian10
|
docker-image-debian-all-test-cross: docker-image-debian10
|
||||||
docker-image-debian-arm64-test-cross: docker-image-debian11
|
docker-image-debian-arm64-test-cross: docker-image-debian11
|
||||||
|
docker-image-debian-nios2-cross: docker-image-debian10
|
||||||
docker-image-debian-powerpc-test-cross: docker-image-debian11
|
docker-image-debian-powerpc-test-cross: docker-image-debian11
|
||||||
|
|
||||||
# These images may be good enough for building tests but not for test builds
|
# These images may be good enough for building tests but not for test builds
|
||||||
|
@ -183,6 +207,7 @@ DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross
|
DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-hppa-cross
|
DOCKER_PARTIAL_IMAGES += debian-hppa-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
|
DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
|
||||||
|
DOCKER_PARTIAL_IMAGES += debian-nios2-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross
|
DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-tricore-cross
|
DOCKER_PARTIAL_IMAGES += debian-tricore-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
|
DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
|
||||||
|
|
|
@ -0,0 +1,87 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
TARGET=nios2-linux-gnu
|
||||||
|
LINUX_ARCH=nios2
|
||||||
|
|
||||||
|
J=$(expr $(nproc) / 2)
|
||||||
|
TOOLCHAIN_INSTALL=/usr/local
|
||||||
|
TOOLCHAIN_BIN=${TOOLCHAIN_INSTALL}/bin
|
||||||
|
CROSS_SYSROOT=${TOOLCHAIN_INSTALL}/$TARGET/sys-root
|
||||||
|
|
||||||
|
export PATH=${TOOLCHAIN_BIN}:$PATH
|
||||||
|
|
||||||
|
#
|
||||||
|
# Grab all of the source for the toolchain bootstrap.
|
||||||
|
#
|
||||||
|
|
||||||
|
wget https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz
|
||||||
|
wget https://ftp.gnu.org/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz
|
||||||
|
wget https://ftp.gnu.org/gnu/glibc/glibc-2.34.tar.xz
|
||||||
|
wget https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.70.tar.xz
|
||||||
|
|
||||||
|
tar axf binutils-2.37.tar.xz
|
||||||
|
tar axf gcc-11.2.0.tar.xz
|
||||||
|
tar axf glibc-2.34.tar.xz
|
||||||
|
tar axf linux-5.10.70.tar.xz
|
||||||
|
|
||||||
|
mv binutils-2.37 src-binu
|
||||||
|
mv gcc-11.2.0 src-gcc
|
||||||
|
mv glibc-2.34 src-glibc
|
||||||
|
mv linux-5.10.70 src-linux
|
||||||
|
|
||||||
|
mkdir -p bld-hdr bld-binu bld-gcc bld-glibc
|
||||||
|
mkdir -p ${CROSS_SYSROOT}/usr/include
|
||||||
|
|
||||||
|
#
|
||||||
|
# Install kernel and glibc headers
|
||||||
|
#
|
||||||
|
|
||||||
|
cd src-linux
|
||||||
|
make headers_install ARCH=${LINUX_ARCH} INSTALL_HDR_PATH=${CROSS_SYSROOT}/usr
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
cd bld-hdr
|
||||||
|
../src-glibc/configure --prefix=/usr --host=${TARGET}
|
||||||
|
make install-headers DESTDIR=${CROSS_SYSROOT}
|
||||||
|
touch ${CROSS_SYSROOT}/usr/include/gnu/stubs.h
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
#
|
||||||
|
# Build binutils
|
||||||
|
#
|
||||||
|
|
||||||
|
cd bld-binu
|
||||||
|
../src-binu/configure --disable-werror \
|
||||||
|
--prefix=${TOOLCHAIN_INSTALL} --with-sysroot --target=${TARGET}
|
||||||
|
make -j${J}
|
||||||
|
make install
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
#
|
||||||
|
# Build gcc, without shared libraries, because we do not yet
|
||||||
|
# have a shared libc against which to link.
|
||||||
|
#
|
||||||
|
|
||||||
|
cd bld-gcc
|
||||||
|
../src-gcc/configure --disable-werror --disable-shared \
|
||||||
|
--prefix=${TOOLCHAIN_INSTALL} --with-sysroot --target=${TARGET} \
|
||||||
|
--enable-languages=c --disable-libssp --disable-libsanitizer \
|
||||||
|
--disable-libatomic --disable-libgomp --disable-libquadmath
|
||||||
|
make -j${J}
|
||||||
|
make install
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
#
|
||||||
|
# Build glibc
|
||||||
|
# There are a few random things that use c++ but we didn't build that
|
||||||
|
# cross-compiler. We can get away without them. Disable CXX so that
|
||||||
|
# glibc doesn't try to use the host c++ compiler.
|
||||||
|
#
|
||||||
|
|
||||||
|
cd bld-glibc
|
||||||
|
CXX=false ../src-glibc/configure --prefix=/usr --host=${TARGET}
|
||||||
|
make -j${j}
|
||||||
|
make install DESTDIR=${CROSS_SYSROOT}
|
||||||
|
cd ..
|
|
@ -0,0 +1,36 @@
|
||||||
|
#
|
||||||
|
# Docker toolchain cross-compiler
|
||||||
|
#
|
||||||
|
# This dockerfile is used for building a cross-compiler toolchain.
|
||||||
|
# The script for building the toolchain is supplied via extra-files.
|
||||||
|
#
|
||||||
|
FROM qemu/debian10
|
||||||
|
|
||||||
|
# Install build utilities for building gcc and glibc.
|
||||||
|
# ??? The build-dep isn't working, missing a number of
|
||||||
|
# minimal build dependiencies, e.g. libmpc.
|
||||||
|
|
||||||
|
RUN apt update && \
|
||||||
|
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
|
||||||
|
DEBIAN_FRONTEND=noninteractive eatmydata \
|
||||||
|
apt install -y --no-install-recommends \
|
||||||
|
bison \
|
||||||
|
flex \
|
||||||
|
gawk \
|
||||||
|
libmpc-dev \
|
||||||
|
libmpfr-dev \
|
||||||
|
rsync \
|
||||||
|
texinfo \
|
||||||
|
wget && \
|
||||||
|
DEBIAN_FRONTEND=noninteractive eatmydata \
|
||||||
|
apt build-dep -yy --arch-only gcc glibc
|
||||||
|
|
||||||
|
ADD build-toolchain.sh /root/build-toolchain.sh
|
||||||
|
|
||||||
|
RUN cd /root && ./build-toolchain.sh
|
||||||
|
|
||||||
|
# Throw away the extra toolchain build deps, the downloaded source,
|
||||||
|
# and the build trees by restoring the original debian10 image,
|
||||||
|
# then copying the built toolchain from stage 0.
|
||||||
|
FROM qemu/debian10
|
||||||
|
COPY --from=0 /usr/local /usr/local
|
Loading…
Reference in New Issue