Commit fc6057e3 authored by Fangrui Song's avatar Fangrui Song
Browse files

[Frontend] Replace CC1 option -mcode-model with -mcmodel= 

Before:

% clang -mcmodel=x -xc /dev/null
error: invalid argument 'x' in '-mcode-model x'

Now:

% clang -mcmodel=x -xc /dev/null
clang-11: error: invalid argument 'x' to -mcmodel=
parent 0123744d

clang/include/clang/Driver/CC1Options.td

+0 −2
Original line number Diff line number Diff line
@@ -284,8 +284,6 @@ def new_struct_path_tbaa : Flag<["-"], "new-struct-path-tbaa">, 
  HelpText<"Enable enhanced struct-path aware Type Based Alias Analysis">;

def masm_verbose : Flag<["-"], "masm-verbose">,

  HelpText<"Generate verbose assembly output">;

def mcode_model : Separate<["-"], "mcode-model">,

  HelpText<"The code model to use">, Values<"tiny,small,kernel,medium,large">;

def mdebug_pass : Separate<["-"], "mdebug-pass">,

  HelpText<"Enable additional debug output">;

def mframe_pointer_EQ : Joined<["-"], "mframe-pointer=">,

clang/include/clang/Driver/Options.td

+1 −1
Original line number Diff line number Diff line
@@ -2201,7 +2201,7 @@ def mwatchos_simulator_version_min_EQ : Joined<["-"], "mwatchos-simulator-versio 
def mwatchsimulator_version_min_EQ : Joined<["-"], "mwatchsimulator-version-min=">, Alias<mwatchos_simulator_version_min_EQ>;

def march_EQ : Joined<["-"], "march=">, Group<m_Group>, Flags<[CoreOption]>;

def masm_EQ : Joined<["-"], "masm=">, Group<m_Group>, Flags<[DriverOption]>;

def mcmodel_EQ : Joined<["-"], "mcmodel=">, Group<m_Group>;

def mcmodel_EQ : Joined<["-"], "mcmodel=">, Group<m_Group>, Flags<[CC1Option]>;

def mtls_size_EQ : Joined<["-"], "mtls-size=">, Group<m_Group>, Flags<[DriverOption, CC1Option]>,

  HelpText<"Specify bit size of immediate TLS offsets (AArch64 ELF only): "

           "12 (for 4KB) | 24 (for 16MB, default) | 32 (for 4GB) | 48 (for 256TB, needs -mcmodel=large)">;

clang/lib/Driver/ToolChains/Clang.cpp

+7 −2
Original line number Diff line number Diff line
@@ -4672,8 +4672,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, 
  (void)Args.hasArg(options::OPT_mtune_EQ);



  if (Arg *A = Args.getLastArg(options::OPT_mcmodel_EQ)) {

    CmdArgs.push_back("-mcode-model");

    CmdArgs.push_back(A->getValue());

    StringRef CM = A->getValue();

    if (CM == "small" || CM == "kernel" || CM == "medium" || CM == "large" ||

        CM == "tiny")

      A->render(Args, CmdArgs);

    else

      D.Diag(diag::err_drv_invalid_argument_to_option)

          << CM << A->getOption().getName();

  }



  if (Arg *A = Args.getLastArg(options::OPT_mtls_size_EQ)) {

clang/lib/Frontend/CompilerInvocation.cpp

+1 −12
Original line number Diff line number Diff line
@@ -527,17 +527,6 @@ static void ParseCommentArgs(CommentOptions &Opts, ArgList &Args) { 
  Opts.ParseAllComments = Args.hasArg(OPT_fparse_all_comments);

}



static StringRef getCodeModel(ArgList &Args, DiagnosticsEngine &Diags) {

  if (Arg *A = Args.getLastArg(OPT_mcode_model)) {

    StringRef Value = A->getValue();

    if (Value == "small" || Value == "kernel" || Value == "medium" ||

        Value == "large" || Value == "tiny")

      return Value;

    Diags.Report(diag::err_drv_invalid_value) << A->getAsString(Args) << Value;

  }

  return "default";

}



static llvm::Reloc::Model getRelocModel(ArgList &Args,

                                        DiagnosticsEngine &Diags) {

  if (Arg *A = Args.getLastArg(OPT_mrelocation_model)) {
@@ -3496,7 +3485,7 @@ static void ParsePreprocessorOutputArgs(PreprocessorOutputOptions &Opts, 


static void ParseTargetArgs(TargetOptions &Opts, ArgList &Args,

                            DiagnosticsEngine &Diags) {

  Opts.CodeModel = std::string(getCodeModel(Args, Diags));

  Opts.CodeModel = std::string(Args.getLastArgValue(OPT_mcmodel_EQ, "default"));

  Opts.ABI = std::string(Args.getLastArgValue(OPT_target_abi));

  if (Arg *A = Args.getLastArg(OPT_meabi)) {

    StringRef Value = A->getValue();

clang/test/CodeGen/codemodels.c

+5 −5
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -emit-llvm  %s -o - | FileCheck %s -check-prefix=CHECK-NOMODEL

// RUN: %clang_cc1 -triple aarch64-unknown-none-eabi -emit-llvm -mcode-model tiny %s -o - | FileCheck %s -check-prefix=CHECK-TINY

// RUN: %clang_cc1 -emit-llvm -mcode-model small %s -o - | FileCheck %s -check-prefix=CHECK-SMALL

// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm -mcode-model kernel %s -o - | FileCheck %s -check-prefix=CHECK-KERNEL

// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm -mcode-model medium %s -o - | FileCheck %s -check-prefix=CHECK-MEDIUM

// RUN: %clang_cc1 -emit-llvm -mcode-model large %s -o - | FileCheck %s -check-prefix=CHECK-LARGE

// RUN: %clang_cc1 -triple aarch64-unknown-none-eabi -emit-llvm -mcmodel=tiny %s -o - | FileCheck %s -check-prefix=CHECK-TINY

// RUN: %clang_cc1 -emit-llvm -mcmodel=small %s -o - | FileCheck %s -check-prefix=CHECK-SMALL

// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm -mcmodel=kernel %s -o - | FileCheck %s -check-prefix=CHECK-KERNEL

// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm -mcmodel=medium %s -o - | FileCheck %s -check-prefix=CHECK-MEDIUM

// RUN: %clang_cc1 -emit-llvm -mcmodel=large %s -o - | FileCheck %s -check-prefix=CHECK-LARGE



// CHECK-TINY: !llvm.module.flags = !{{{.*}}}

// CHECK-TINY: !{{[0-9]+}} = !{i32 1, !"Code Model", i32 0}