5 files changed, 18 insertions, 2 deletions
diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in
index f49d1a71..7baac528 100644
--- a/config/comp_libs/gmp.in
+++ b/config/comp_libs/gmp.in
@@ -1 +1,6 @@
 # GMP options
+config GMP_EXTRA_CFLAGS
+    string "extra target CFLAGS"
+    default "-std=gnu17" if GCC_15_or_later
+    help
+        Extra target CFLAGS to use when building.
diff --git a/config/comp_libs/gnumach.in b/config/comp_libs/gnumach.in
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/config/comp_libs/gnumach.in
diff --git a/config/comp_libs/mpc.in b/config/comp_libs/mpc.in
index 422935f0..2d948a78 100644
--- a/config/comp_libs/mpc.in
+++ b/config/comp_libs/mpc.in
@@ -1,3 +1 @@
 # MPC options
-# MPC 1.0.x and earlier break with MPFR 4.0.0.
-## select MPFR_REQUIRE_older_than_4_0_0 if MPFR_NEEDED && !MPC_1_1_0_or_later
diff --git a/config/comp_libs/ncurses.in b/config/comp_libs/ncurses.in
index 4e7e6d47..3d257439 100644
--- a/config/comp_libs/ncurses.in
+++ b/config/comp_libs/ncurses.in
@@ -55,3 +55,8 @@ config NCURSES_TARGET_FALLBACKS
       List of terminal descriptions that will be compiled into the curses
       library for the target.
 
+config NCURSES_EXTRA_CFLAGS
+    string "extra target CFLAGS"
+    default "-std=gnu17" if GCC_15_or_later
+    help
+        Extra target CFLAGS fto use when building.
diff --git a/config/comp_libs/picolibc.in b/config/comp_libs/picolibc.in
index 4b283aec..c978c35b 100644
--- a/config/comp_libs/picolibc.in
+++ b/config/comp_libs/picolibc.in
@@ -27,6 +27,14 @@ config LIBC_PICOLIBC_GCC_LIBSTDCXX
       the picolibc companion library. This version is linked when
       "--specs=picolibcpp.specs" is specified.
 
+config LIBC_PICOLIBC_GCC_LIBSTDCXX_TARGET_CXXFLAGS
+    string
+    prompt "Target CXXFLAGS for libstdc++ picolibc variant"
+    default ""
+    help
+      Used to add extra CXXFLAGS when compiling the target libstdc++
+      picolibc library (e.g. -fno-exceptions).
+
 comment "Configuration for picolibc can be found under"
 comment "* -> C-library"
 comment "*   -> picolibc"