[PATCH] D53204: [ELF] [HEXAGON] Let input determine ELF header e_flags

[Sid Manning via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rLLD344518: [ELF][HEXAGON] Let input determine e_flag. (authored by sidneym, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D53204?vs=169637&id=169708#toc

Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D53204

Files:
  ELF/Arch/Hexagon.cpp
  test/ELF/hexagon-eflag.s


Index: test/ELF/hexagon-eflag.s
===================================================================
--- test/ELF/hexagon-eflag.s
+++ test/ELF/hexagon-eflag.s
@@ -0,0 +1,7 @@
+# REQUIRES: hexagon
+# RUN: llvm-mc -filetype=obj -mv62 -triple=hexagon-unknown-elf %s -o %t
+# RUN: llvm-mc -filetype=obj -mv60 -triple=hexagon-unknown-elf %S/Inputs/hexagon.s -o %t2
+# RUN: ld.lld %t2 %t  -o %t3
+# RUN: llvm-readelf -h  %t3 | FileCheck %s
+# Verify that the largest arch in the input list is selected.
+# CHECK: Flags: 0x62
Index: ELF/Arch/Hexagon.cpp
===================================================================
--- ELF/Arch/Hexagon.cpp
+++ ELF/Arch/Hexagon.cpp
@@ -55,8 +55,19 @@
   NoneRel = R_HEX_NONE;
 }
 
-// Support V60 only at the moment.
-uint32_t Hexagon::calcEFlags() const { return 0x60; }
+uint32_t Hexagon::calcEFlags() const {
+  assert(!ObjectFiles.empty());
+
+  // The architecture revision must always be equal to or greater than
+  // greatest revision in the list of inputs.
+  uint32_t Ret = 0;
+  for (InputFile *F : ObjectFiles) {
+    uint32_t EFlags = cast<ObjFile<ELF32LE>>(F)->getObj().getHeader()->e_flags;
+    if (EFlags > Ret)
+      Ret = EFlags;
+  }
+  return Ret;
+}
 
 static uint32_t applyMask(uint32_t Mask, uint32_t Data) {
   uint32_t Result = 0;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D53204.169708.patch
Type: text/x-patch
Size: 1290 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181015/48187832/attachment.bin>