[𝘀𝗽𝗿] initial version

Created using spr 1.3.4

Author: MaskRay

clang/include/clang/Driver/Options.td

@@ -7954,6 +7954,8 @@ def dwarf_debug_producer : Separate<["-"], "dwarf-debug-producer">,
 def defsym : Separate<["-"], "defsym">,
  HelpText<"Define a value for a symbol">;
 
+def fdpic : Flag<["--"], "fdpic">, HelpText<"Enable FDPIC ABI (ARM only)">;
+
 } // let Visibility = [CC1AsOption]
 
 //===----------------------------------------------------------------------===//

clang/lib/Driver/ToolChains/Clang.cpp

@@ -2530,6 +2530,10 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
  case llvm::Triple::thumbeb:
  case llvm::Triple::arm:
  case llvm::Triple::armeb:
+ if (Value == "--fdpic") {
+ CmdArgs.push_back("--fdpic");
+ continue;
+ }
  if (Value.starts_with("-mimplicit-it=")) {
  // Only store the value; the last value set takes effect.
  ImplicitIt = Value.split("=").second;

clang/test/Driver/arm-ias-Wa.s

@@ -79,3 +79,5 @@
 // RUN: | FileCheck -check-prefix=CHECK-M-PROFILE %s
 // CHECK-M-PROFILE: "-triple" "thumbv7m-{{.*}}"
 
+// RUN: %clang --target=arm-unknown-linuxfdpiceabi -Wa,--fdpic -c %s -### 2>&1 | FileCheck --check-prefix=FDPIC %s
+// FDPIC: "--fdpic"

clang/test/Misc/cc1as-arm-fdpic.s

@@ -0,0 +1,10 @@
+// REQUIRES: arm-registered-target
+
+// RUN: %clang -cc1as -triple armv7-unknown-linuxfdpiceabi -filetype obj --fdpic %s -o %t
+// RUN: llvm-readelf -h -r %t | FileCheck %s
+
+// CHECK: OS/ABI: ARM FDPIC
+// CHECK: R_ARM_FUNCDESC
+
+.data
+.word f(FUNCDESC)

clang/tools/driver/cc1as_main.cpp

@@ -154,6 +154,8 @@ struct AssemblerInvocation {
  LLVM_PREFERRED_TYPE(bool)
  unsigned IncrementalLinkerCompatible : 1;
  LLVM_PREFERRED_TYPE(bool)
+ unsigned FDPIC : 1;
+ LLVM_PREFERRED_TYPE(bool)
  unsigned EmbedBitcode : 1;
 
  /// Whether to emit DWARF unwind info.
@@ -346,6 +348,7 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts,
  Opts.FatalWarnings = Args.hasArg(OPT_massembler_fatal_warnings);
  Opts.NoWarn = Args.hasArg(OPT_massembler_no_warn);
  Opts.NoTypeCheck = Args.hasArg(OPT_mno_type_check);
+ Opts.FDPIC = Args.hasArg(OPT_fdpic);
  Opts.RelocationModel =
  std::string(Args.getLastArgValue(OPT_mrelocation_model, "pic"));
  Opts.TargetABI = std::string(Args.getLastArgValue(OPT_target_abi));
@@ -520,6 +523,7 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
  MCOptions.MCNoWarn = Opts.NoWarn;
  MCOptions.MCFatalWarnings = Opts.FatalWarnings;
  MCOptions.MCNoTypeCheck = Opts.NoTypeCheck;
+ MCOptions.FDPIC = Opts.FDPIC;
  MCOptions.ABIName = Opts.TargetABI;
 
  // FIXME: There is a bit of code duplication with addPassesToEmitFile.

llvm/include/llvm/BinaryFormat/ELF.h

@@ -362,6 +362,7 @@ enum {
  ELFOSABI_AMDGPU_PAL = 65, // AMD PAL runtime
  ELFOSABI_AMDGPU_MESA3D = 66, // AMD GCN GPUs (GFX6+) for MESA runtime
  ELFOSABI_ARM = 97, // ARM
+ ELFOSABI_ARM_FDPIC = 65, // ARM FDPIC
  ELFOSABI_C6000_ELFABI = 64, // Bare-metal TMS320C6000
  ELFOSABI_C6000_LINUX = 65, // Linux TMS320C6000
  ELFOSABI_STANDALONE = 255, // Standalone (embedded) application

llvm/include/llvm/BinaryFormat/ELFRelocs/ARM.def

@@ -143,3 +143,10 @@ ELF_RELOC(R_ARM_THM_BF16, 0x88)
 ELF_RELOC(R_ARM_THM_BF12, 0x89)
 ELF_RELOC(R_ARM_THM_BF18, 0x8a)
 ELF_RELOC(R_ARM_IRELATIVE, 0xa0)
+ELF_RELOC(R_ARM_GOTFUNCDESC, 0xa1)
+ELF_RELOC(R_ARM_GOTOFFFUNCDESC, 0xa2)
+ELF_RELOC(R_ARM_FUNCDESC, 0xa3)
+ELF_RELOC(R_ARM_FUNCDESC_VALUE, 0xa4)
+ELF_RELOC(R_ARM_TLS_GD32_FDPIC, 0xa5)
+ELF_RELOC(R_ARM_TLS_LDM32_FDPIC, 0xa6)
+ELF_RELOC(R_ARM_TLS_IE32_FDPIC, 0xa7)

llvm/include/llvm/MC/MCExpr.h

@@ -223,6 +223,12 @@ class MCSymbolRefExpr : public MCExpr {
  VK_SECREL,
  VK_SIZE, // symbol@SIZE
  VK_WEAKREF, // The link between the symbols in .weakref foo, bar
+ VK_FUNCDESC,
+ VK_GOTFUNCDESC,
+ VK_GOTOFFFUNCDESC,
+ VK_TLSGD_FDPIC,
+ VK_TLSLDM_FDPIC,
+ VK_GOTTPOFF_FDPIC,
 
  VK_X86_ABS8,
  VK_X86_PLTOFF,

llvm/include/llvm/MC/MCParser/MCTargetAsmParser.h

@@ -525,6 +525,10 @@ class MCTargetAsmParser : public MCAsmParserExtension {
  // Return whether this parser accept star as start of statement
  virtual bool starIsStartOfStatement() { return false; };
 
+ virtual MCSymbolRefExpr::VariantKind
+ getVariantKindForName(StringRef Name) const {
+ return MCSymbolRefExpr::getVariantKindForName(Name);
+ }
  virtual const MCExpr *applyModifierToExpr(const MCExpr *E,
  MCSymbolRefExpr::VariantKind,
  MCContext &Ctx) {

llvm/include/llvm/MC/MCTargetOptions.h

@@ -51,6 +51,7 @@ class MCTargetOptions {
  bool MCNoTypeCheck : 1;
  bool MCSaveTempLabels : 1;
  bool MCIncrementalLinkerCompatible : 1;
+ bool FDPIC : 1;
  bool ShowMCEncoding : 1;
  bool ShowMCInst : 1;
  bool AsmVerbose : 1;