x32-gcc-toolchain.patch

   1 --- llvm-13.0.0.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp.orig      2021-10-25 20:48:42.045696956 +0200
   2 +++ llvm-13.0.0.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp   2021-10-25 20:56:43.802012798 +0200
   3 @@ -2113,8 +2113,9 @@
   4        "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
   5        "x86_64-slackware-linux", "x86_64-unknown-linux",
   6        "x86_64-amazon-linux"};
   7 -  static const char *const X32Triples[] = {"x86_64-linux-gnux32",
   8 -                                           "x86_64-pc-linux-gnux32"};
   9 +  static const char *const X32Triples[] = {
  10 +      "x86_64-pld-linux-gnux32", "amd64-pld-linux-gnux32",
  11 +      "x86_64-linux-gnux32", "x86_64-unknown-linux-gnux32", "x86_64-pc-linux-gnux32"};
  12    static const char *const X32LibDirs[] = {"/libx32", "/lib"};
  13    static const char *const X86LibDirs[] = {"/lib32", "/lib"};
  14    static const char *const X86Triples[] = {
  15 @@ -2352,12 +2353,16 @@
  16        LibDirs.append(begin(X32LibDirs), end(X32LibDirs));
  17        TripleAliases.append(begin(X32Triples), end(X32Triples));
  18        BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
  19 +      BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
  20        BiarchTripleAliases.append(begin(X86_64Triples), end(X86_64Triples));
  21 +      BiarchTripleAliases.append(begin(X86Triples), end(X86Triples));
  22      } else {
  23        LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
  24        TripleAliases.append(begin(X86_64Triples), end(X86_64Triples));
  25        BiarchLibDirs.append(begin(X32LibDirs), end(X32LibDirs));
  26 +      BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
  27        BiarchTripleAliases.append(begin(X32Triples), end(X32Triples));
  28 +      BiarchTripleAliases.append(begin(X86Triples), end(X86Triples));
  29      }
  30      BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
  31      BiarchTripleAliases.append(begin(X86Triples), end(X86Triples));
  32 --- llvm-15.0.2.src/projects/compiler-rt/cmake/Modules/CompilerRTUtils.cmake.orig       2022-10-04 11:29:17.000000000 +0200
  33 +++ llvm-15.0.2.src/projects/compiler-rt/cmake/Modules/CompilerRTUtils.cmake    2022-10-16 22:33:08.014906010 +0200
  34 @@ -478,7 +478,8 @@
  35
  36  function(get_compiler_rt_target arch variable)
  37    string(FIND ${COMPILER_RT_DEFAULT_TARGET_TRIPLE} "-" dash_index)
  38 -  string(SUBSTRING ${COMPILER_RT_DEFAULT_TARGET_TRIPLE} ${dash_index} -1 triple_suffix)
  39 +  string(SUBSTRING ${COMPILER_RT_DEFAULT_TARGET_TRIPLE} ${dash_index} -1 triple_suffix_with_abi)
  40 +  string(REPLACE "-gnux32" "" triple_suffix ${triple_suffix_with_abi})
  41    if(COMPILER_RT_DEFAULT_TARGET_ONLY)
  42      # Use exact spelling when building only for the target specified to CMake.
  43      set(target "${COMPILER_RT_DEFAULT_TARGET_TRIPLE}")