[Driver] Reject -mcmodel=tiny on X86

clang/lib/Frontend/CompilerInvocation.cpp

@@ -1905,6 +1905,16 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
     Opts.setInlining(CodeGenOptions::NormalInlining);
   }
 
+  // -mcmodel option.
+  if (const llvm::opt::Arg *A =
+          Args.getLastArg(clang::driver::options::OPT_mcmodel_EQ)) {
+    llvm::StringRef modelName = A->getValue();
+    if (modelName == "tiny" && !(T.isARM() || T.isAArch64())) {
+      Diags.Report(diag::err_drv_unsupported_option_argument_for_target)
+          << A->getSpelling() << modelName << T.getTriple();
+    }
+  }
+
   // PIC defaults to -fno-direct-access-external-data while non-PIC defaults to
   // -fdirect-access-external-data.
   Opts.DirectAccessExternalData =

clang/test/Driver/mcmodel.c

@@ -4,6 +4,7 @@
 // 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
 // RUN: %clang --target=x86_64 -### -S -mcmodel=large %s 2>&1 | FileCheck --check-prefix=LARGE %s
+// RUN: not %clang --target=x86_64 -c -mcmodel=tiny %s 2>&1 | FileCheck %s
 // RUN: not %clang -### -c --target=powerpc-linux-gnu -mcmodel=medium %s 2>&1 | FileCheck --check-prefix=ERR-MEDIUM %s
 // RUN: %clang --target=powerpc-unknown-aix -### -S -mcmodel=small %s 2>&1 | FileCheck --check-prefix=SMALL %s
 // RUN: %clang --target=powerpc-unknown-aix -### -S -mcmodel=large %s 2>&1 | FileCheck --check-prefix=LARGE %s
@@ -44,3 +45,5 @@
 // ERR-AARCH64_32: error: unsupported argument 'small' to option '-mcmodel=' for target 'aarch64_32-unknown-linux'
 
 // ERR-LOONGARCH64-PLT-EXTREME: error: invalid argument '-mcmodel=extreme' not allowed with '-fplt'
+
+// CHECK: error: unsupported argument 'tiny' to option '-mcmodel=' for target '{{.*}}'

llvm/docs/ReleaseNotes.md

@@ -240,6 +240,9 @@ Changes to Sanitizers
 Other Changes
 -------------
 
+* The -mcmodel=tiny option for the x86 architecture now triggers a frontend diagnostic.
+
+
 External Open Source Projects Using LLVM {{env.config.release}}
 ===============================================================