Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 542030 | Differences between
and this patch

Collapse All | Expand All

(-)tools/clang/lib/Driver/Tools.cpp (-6 / +25 lines)
Lines 7182-7189 Link Here
7182
      return "/system/bin/linker64";
7182
      return "/system/bin/linker64";
7183
    else
7183
    else
7184
      return "/system/bin/linker";
7184
      return "/system/bin/linker";
7185
  } else if (ToolChain.getArch() == llvm::Triple::x86 ||
7185
  } else if (ToolChain.getArch() == llvm::Triple::x86) {
7186
             ToolChain.getArch() == llvm::Triple::sparc)
7186
    switch (ToolChain.getTriple().getEnvironment()) {
7187
    case llvm::Triple::Musl:
7188
      return "/lib/ld-musl-i386.so.1";
7189
    default:
7190
      return "/lib/ld-linux.so.2";
7191
    }
7192
  } else if (ToolChain.getArch() == llvm::Triple::sparc)
7187
    return "/lib/ld-linux.so.2";
7193
    return "/lib/ld-linux.so.2";
7188
  else if (ToolChain.getArch() == llvm::Triple::aarch64 ||
7194
  else if (ToolChain.getArch() == llvm::Triple::aarch64 ||
7189
           ToolChain.getArch() == llvm::Triple::arm64)
7195
           ToolChain.getArch() == llvm::Triple::arm64)
Lines 7193-7202 Link Here
7193
    return "/lib/ld-linux-aarch64_be.so.1";
7199
    return "/lib/ld-linux-aarch64_be.so.1";
7194
  else if (ToolChain.getArch() == llvm::Triple::arm ||
7200
  else if (ToolChain.getArch() == llvm::Triple::arm ||
7195
           ToolChain.getArch() == llvm::Triple::thumb) {
7201
           ToolChain.getArch() == llvm::Triple::thumb) {
7196
    if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
7202
    switch (ToolChain.getTriple().getEnvironment()) {
7203
    case llvm::Triple::Musl:
7204
    case llvm::Triple::MuslEABI:
7205
      return "/lib/ld-musl-arm.so.3";
7206
    case llvm::Triple::MuslEABIHF:
7207
      return "/lib/ld-musl-armhf.so.3";
7208
    case llvm::Triple::GNUEABIHF:
7197
      return "/lib/ld-linux-armhf.so.3";
7209
      return "/lib/ld-linux-armhf.so.3";
7198
    else
7210
    default:
7199
      return "/lib/ld-linux.so.3";
7211
      return "/lib/ld-linux.so.3";
7212
    }
7200
  } else if (ToolChain.getArch() == llvm::Triple::armeb ||
7213
  } else if (ToolChain.getArch() == llvm::Triple::armeb ||
7201
             ToolChain.getArch() == llvm::Triple::thumbeb) {
7214
             ToolChain.getArch() == llvm::Triple::thumbeb) {
7202
    if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
7215
    if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
Lines 7227-7234 Link Here
7227
  else if (ToolChain.getArch() == llvm::Triple::x86_64 &&
7240
  else if (ToolChain.getArch() == llvm::Triple::x86_64 &&
7228
           ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUX32)
7241
           ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUX32)
7229
    return "/libx32/ld-linux-x32.so.2";
7242
    return "/libx32/ld-linux-x32.so.2";
7230
  else
7243
  else {
7231
    return "/lib64/ld-linux-x86-64.so.2";
7244
    switch (ToolChain.getTriple().getEnvironment()) {
7245
    case llvm::Triple::Musl:
7246
      return "/lib/ld-musl-x86_64.so.1";
7247
    default:
7248
      return "/lib64/ld-linux-x86-64.so.2";
7249
    }
7250
  }
7232
}
7251
}
7233
7252
7234
static void AddRunTimeLibs(const ToolChain &TC, const Driver &D,
7253
static void AddRunTimeLibs(const ToolChain &TC, const Driver &D,

Return to bug 542030