commit f9a5549db27b332d5fffc7a475695f6c40d50848 · pyrox.dev/nixpkgs

+75

pkgs/development/compilers/llvm/common/clang/clang-unsupported-option.patch

···

       1
       1
       +
       From 7ef5ed98cc6666f64db2f155ded2077ce038e1e4 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Reno Dakota <paparodeo@proton.me>

     

       3
       3
       +
       Date: Sat, 16 Nov 2024 05:57:40 +0000

     

       4
       4
       +
       Subject: [PATCH] [Clang][Driver] report unsupported option error regardless of

     

       5
       5
       +
        argument order

     

       6
       6
       +
       

     

       7
       7
       +
       This change updates clang to report unsupported option errors regardless

     

       8
       8
       +
       of the command line argument order.

     

       9
       9
       +
       

     

       10
       10
       +
       When clang with a source file and without `-c` it will both compile and

     

       11
       11
       +
       link. When an unsupported option is also part of the command line clang

     

       12
       12
       +
       should generated an error. However, if the source file name comes before

     

       13
       13
       +
       an object file, eg: `-lc`, the error is ignored.

     

       14
       14
       +
       

     

       15
       15
       +
       ```

     

       16
       16
       +
       $ clang --target=x86_64 -lc hello.c -mhtm

     

       17
       17
       +
       clang: error: unsupported option '-mhtm' for target 'x86_64'

     

       18
       18
       +
       $ echo $?

     

       19
       19
       +
       1

     

       20
       20
       +
       ```

     

       21
       21
       +
       

     

       22
       22
       +
       but if `-lc` comes after `hello.c` the error is dropped

     

       23
       23
       +
       

     

       24
       24
       +
       ```

     

       25
       25
       +
       $ clang --target=x86_64 hello.c -mhtm -lc

     

       26
       26
       +
       $ echo $?

     

       27
       27
       +
       0

     

       28
       28
       +
       ```

     

       29
       29
       +
       

     

       30
       30
       +
       after this change clang will report the error regardless of the command

     

       31
       31
       +
       line argument order.

     

       32
       32
       +
       ---

     

       33
       33
       +
        clang/lib/Driver/Driver.cpp            | 13 ++++++-------

     

       34
       34
       +
        clang/test/Driver/unsupported-option.c | 10 ++++++++++

     

       35
       35
       +
        2 files changed, 16 insertions(+), 7 deletions(-)

     

       36
       36
       +
       

     

       37
       37
       +
       diff --git a/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp

     

       38
       38
       +
       index 93e85f7dffe35a..8e784a7b130ac3 100644

     

       39
       39
       +
       --- a/lib/Driver/Driver.cpp

     

       40
       40
       +
       +++ b/lib/Driver/Driver.cpp

     

       41
       41
       +
       @@ -4064,17 +4064,18 @@ void Driver::handleArguments(Compilation &C, DerivedArgList &Args,

     

       42
       42
       +
            YcArg = YuArg = nullptr;

     

       43
       43
       +
          }

     

       44
       44
       +
        

     

       45
       45
       +
       -  unsigned LastPLSize = 0;

     

       46
       46
       +
       +  bool LinkOnly = phases::Link == FinalPhase && Inputs.size() > 0;

     

       47
       47
       +
          for (auto &I : Inputs) {

     

       48
       48
       +
            types::ID InputType = I.first;

     

       49
       49
       +
            const Arg *InputArg = I.second;

     

       50
       50
       +
        

     

       51
       51
       +
            auto PL = types::getCompilationPhases(InputType);

     

       52
       52
       +
       -    LastPLSize = PL.size();

     

       53
       53
       +
       +

     

       54
       54
       +
       +    phases::ID InitialPhase = PL[0];

     

       55
       55
       +
       +    LinkOnly = LinkOnly && phases::Link == InitialPhase && PL.size() == 1;

     

       56
       56
       +
        

     

       57
       57
       +
            // If the first step comes after the final phase we are doing as part of

     

       58
       58
       +
            // this compilation, warn the user about it.

     

       59
       59
       +
       -    phases::ID InitialPhase = PL[0];

     

       60
       60
       +
            if (InitialPhase > FinalPhase) {

     

       61
       61
       +
              if (InputArg->isClaimed())

     

       62
       62
       +
                continue;

     

       63
       63
       +
       @@ -4129,10 +4130,8 @@ void Driver::handleArguments(Compilation &C, DerivedArgList &Args,

     

       64
       64
       +
            }

     

       65
       65
       +
          }

     

       66
       66
       +
        

     

       67
       67
       +
       -  // If we are linking, claim any options which are obviously only used for

     

       68
       68
       +
       -  // compilation.

     

       69
       69
       +
       -  // FIXME: Understand why the last Phase List length is used here.

     

       70
       70
       +
       -  if (FinalPhase == phases::Link && LastPLSize == 1) {

     

       71
       71
       +
       +  // claim any options which are obviously only used for compilation.

     

       72
       72
       +
       +  if (LinkOnly) {

     

       73
       73
       +
            Args.ClaimAllArgs(options::OPT_CompileOnly_Group);

     

       74
       74
       +
            Args.ClaimAllArgs(options::OPT_cl_compile_Group);

     

       75
       75
       +
          }

pkgs/development/compilers/llvm/common/default.nix

···

       521
       521
        
                   (metadata.getVersionFile "clang/purity.patch")

     

       522
       522
        
                   # https://reviews.llvm.org/D51899

     

       523
       523
        
                   (metadata.getVersionFile "clang/gnu-install-dirs.patch")

     

       524
       524
       +
       

     

       525
       525
       +
                   # https://github.com/llvm/llvm-project/pull/116476

     

       526
       526
       +
                   # prevent clang ignoring warnings / errors for unsuppored

     

       527
       527
       +
                   # options when building & linking a source file with trailing

     

       528
       528
       +
                   # libraries. eg: `clang -munsupported hello.c -lc`

     

       529
       529
       +
                   ./clang/clang-unsupported-option.patch

     

       524
       530
        
                 ]

     

       525
       531
        
                 ++ lib.optional (lib.versions.major metadata.release_version == "13")

     

       526
       532
        
                   # Revert of https://reviews.llvm.org/D100879