enable building of GDB by default as well

30c60c93 · Dimitris Lampridis · 9adf8456 · 30c60c93
Commit 30c60c93 authored Sep 07, 2018 by Dimitris Lampridis
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 10 deletions

build-riscv.sh riscv/build-riscv.sh +19 -10

No files found.
--- a/riscv/build-riscv.sh
+++ b/riscv/build-riscv.sh
@@ -3,7 +3,7 @@ set -e

 NEWLIB_V=3.0.0
 GCC_V=7.3.0
-GDB_V=7.10.1
+GDB_V=8.2
 BINUTILS_V=2.31.1
 MPC_V=1.0.3
 MPFR_V=3.1.4
@@ -31,7 +31,7 @@ _check_and_get()
 do_download()
 {
    _check_and_get ftp://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_V}.tar.xz
-# wget ftp://ftp.gnu.org/gnu/gdb/gdb-${GDB_V}.tar.gz -nc --quiet || true
+    _check_and_get ftp://ftp.gnu.org/gnu/gdb/gdb-${GDB_V}.tar.gz
    _check_and_get ftp://ftp.gnu.org/gnu/gmp/gmp-${GMP_V}.tar.bz2
    _check_and_get ftp://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_V}.tar.bz2
    _check_and_get ftp://ftp.gnu.org/gnu/mpc/mpc-${MPC_V}.tar.gz
@@ -55,7 +55,7 @@ _check_and_extract()

 do_extract()
 {
-# tar -x -f gdb-${GDB_V}.tar.gz
+    _check_and_extract gdb-${GDB_V}.tar.gz
    _check_and_extract binutils-${BINUTILS_V}.tar.xz
    _check_and_extract gmp-${GMP_V}.tar.bz2
    _check_and_extract mpfr-${MPFR_V}.tar.bz2
@@ -72,7 +72,7 @@ do_gdb()

    pushd ${GDB_BUILD_DIR} > /dev/null

-    ${CACHE_DIR}/gdb-${GDB_V}/configure --prefix=${PREFIX} --target=lm32-elf
+    ${CACHE_DIR}/gdb-${GDB_V}/configure --prefix=${PREFIX} --target=riscv32-elf
    make -j${JOBS}
    make install

@@ -87,7 +87,11 @@ do_binutils()

    pushd ${BINUTILS_BUILD_DIR} > /dev/null

-    ${CACHE_DIR}/binutils-${BINUTILS_V}/configure --target=riscv32-elf --prefix=${PREFIX} --disable-gdb --disable-readline --disable-libdecnumber --disable-sim --disable-nls
+    ${CACHE_DIR}/binutils-${BINUTILS_V}/configure --prefix=${PREFIX} --target=riscv32-elf \
+		--disable-readline \
+		--disable-libdecnumber \
+		--disable-sim \
+		--disable-nls
    make -j${JOBS}
    make install-strip

@@ -102,9 +106,9 @@ do_gmp()

    pushd ${GMP_BUILD_DIR} > /dev/null

-    # Be very conservative about the cpu to support installation on a different
-    # host.
-    ${CACHE_DIR}/gmp-${GMP_V}/configure --prefix=${TMP_DIR} --disable-shared --host=core2-pc-linux-gnu
+    # Be very conservative about the cpu to support installation on a different host.
+    ${CACHE_DIR}/gmp-${GMP_V}/configure --prefix=${TMP_DIR} --host=core2-pc-linux-gnu \
+		--disable-shared
    make -j${JOBS}
    make check
    make install
@@ -120,7 +124,9 @@ do_mpfr()

    pushd ${MPFR_BUILD_DIR} > /dev/null

-    ${CACHE_DIR}/mpfr-${MPFR_V}/configure --prefix=${TMP_DIR} --with-gmp=${TMP_DIR} --disable-shared
+    ${CACHE_DIR}/mpfr-${MPFR_V}/configure --prefix=${TMP_DIR} \
+		--with-gmp=${TMP_DIR} \
+		--disable-shared
    make -j${JOBS}
    make check
    make install
@@ -136,7 +142,9 @@ do_mpc()

    pushd ${MPC_BUILD_DIR} > /dev/null

-    ${CACHE_DIR}/mpc-${MPC_V}/configure --prefix=${TMP_DIR} --with-gmp=${TMP_DIR} --disable-shared
+    ${CACHE_DIR}/mpc-${MPC_V}/configure --prefix=${TMP_DIR} \
+		--with-gmp=${TMP_DIR} \
+		--disable-shared
    make -j${JOBS}
    make check
    make install
@@ -190,6 +198,7 @@ do_all()
 {
    do_download
    do_extract
+    do_gdb
    do_binutils
    do_gmp
    do_mpfr