From e5abdec8534849c9362674e867154121e917aead Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 9 Mar 2023 14:28:55 +1100
Subject: 6/gdb: fix building on FreeBSD 13.1

See https://sourceware.org/bugzilla/show_bug.cgi?id=30214

Closes #4872
---
 rtems/config/tools/rtems-gdb-13.1.cfg |  4 ++++
 source-builder/sb/freebsd.py          | 16 +++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/rtems/config/tools/rtems-gdb-13.1.cfg b/rtems/config/tools/rtems-gdb-13.1.cfg
index 76ed22f..5766594 100644
--- a/rtems/config/tools/rtems-gdb-13.1.cfg
+++ b/rtems/config/tools/rtems-gdb-13.1.cfg
@@ -10,4 +10,8 @@
 %hash sha512 gdb-%{gdb_version}.tar.xz \
    5lBU/7wDV+7tSxfh7cXvRapzyd3zsSEGUePYWVduJ8HSeyZoAP4mMo7aWIV0VczYYy9AAM/F9j+QhUCWKQGHyg==
 
+%patch add gdb -p0 --rsb-file=gdb-13-freebsd-include.diff https://sourceware.org/bugzilla/attachment.cgi?id=14742
+%hash sha512 gdb-13-freebsd-include.diff \
+   2oKUpRyZIwXwyKHXn5lxXte+jV853Zvg5UHLKLfmVCW4QLrLMFsnO5LvPamIqjXnqPztB8IPEY18pdw8vOYaOw==
+
 %include %{_configdir}/gdb-common-1.cfg
diff --git a/source-builder/sb/freebsd.py b/source-builder/sb/freebsd.py
index 472f670..628ef22 100644
--- a/source-builder/sb/freebsd.py
+++ b/source-builder/sb/freebsd.py
@@ -101,22 +101,24 @@ def load():
             cxx = '/usr/bin/clang++'
             if check.check_exe(cxx, cxx):
                 raise error.general('no valid c++ found')
-        #
-        # Assume the compiler is clang and so we need to increase
-        # bracket depth build build the gcc ARM compiler.
-        #
-        defines['build_cflags'] = '-O2 -pipe -fbracket-depth=1024'
-        defines['build_cxxflags'] = '-O2 -pipe -fbracket-depth=1024'
         cvs = 'cvs'
         if check.check_exe(cvs, cvs):
             defines['__cvs'] = cvs
+        defines['build_cflags'] = '-O2 -pipe'
+        defines['build_cxxflags'] = '-O2 -pipe'
+        if fb_version <= 12:
+            #
+            # Assume the compiler is clang and so we need to increase
+            # bracket depth build build the gcc ARM compiler.
+            #
+            defines['build_cflags'] += ' -fbracket-depth=1024'
+            defines['build_cxxflags'] += ' -fbracket-depth=1024'
         #
         # Fix the mess iconv is on FreeBSD 10.0 and higher.
         #
         defines['iconv_includes'] = ('none', 'none', '%{host_includes} %{host_ldflags}')
         if fb_version >= 12:
             defines['iconv_prefix'] = ('none', 'none', '%{_usr}')
-
         #
         # On 11.0+ makeinfo and install-info have moved to /usr/local/...
         #
-- 
cgit v1.2.3