llvm · MaskRay · May 7, 2025 · Feb 4, 2025 · Feb 4, 2025 · Feb 4, 2025
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
@@ -391,6 +391,7 @@ Improvements to Clang's diagnostics
 
 
 - An error is now emitted when a ``musttail`` call is made to a function marked with the ``not_tail_called`` attribute. (#GH133509).
+- The ``-mcmodel=tiny`` option will now be diagnosed on all targets other than ARM or AArch64.
 
 - ``-Whigher-precisision-for-complex-divison`` warns when:
 

diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -2936,8 +2936,7 @@ void tools::addMCModel(const Driver &D, const llvm::opt::ArgList &Args,
       Ok = CM == "small" || CM == "medium" ||
            (CM == "large" && Triple.isRISCV64());
     } else if (Triple.getArch() == llvm::Triple::x86_64) {
-      Ok = llvm::is_contained({"small", "kernel", "medium", "large", "tiny"},
-                              CM);
+      Ok = llvm::is_contained({"small", "kernel", "medium", "large"}, CM);
     } else if (Triple.isNVPTX() || Triple.isAMDGPU() || Triple.isSPIRV()) {
       // NVPTX/AMDGPU/SPIRV does not care about the code model and will accept
       // whatever works for the host.

diff --git a/clang/test/Driver/mcmodel.c b/clang/test/Driver/mcmodel.c
@@ -1,5 +1,5 @@
 // RUN: not %clang -### -c --target=i686 -mcmodel=medium %s 2>&1 | FileCheck --check-prefix=ERR-MEDIUM %s
-// RUN: %clang --target=x86_64 -### -c -mcmodel=tiny %s 2>&1 | FileCheck --check-prefix=TINY %s
+// RUN: not %clang --target=x86_64 -### -c -mcmodel=tiny %s 2>&1 | FileCheck --check-prefix=ERR-TINY %s
 // RUN: %clang --target=x86_64 -### -c -mcmodel=small %s 2>&1 | FileCheck --check-prefix=SMALL %s
 // RUN: %clang --target=x86_64 -### -S -mcmodel=kernel %s 2>&1 | FileCheck --check-prefix=KERNEL %s
 // RUN: %clang --target=x86_64 -### -c -mcmodel=medium %s 2>&1 | FileCheck --check-prefix=MEDIUM %s
Original file line number	Diff line number	Diff line change
Expand Up		@@ -391,6 +391,7 @@ Improvements to Clang's diagnostics


		- An error is now emitted when a ``musttail`` call is made to a function marked with the ``not_tail_called`` attribute. (#GH133509).
		- The ``-mcmodel=tiny`` option will now be diagnosed on all targets other than ARM or AArch64.
Copy link Member MaskRay May 6, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. The commit message/description and the note should be changed. Only X86 is affected. This change is pretty niche and does not deserve a release note. Copy link Contributor Author ShashwathiNavada May 6, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. @MaskRay, Thank you for the response. I have removed the release note entry and updated the commit message as well.

		- ``-Whigher-precisision-for-complex-divison`` warns when:

Expand Down