gdb with python support integration

This commits enables gdb's python support. In order to make it work, we
had to create a python fork with some patches to the buildsystem, and
also had to patch gdb as well.

Dockerfile

@@ -2,17 +2,29 @@ FROM ubuntu:24.04
 
 # Install dependencies
 RUN apt update && apt install -y \
+    bison \
+    file \
+    flex \
     g++ \
     g++-aarch64-linux-gnu \
     g++-arm-linux-gnueabi \
+    g++-mips-linux-gnu \
+    g++-mipsel-linux-gnu \
     g++-powerpc-linux-gnu \
     gcc \
     gcc-aarch64-linux-gnu \
     gcc-arm-linux-gnueabi \
+    gcc-mips-linux-gnu \
+    gcc-mipsel-linux-gnu \
     gcc-powerpc-linux-gnu \
+    git \
+    libncurses-dev \
     m4  \
     make \
     patch \
+    pkg-config \
+    python3.12 \
+    libpython3-dev \
     texinfo \
     wget \
     xz-utils

Makefile

@@ -1,8 +1,8 @@
-ARCHS := x86_64 arm aarch64 powerpc
+ARCHS := x86_64 arm aarch64 powerpc mips mipsel
 TARGETS := $(addprefix build-, $(ARCHS))
 PACK_TARGETS := $(addprefix pack-, $(ARCHS))
 
-.PHONY: clean help download_packages build patch-gdb build-docker-image $(TARGETS) $(PACK_TARGETS)
+.PHONY: clean help download_packages build build-docker-image $(TARGETS) $(PACK_TARGETS)
 
 help:
 	@echo "Usage:"
@@ -32,21 +32,13 @@ build/download-packages.stamp: build/build-docker-image.stamp src/download_packa
 
 download-packages: build/download-packages.stamp
 
-build/patch-gdb.stamp: build/build-docker-image.stamp src/gdb_static.patch build/download-packages.stamp
-	docker run --user $(shell id -u):$(shell id -g) \
-		--rm --volume .:/app/gdb gdb-static env TERM=xterm-256color \
-		/app/gdb/src/patch_gdb.sh /app/gdb/build/packages/gdb /app/gdb/src/gdb_static.patch
-	touch build/patch-gdb.stamp
-
-patch-gdb: build/patch-gdb.stamp
-
 build: $(TARGETS)
 
-$(TARGETS): build-%: download-packages patch-gdb build-docker-image
+$(TARGETS): build-%: download-packages build-docker-image
 	mkdir -p build
 	docker run --user $(shell id -u):$(shell id -g) \
 		--rm --volume .:/app/gdb gdb-static env TERM=xterm-256color \
-		/app/gdb/src/build.sh $* /app/gdb/build/ /app/gdb/src/gdb_static.patch
+		/app/gdb/src/build.sh $* /app/gdb/build/ /app/gdb/src
 
 pack: $(PACK_TARGETS)
 

README.md

@@ -1,8 +1,12 @@
 # Repository of static gdb and gdbserver
 
-The statically compiled gdb / gdbserver binaries are avaliable to download under github releases! 
+## **The statically compiled gdb / gdbserver binaries are avaliable to download under github releases!**
 
-# Compiling gdb using docker
+link: [gdb-static github releases](https://github.com/guyush1/gdb-static/releases)
+
+## For manual gdb/gdbserver compilation instructions, have a look at the compilation.md file
+
+## Compiling gdb using docker
 
 This repository contains a dockerfile and build scripts to compile gdb and gdbserver statically for multiple architectures.
 Currently, the supported architectures are:
@@ -14,7 +18,7 @@ You can easily expand it to support more architectures by adding the appropriate
 
 NOTE: You don't need to interact with the dockerfile directly, as the Makefile will take care of everything for you.
 
-## Building for a specific architecture
+### Building for a specific architecture
 
 To build for a specific architecture, you can use the following command:
 ```bash
@@ -35,108 +39,16 @@ build/
             ...
 ```
 
-## Building for all architectures
+### Building for all architectures
 
 To build for all architectures, you can use the following command:
 ```bash
 make build
 ```
 
-## Cleaning the build
+### Cleaning the build
 
 To clean the build, you can use the following command:
 ```bash
 make clean
 ```
-
-# Notes about this file - read before proceeding!
-
-While i already provided the gdb/gdbserver-15 statically compiled binaries handed out to you, some people might want to compile it to a different architecture, or compile a newer version of gdb in the future :). This rest of the file contains my compilation documentation so that you could save yourself some time and do it yourself, if you wish.
-
-## <VARAIBLES> in the script
-
-When specifying the compilation dir throughout the compilation process (specified as <COMPILATION_DIR_PATH> in this file), DO NOT use relative pathing, or bash characters such as `~`. They will not get parsed correctly! Instead, use absolute paths only.
-
-Examples to the <VARIABLES> throughout the script:
-<CROSS_COMPILER_C> - arm-linux-gnueabi-gcc
-<CROSS_COMPILER_CPP> - arm-linux-gnueabi-g++
-<HOST_NAME> - arm-linux-gnueabi
-<COMPILATION_DIR_PATH> - /home/username/projects/libgmp-x.y.z/build-arm/
-
-Environment info:
-- glibc version: 2.39-0ubuntu8.3 (NOTE: When i compiled gdb-15 using an older glibc, such as the one i had in my ubuntu-20.04 machine, i received a segfault in gdb...).
-
-# Compiling gdb statically to the host platform
-
-## 1) Compiling iconv
-
-While compiling iconv is not a must, the libc-provided iconv (a utility to convert between encodings) may fail on different architectures,
-at least in my experiance. Thus, I recommended using a custom libiconv and compiling it into gdb.
-
-Download the source from https://github.com/roboticslibrary/libiconv.git
-Make sure to check out to a stable tag (in my case - v1.17).
-
-Work according to the following steps:
-I) run `./gitsub.sh pull`
-II) run `./autogen.sh` to create the configure script from configure.sh.
-III) create a build dir (e.g build), and then cd into it.
-IV) run `../configure --enable-static`
-V) run `cp -r ./include ./lib/.libs/`
-VI) run `mkdir ./lib/.libs/lib/`
-VII) run `cp ./lib/.libs/libiconv.a ./lib/.libs/lib/`
-
-## 2) Compiling gdb
-
-Clone gdb from sourceware - https://sourceware.org/git/binutils-gdb.git.
-I checked out to the 15.2 tag.
-
-Work according to the following steps:
-I) Apply my patches (gdb_static.patch). If you are not on the exact tag i used (15.2) - you might need to apply them manually, and change some stuff.
-II) create a build dir.
-III) run `../configure --enable-static --with-static-standard-libraries --disable-tui --disable-inprocess-agent --with-libiconv-prefix=<COMPILATION_DIR_PATH>/lib/.libs/ --with-libiconv-type=static`
-IV) run `make all-gdb -j$(nproc)` - for gdbserver, run `make all-gdbserver -j$(nproc)`.
-
-gdb will sit under gdb/gdb.
-gdbserver will sit under gdbserver/gdbserver.
-
-# Cross compiling gdb statically to other architectures.
-
-Cross compiling gdb statically is a bit more complicated then regular static compilation. In order to cross compile gdb statically, we will need to compile libgmp and libmpfr as well as iconv.
-
-## 1) Compiling iconv
-
-Work according to the same process as described under the compilation to the host platform, aside from the configure script:
-IV) run `../configure --enable-static CC=<CROSS_COMPILER_C> CXX=<CROSS_COMPILER_CPP> --host=<HOST_NAME>`
-
-## 2) Compiling libgmp
-
-Download and extract the latest edition from https://gmplib.org/.
-I used the 6.3.0 edition.
-
-Work according to the following steps:
-I) Create a build dir and cd into it.
-II) run `../configure CC=<CROSS_COMPILER_C> CXX=<CROSS_COMPILER_CPP> --enable-static --host=<HOST_NAME>`
-III) run `make -j$(nproc)`
-IV) run `mkdir ./.libs/include/`
-V) run `cp gmp.h ./.libs/include/`
-VI) run `mkdir ./.libs/lib`
-VII) run `cp ./.libs/libgmp.a ./.libs/lib`
-
-## 3) Compiling libmpfr
-
-Download and extract the latest edition from https://www.mpfr.org/.
-I used the 4.2.1 edition.
-
-Work according to the following steps:
-I) Create a build dir and cd into it.
-II) run `../configure CC=<CROSS_COMPILER_C> CXX=<CROSS_COMPILER_CPP> --enable-static --with-gmp-build=<COMPILATION_DIR_PATH> --host=<HOST_NAME>`
-III) run `make -j$(nproc)`
-IV) run `mkdir ./src/.libs/lib`
-V) run `cp ./src/.libs/libmpfr.a ./src/.libs/lib`
-VI) run `mkdir ./src/.libs/include`
-VII) run `cp ../src/mpfr.h ./src/.libs/include/`
-
-## 4) Compiling gdb
-
-Work according to the same process as described under the compilation to the host platform, aside from the configure script:
-III) run `../configure --enable-static --with-static-standard-libraries --disable-tui --disable-inprocess-agent --with-libiconv-prefix=<COMPILATION_DIR_PATH>/lib/.libs/ --with-libiconv-type=static --with-gmp=<COMPILATION_DIR_PATH>/.libs/ --with-mpfr=<COMPILATION_DIR_PATH>/src/.libs/ CC=<CROSS_COMPILER_C> CXX=<CROSS_COMPILER_CPP> --host=<HOST_NAME>`

compilation.md

@@ -0,0 +1,91 @@
+# Notes about this file - read before proceeding!
+
+While i have already provided the gdb/gdbserver-15 statically compiled binaries for you, some people might want to compile it to a different architecture (without our build scripts), or compile a newer version of gdb in the future :). The rest of the file contains a documentation of the compilation process, in order to help you out.
+
+## <VARAIBLES> in the script
+
+When specifying the compilation dir throughout the compilation process (specified as <COMPILATION_DIR_PATH> in this file), DO NOT use relative pathing, or bash characters such as `~`. They will not get parsed correctly! Instead, use absolute paths only.
+
+Examples to the <VARIABLES> throughout the script:
+<CROSS_COMPILER_C> - arm-linux-gnueabi-gcc
+<CROSS_COMPILER_CPP> - arm-linux-gnueabi-g++
+<HOST_NAME> - arm-linux-gnueabi
+<COMPILATION_DIR_PATH> - /home/username/projects/libgmp-x.y.z/build-arm/
+
+Environment info:
+- glibc version: 2.39-0ubuntu8.3 (NOTE: When i compiled gdb-15 using an older glibc, such as the one i had in my ubuntu-20.04 machine, i received a segfault in gdb...).
+
+# Compiling gdb statically to the host platform
+
+## 1) Compiling iconv
+
+While compiling iconv is not a must, the libc-provided iconv (a utility to convert between encodings) may fail on different architectures,
+at least in my experiance. Thus, I recommended using a custom libiconv and compiling it into gdb.
+
+Download the source from https://github.com/roboticslibrary/libiconv.git
+Make sure to check out to a stable tag (in my case - v1.17).
+
+Work according to the following steps:
+I) run `./gitsub.sh pull`
+II) run `./autogen.sh` to create the configure script from configure.sh.
+III) create a build dir (e.g build), and then cd into it.
+IV) run `../configure --enable-static`
+V) run `cp -r ./include ./lib/.libs/`
+VI) run `mkdir ./lib/.libs/lib/`
+VII) run `cp ./lib/.libs/libiconv.a ./lib/.libs/lib/`
+
+## 2) Compiling gdb
+
+Clone gdb from sourceware - https://sourceware.org/git/binutils-gdb.git.
+I checked out to the 15.2 tag.
+
+Work according to the following steps:
+I) Apply my patches (gdb_static.patch). If you are not on the exact tag i used (15.2) - you might need to apply them manually, and change some stuff.
+II) create a build dir.
+III) run `../configure --enable-static --with-static-standard-libraries --disable-tui --disable-inprocess-agent --with-libiconv-prefix=<COMPILATION_DIR_PATH>/lib/.libs/ --with-libiconv-type=static`
+IV) run `make all-gdb -j$(nproc)` - for gdbserver, run `make all-gdbserver -j$(nproc)`.
+
+gdb will sit under gdb/gdb.
+gdbserver will sit under gdbserver/gdbserver.
+
+# Cross compiling gdb statically to other architectures.
+
+Cross compiling gdb statically is a bit more complicated then regular static compilation. In order to cross compile gdb statically, we will need to compile libgmp and libmpfr as well as iconv.
+
+## 1) Compiling iconv
+
+Work according to the same process as described under the compilation to the host platform, aside from the configure script:
+IV) run `../configure --enable-static CC=<CROSS_COMPILER_C> CXX=<CROSS_COMPILER_CPP> --host=<HOST_NAME>`
+
+## 2) Compiling libgmp
+
+Download and extract the latest edition from https://gmplib.org/.
+I used the 6.3.0 edition.
+
+Work according to the following steps:
+I) Create a build dir and cd into it.
+II) run `../configure CC=<CROSS_COMPILER_C> CXX=<CROSS_COMPILER_CPP> --enable-static --host=<HOST_NAME>`
+III) run `make -j$(nproc)`
+IV) run `mkdir ./.libs/include/`
+V) run `cp gmp.h ./.libs/include/`
+VI) run `mkdir ./.libs/lib`
+VII) run `cp ./.libs/libgmp.a ./.libs/lib`
+
+## 3) Compiling libmpfr
+
+Download and extract the latest edition from https://www.mpfr.org/.
+I used the 4.2.1 edition.
+
+Work according to the following steps:
+I) Create a build dir and cd into it.
+II) run `../configure CC=<CROSS_COMPILER_C> CXX=<CROSS_COMPILER_CPP> --enable-static --with-gmp-build=<COMPILATION_DIR_PATH> --host=<HOST_NAME>`
+III) run `make -j$(nproc)`
+IV) run `mkdir ./src/.libs/lib`
+V) run `cp ./src/.libs/libmpfr.a ./src/.libs/lib`
+VI) run `mkdir ./src/.libs/include`
+VII) run `cp ../src/mpfr.h ./src/.libs/include/`
+
+## 4) Compiling gdb
+
+Work according to the same process as described under the compilation to the host platform, aside from the configure script:
+III) run `../configure --enable-static --with-static-standard-libraries --disable-tui --disable-inprocess-agent --with-libiconv-prefix=<COMPILATION_DIR_PATH>/lib/.libs/ --with-libiconv-type=static --with-gmp=<COMPILATION_DIR_PATH>/.libs/ --with-mpfr=<COMPILATION_DIR_PATH>/src/.libs/ CC=<CROSS_COMPILER_C> CXX=<CROSS_COMPILER_CPP> --host=<HOST_NAME>`

src/build.sh

@@ -2,7 +2,7 @@
 
 # Include utils library
 script_dir=$(dirname "$0")
-. "$script_dir/utils.sh"
+source "$script_dir/utils.sh"
 
 function set_compliation_variables() {
     # Set compilation variables such as which compiler to use.
@@ -13,7 +13,7 @@ function set_compliation_variables() {
     # Returns:
     # 0: success
     # 1: failure
-    supported_archs=("arm" "aarch64" "powerpc" "x86_64")
+    supported_archs=("arm" "aarch64" "powerpc" "x86_64" "mips" "mipsel")
 
     local target_arch="$1"
 
@@ -33,6 +33,12 @@ function set_compliation_variables() {
     elif [[ "$target_arch" == "powerpc" ]]; then
         CROSS=powerpc-linux-gnu-
         export HOST=powerpc-linux-gnu
+    elif [[ "$target_arch" == "mips" ]]; then
+        CROSS=mips-linux-gnu-
+        export HOST=mips-linux-gnu
+    elif [[ "$target_arch" == "mipsel" ]]; then
+        CROSS=mipsel-linux-gnu-
+        export HOST=mipsel-linux-gnu
     elif [[ "$target_arch" == "x86_64" ]]; then
         CROSS=""
         export HOST=x86_64-linux-gnu
@@ -45,6 +51,17 @@ function set_compliation_variables() {
     export CXXFLAGS="-O2"
 }
 
+function set_ncurses_link_variables() {
+    # Set up ncurses library link variables
+    #
+    # Parameters:
+    # $1: ncursesw build dir
+    local ncursesw_build_dir="$1"
+
+    # Allow tui mode by adding our custom built static ncursesw library to the linker search path.
+    export LDFLAGS="-L$ncursesw_build_dir/lib $LDFLAGS"
+}
+
 function build_iconv() {
     # Build libiconv.
     #
@@ -146,6 +163,109 @@ function build_libgmp() {
     popd > /dev/null
 }
 
+function build_ncurses() {
+    # Build libncursesw.
+    #
+    # Parameters:
+    # $1: libncursesw package directory
+    # $2: target architecture
+    #
+    # Echoes:
+    # The libncursesw build directory
+    #
+    # Returns:
+    # 0: success
+    # 1: failure
+    local ncurses_dir="$1"
+    local target_arch="$2"
+    local ncurses_build_dir="$(realpath "$ncurses_dir/build-$target_arch")"
+
+    echo "$ncurses_build_dir"
+    mkdir -p "$ncurses_build_dir"
+
+    if [[ -f "$ncurses_build_dir/lib/libncursesw.a" ]]; then
+        >&2 echo "Skipping build: libncursesw already built for $target_arch"
+        return 0
+    fi
+
+    pushd "$ncurses_build_dir" > /dev/null
+
+    >&2 fancy_title "Building libncursesw for $target_arch"
+
+    ../configure --enable-static "CC=$CC" "CXX=$CXX" "--host=$HOST" \
+        "CFLAGS=$CFLAGS" "CXXFLAGS=$CXXFLAGS" "--enable-widec" 1>&2
+    if [[ $? -ne 0 ]]; then
+        return 1
+    fi
+
+    make -j$(nproc) 1>&2
+    if [[ $? -ne 0 ]]; then
+        return 1
+    fi
+
+    >&2 fancy_title "Finished building libncursesw for $target_arch"
+
+    popd > /dev/null
+}
+
+function build_python() {
+    # Build python.
+    #
+    # Parameters:
+    # $1: python package directory
+    # $2: target architecture
+    #
+    # Echoes:
+    # The python build directory
+    #
+    # Returns:
+    # 0: success
+    # 1: failure
+    local python_dir="$1"
+    local target_arch="$2"
+    local python_lib_dir="$(realpath "$python_dir/build-$target_arch")"
+
+    echo "$python_lib_dir"
+    mkdir -p "$python_lib_dir"
+
+    # Having a python-config file is an indication that we successfully built python.
+    if [[ -f "$python_lib_dir/python-config" ]]; then
+        >&2 echo "Skipping build: libpython already built for $target_arch"
+        return 0
+    fi
+
+    pushd "$python_lib_dir" > /dev/null
+    >&2 fancy_title "Building python for $target_arch"
+
+    export LINKFORSHARED=" "
+    export MODULE_BUILDTYPE="static"
+    export CONFIG_SITE="$python_dir/config.site-static"
+    >&2 CFLAGS="-static" LDFLAGS="-static" ../configure \
+        --prefix=$(realpath .) \
+        --disable-test-modules \
+        --with-ensurepip=no \
+        --without-decimal-contextvar \
+        --build=x86_64-pc-linux-gnu \
+        --host=$HOST \
+        --with-build-python=/usr/bin/python3.12 \
+        --disable-ipv6 \
+        --disable-shared
+
+    >&2 make -j $(nproc)
+    if [[ $? -ne 0 ]]; then
+        return 1
+    fi
+
+    # Install python (in build dir using the prefix set above), in order to have a bash (for cross-compilation) python3-config that works.
+    >&2 make install
+    if [[ $? -ne 0 ]]; then
+        return 1
+    fi
+
+    >&2 fancy_title "Finished building python for $target_arch"
+    popd > /dev/null
+}
+
 function build_libmpfr() {
     # Build libmpfr.
     #
@@ -236,7 +356,8 @@ function build_gdb() {
 
     >&2 fancy_title "Building gdb for $target_arch"
 
-    ../configure --enable-static --with-static-standard-libraries --disable-tui --disable-inprocess-agent \
+    ../configure -C --enable-static --with-static-standard-libraries --disable-inprocess-agent \
+                 --enable-tui --with-python=/app/gdb/build/packages/cpython-static/build-$target_arch/bin/python3-config \
                  "--with-libiconv-prefix=$libiconv_prefix" --with-libiconv-type=static \
                  "--with-gmp=$libgmp_prefix" \
                  "--with-mpfr=$libmpfr_prefix" \
@@ -333,9 +454,11 @@ function build_gdb_with_dependencies() {
     # Parameters:
     # $1: target architecture
     # $2: build directory
+    # $3: src directory
 
     local target_arch="$1"
     local build_dir="$2"
+    local source_dir="$3"
     local packages_dir="$build_dir/packages"
     local artifacts_dir="$build_dir/artifacts"
 
@@ -361,12 +484,23 @@ function build_gdb_with_dependencies() {
         return 1
     fi
 
-    build_and_install_gdb "$packages_dir/gdb" \
-                      "$iconv_build_dir/lib/.libs/" \
-                      "$gmp_build_dir/.libs/" \
-                      "$mpfr_build_dir/src/.libs/" \
-                      "$artifacts_dir" \
-                      "$target_arch"
+    ncursesw_build_dir="$(build_ncurses "$packages_dir/ncurses" "$target_arch")"
+    if [[ $? -ne 0 ]]; then
+        return 1
+    fi
+    set_ncurses_link_variables "$ncursesw_build_dir"
+
+    python_build_dir="$(build_python "$packages_dir/cpython-static" "$target_arch")"
+    if [[ $? -ne 0 ]]; then
+        return 1
+    fi
+
+    build_and_install_gdb "$packages_dir/binutils-gdb" \
+                          "$iconv_build_dir/lib/.libs/" \
+                          "$gmp_build_dir/.libs/" \
+                          "$mpfr_build_dir/src/.libs/" \
+                          "$artifacts_dir" \
+                          "$target_arch"
     if [[ $? -ne 0 ]]; then
         return 1
     fi
@@ -374,11 +508,11 @@ function build_gdb_with_dependencies() {
 
 function main() {
     if [[ $# -ne 3 ]]; then
-        >&2 echo "Usage: $0 <target_arch> <build_dir>"
+        >&2 echo "Usage: $0 <target_arch> <build_dir> <src_dir>"
         exit 1
     fi
 
-    build_gdb_with_dependencies "$1" "$2"
+    build_gdb_with_dependencies "$1" "$2" "$3"
     if [[ $? -ne 0 ]]; then
         >&2 echo "Error: failed to build gdb with dependencies"
         exit 1

src/download_packages.sh

@@ -5,11 +5,11 @@ script_dir=$(dirname "$0")
 . "$script_dir/utils.sh"
 
 # List of package URLs to download
-PACKAGE_URLS=(
+SOURCE_URLS=(
     "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz"
     "https://ftp.gnu.org/pub/gnu/gmp/gmp-6.3.0.tar.xz"
     "https://ftp.gnu.org/pub/gnu/mpfr/mpfr-4.2.1.tar.xz"
-    "https://ftp.gnu.org/gnu/gdb/gdb-15.2.tar.xz"
+    "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.5.tar.gz"
 )
 
 function unpack_tarball() {
@@ -187,7 +187,7 @@ function download_gdb_packages() {
 
     fancy_title "Starting download of GDB packages"
 
-    for url in "${PACKAGE_URLS[@]}"; do
+    for url in "${SOURCE_URLS[@]}"; do
         package_dir=$(package_url_to_dir "$url")
         download_and_extract_package "$url" "$package_dir" &
         download_pids+=($!)
@@ -201,8 +201,15 @@ function download_gdb_packages() {
         fi
     done
 
-    fancy_title "Finished downloading GDB packages"
+    if [[ ! -d gdb-static ]]; then
+        git clone https://github.com/guyush1/binutils-gdb.git --single-branch --branch gdb-static
+    fi
 
+    if [[ ! -d python3.12-static ]]; then
+        git clone https://github.com/guyush1/cpython-static.git --single-branch --branch python3.12-static
+    fi
+
+    fancy_title "Finished downloading GDB packages"
     popd
 }
 

src/gdb_static.patch

@@ -1,70 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index f12c251f9c8..eed512b2d18 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -31593,7 +31593,7 @@ configure-readline:
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--	  --target=${target_alias}  \
-+	  --target=${target_alias} --enable-static  \
- 	  || exit 1
- @endif readline
- 
-@@ -40793,7 +40793,7 @@ configure-libcc1:
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--	  --target=${target_alias} --enable-shared \
-+	  --target=${target_alias} --enable-static --disable-shared \
- 	  || exit 1
- @endif libcc1
- 
-diff --git a/configure b/configure
-index 6466b97f3ec..2ab23dcb81e 100755
---- a/configure
-+++ b/configure
-@@ -9398,7 +9398,7 @@ case " $configdirs " in
-   *" lto-plugin "* | *" libcc1 "* | *" gdbserver "*)
-     # When these are to be built as shared libraries, the same applies to
-     # libiberty.
--    extra_host_libiberty_configure_flags=--enable-shared
-+    extra_host_libiberty_configure_flags="--enable-static --disable-shared"
-     ;;
- esac
- 
-diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 84bc54b303e..c81269ced78 100644
---- a/gdb/Makefile.in
-+++ b/gdb/Makefile.in
-@@ -148,7 +148,7 @@ LIBTOOL = @LIBTOOL@
- # Set this up with gcc if you have gnu ld and the loader will print out
- # line numbers for undefined references.
- #CC_LD = g++ -static
--CC_LD = $(LIBTOOL) $(SILENT_FLAG) --mode=link $(CXX) $(CXX_DIALECT)
-+CC_LD = $(LIBTOOL) $(SILENT_FLAG) --mode=link $(CXX) -all-static $(CXX_DIALECT)
- 
- # Where is our "include" directory?  Typically $(srcdir)/../include.
- # This is essentially the header file directory for the library
-diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
-index 6148ccf9121..2a9c9720d1a 100644
---- a/gdbserver/Makefile.in
-+++ b/gdbserver/Makefile.in
-@@ -83,7 +83,7 @@ COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(INCLUDE_SERVER_H) \
- # Set this up with gcc if you have gnu ld and the loader will print out
- # line numbers for undefinded refs.
- #CC_LD = g++ -static
--CC_LD = $(CXX) $(CXX_DIALECT)
-+CC_LD = $(CXX) -static $(CXX_DIALECT)
- 
- # Where is the "include" directory?  Traditionally ../include or ./include
- INCLUDE_DIR = ${srcdir}/../include
-@@ -405,7 +405,7 @@ IPA_LIB = libinproctrace.so
- 
- $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS}
- 	$(SILENCE) rm -f $(IPA_LIB)
--	$(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \
-+	$(ECHO_CXXLD) $(CC_LD) -static -fPIC -Wl,--soname=$(IPA_LIB) \
- 		-Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
- 		 $(CXXFLAGS) \
- 		-o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread

src/patch_gdb.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-
-# Include utils library
-script_dir=$(dirname "$0")
-. "$script_dir/utils.sh"
-
-function apply_patch() {
-    # Apply a patch to a directory.
-    #
-    # Parameters:
-    # $1: directory
-    # $2: path of patch
-    #
-    # Returns:
-    # 0: success
-    # 1: failure
-
-    local dir="$1"
-    local patch="$(realpath "$2")"
-
-    pushd "$dir" > /dev/null
-    if [[ $? -ne 0 ]]; then
-        return 1
-    fi
-
-    # Check if the patch was already applied
-    if ! patch -p1 --dry-run < "$patch" &>/dev/null; then
-        >&2 echo "Error: patch already applied"
-        popd > /dev/null
-        return 1
-    fi
-
-    patch -p1 < "$patch"
-    if [[ $? -ne 0 ]]; then
-        popd > /dev/null
-        return 1
-    fi
-
-    popd > /dev/null
-}
-
-function main() {
-    if [[ $# -ne 2 ]]; then
-        >&2 echo "Usage: $0 <gdb_dir> <gdb_patch>"
-        exit 1
-    fi
-
-    fancy_title "Applying GDB patch"
-    apply_patch "$1" "$2"
-    if [[ $? -ne 0 ]]; then
-        >&2 echo "Error: failed to apply GDB patch"
-        exit 1
-    fi
-    fancy_title "Finished applying GDB patch"
-}
-
-main "$@"