gdb: Remove old milestones

Now that the oldest supported version of gdb is 7.11.1 we can make some
parts of the build unconditional and remove the associated config vars.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
Chris Packham 2021-09-21 21:09:16 +12:00
parent 02d1503f67
commit 9703e669d0
5 changed files with 19 additions and 39 deletions

View File

@ -5,17 +5,6 @@
source "config/debug/gdb.in.cross"
source "config/debug/gdb.in.native"
config GDB_HAS_PKGVERSION_BUGURL
bool
default y if GDB_7_0_or_later
config GDB_HAS_PYTHON
bool
default y if GDB_7_0_or_later
config GDB_INSTALL_GDBINIT
bool
default y if GDB_7_0_or_later
# GDB 8.0 now requires C++ for build. GDB 7.12 offered a configure
# switch to fall back to C. We want to use that option because
@ -32,10 +21,6 @@ config GDB_DEP_CXX11
depends on !CONFIGURE_has_cxx11
select GDB_REQUIRE_older_than_8_0
config GDB_HAS_IPA_LIB
def_bool y
depends on GDB_7_2_or_later
# Does GDB need ps_get_thread_area with const qualifier?
config GDB_CONST_GET_THREAD_AREA
bool

View File

@ -37,7 +37,6 @@ config GDB_CROSS_SIM
config GDB_CROSS_PYTHON
bool
prompt "Enable python scripting"
depends on GDB_HAS_PYTHON
depends on !GDB_CROSS_STATIC
default y if !CROSS_NATIVE && !CANADIAN
help

View File

@ -30,7 +30,7 @@ config GDB_NATIVE_BUILD_IPA_LIB
bool
prompt "Build the IPA library"
depends on LIBC_GLIBC
depends on GDB_HAS_IPA_LIB && !GDB_NATIVE_STATIC
depends on !GDB_NATIVE_STATIC
help
gdbserver >= 7.2 comes with an optional library to use tracepoints,
the In Process Agent (IPA) library, libinproctrace.so. This library

View File

@ -2,5 +2,5 @@ origin='GNU'
repository='git git://sourceware.org/git/binutils-gdb.git'
mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)'
relevantpattern='*.*|[a-z.]'
milestones='7.0 7.2 7.12 8.0 8.3 10.2 11.1'
milestones='7.11 7.12 8.0 8.3 10.2 11.1'
archive_formats='.tar.xz .tar.gz'

View File

@ -85,23 +85,21 @@ do_debug_gdb_build()
CT_DoExecLog ALL make install-{pdf,html}-gdb
fi
if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then
CT_DoLog EXTRA "Installing '.gdbinit' template"
# See in scripts/build/internals.sh for why we do this
# TBD GCC 3.x and older not supported
if [ -f "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ]; then
gcc_version=$(cat "${CT_SRC_DIR}/gcc/gcc/BASE-VER")
else
gcc_version=$(sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \
"${CT_SRC_DIR}/gcc/gcc/version.c" \
)
fi
sed -r \
-e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;" \
-e "s:@@VERSION@@:${gcc_version}:;" \
"${CT_LIB_DIR}/scripts/build/debug/gdbinit.in" \
>"${CT_PREFIX_DIR}/share/gdb/gdbinit"
fi # Install gdbinit sample
CT_DoLog EXTRA "Installing '.gdbinit' template"
# See in scripts/build/internals.sh for why we do this
# TBD GCC 3.x and older not supported
if [ -f "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ]; then
gcc_version=$(cat "${CT_SRC_DIR}/gcc/gcc/BASE-VER")
else
gcc_version=$(sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \
"${CT_SRC_DIR}/gcc/gcc/version.c" \
)
fi
sed -r \
-e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;" \
-e "s:@@VERSION@@:${gcc_version}:;" \
"${CT_LIB_DIR}/scripts/build/debug/gdbinit.in" \
>"${CT_PREFIX_DIR}/share/gdb/gdbinit"
CT_Popd
CT_EndStep
@ -271,10 +269,8 @@ do_gdb_backend()
CT_DoExecLog ALL cp gdb/proc_service.h gdb/gdbserver/proc_service.h
fi
if [ "${CT_GDB_HAS_PKGVERSION_BUGURL}" = "y" ]; then
[ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
fi
[ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
# Disable binutils options when building from the binutils-gdb repo.
extra_config+=("--disable-binutils")