diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5f27a8a08aedfb1def38216f6cd107ecd51028bc..cf97cfed6263eea6d01f2ed252404500b78da4c5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-23  Martin Sebor  <msebor@redhat.com>
+
+	PR driver/90983
+	* common.opt (-Wno-frame-larger-than): New option.
+	(-Wno-larger-than, -Wno-stack-usage): Same.
+
 2020-04-23  Andrew Stubbs  <ams@codesourcery.com>
 
 	* config/gcn/gcn-valu.md (mov<mode>_exec): Swap the numbers on operands
diff --git a/gcc/common.opt b/gcc/common.opt
index 1e604ba9bb6f6b2b023926b738da4ad82a82a9c2..d33383b523cfe9556695c7ce0521287d084f1e9c 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -601,6 +601,10 @@ Wframe-larger-than=
 Common RejectNegative Joined Host_Wide_Int ByteSize Warning Var(warn_frame_larger_than_size) Init(HOST_WIDE_INT_MAX)
 -Wframe-larger-than=<byte-size>	Warn if a function's stack frame requires in excess of <byte-size>.
 
+Wno-frame-larger-than
+Common Alias(Wframe-larger-than=,18446744073709551615EiB,none) Warning
+Disable -Wframe-larger-than= warning.  Equivalent to -Wframe-larger-than=<SIZE_MAX> or larger.
+
 Wfree-nonheap-object
 Common Var(warn_free_nonheap_object) Init(1) Warning
 Warn when attempting to free a non-heap object.
@@ -631,6 +635,10 @@ Wlarger-than=
 Common RejectNegative Joined Host_Wide_Int ByteSize Warning Var(warn_larger_than_size) Init(HOST_WIDE_INT_MAX)
 -Wlarger-than=<byte-size>	Warn if an object's size exceeds <byte-size>.
 
+Wno-larger-than
+Common Alias(Wlarger-than=,18446744073709551615EiB,none) Warning
+Disable -Wlarger-than= warning.  Equivalent to -Wlarger-than=<SIZE_MAX> or larger.
+
 Wnonnull-compare
 Var(warn_nonnull_compare) Warning
 Warn if comparing pointer parameter with nonnull attribute with NULL.
@@ -704,6 +712,10 @@ Wstack-usage=
 Common Joined RejectNegative Host_Wide_Int ByteSize Var(warn_stack_usage) Warning Init(HOST_WIDE_INT_MAX)
 -Wstack-usage=<byte-size>	Warn if stack usage might exceed <byte-size>.
 
+Wno-stack-usage
+Common Alias(Wstack-usage=,18446744073709551615EiB,none) Warning
+Disable Wstack-usage= warning.  Equivalent to Wstack-usage=<SIZE_MAX> or larger.
+
 Wstrict-aliasing
 Common Warning
 Warn about code which might break strict aliasing rules.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7c6fc644332bcea35f94bf2f8a21808b37dde346..86331cd12117e1e654d7cdc81ad3771547a24242 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2020-04-23  Martin Sebor  <msebor@redhat.com>
+
+	PR driver/90983
+	* gcc.dg/Wframe-larger-than-3.c: New test.
+	* gcc.dg/Wlarger-than4.c: New test.
+	* gcc.dg/Wstack-usage.c: New test.
+
 2020-04-23  Patrick Palka  <ppalka@redhat.com>
 
 	* g++.dg/cpp0x/dependent3.C: New test.
diff --git a/gcc/testsuite/gcc.dg/Wframe-larger-than-3.c b/gcc/testsuite/gcc.dg/Wframe-larger-than-3.c
new file mode 100644
index 0000000000000000000000000000000000000000..ae5b2f497c79a359f00c9ee7588500ed9acd5e55
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wframe-larger-than-3.c
@@ -0,0 +1,11 @@
+/* PR 90983/manual documents `-Wno-stack-usage` flag, but it is unrecognized
+   { dg-do compile }
+   { dg-options "-Wall -Wframe-larger-than=123 -Wno-frame-larger-than" } */
+
+void f (void*);
+
+void g (void)
+{
+  char a [1234];
+  f (a);
+}
diff --git a/gcc/testsuite/gcc.dg/Wlarger-than4.c b/gcc/testsuite/gcc.dg/Wlarger-than4.c
new file mode 100644
index 0000000000000000000000000000000000000000..dd936c671cde75c54f2f970fab063611c949b265
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wlarger-than4.c
@@ -0,0 +1,5 @@
+/* PR 90983/manual documents `-Wno-stack-usage` flag, but it is unrecognized
+   { dg-do compile }
+   { dg-options "-Wall -Wlarger-than=123 -Wno-larger-than" } */
+
+char a [1234];
diff --git a/gcc/testsuite/gcc.dg/Wstack-usage.c b/gcc/testsuite/gcc.dg/Wstack-usage.c
new file mode 100644
index 0000000000000000000000000000000000000000..4738b69478b8a43ce679559f834d48cab0243913
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wstack-usage.c
@@ -0,0 +1,14 @@
+/* PR 90983/manual documents `-Wno-stack-usage` flag, but it is unrecognized
+   { dg-do compile }
+   { dg-options "-Wall -Wstack-usage=123 -Wno-stack-usage" } */
+
+void f (void*);
+
+void g (int n)
+{
+  if (n < 1234)
+    n = 1234;
+
+  char a [n];
+  f (a);
+}