diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 71c898f7c1e..d26e55d33c5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -97,6 +97,14 @@ repos:
       exclude: '.*/testsuite/.*'
       verbose: true
       stages: [pre-commit]
+    - id: check-whitespace
+      name: check-whitespace
+      language: script
+      entry: gdb/contrib/check-whitespace-pre-commit.sh
+      files: '^(gdb(support|server)?)/.*$'
+      pass_filenames: true
+      verbose: true
+      stages: [pre-commit]
   - repo: https://github.com/nmoroze/tclint
     rev: v0.6.1
     hooks:
diff --git a/gdb/contrib/check-whitespace-pre-commit.sh b/gdb/contrib/check-whitespace-pre-commit.sh
new file mode 100755
index 00000000000..db45dc26e65
--- /dev/null
+++ b/gdb/contrib/check-whitespace-pre-commit.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Copyright (C) 2025 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+git --no-pager diff --staged --check "$@"