Merged main:af4570cd3ab9 into amd-gfx:262c99449048

Local branch amd-gfx 262c994 Merged main:4e2e785ddd35 into amd-gfx:6a5ee55760ba Remote branch main af4570c [AMDGPU][NFC] Remove unused VOP3Mods0Clamp
jaebaek · Dec 14, 2020 · c7ccfc4 · c7ccfc4
2 parents 262c994 + af4570c
commit c7ccfc4
Show file tree

Hide file tree

Showing 117 changed files with 845 additions and 714 deletions.
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
@@ -3354,7 +3354,8 @@ def : Flag<["-"], "no-integrated-as">, Alias<fno_integrated_as>,
       Flags<[CC1Option, NoXarchOption]>;
 
 def working_directory : JoinedOrSeparate<["-"], "working-directory">, Flags<[CC1Option]>,
-  HelpText<"Resolve file paths relative to the specified directory">;
+  HelpText<"Resolve file paths relative to the specified directory">,
+  MarshallingInfoString<"FileSystemOpts.WorkingDir">;
 def working_directory_EQ : Joined<["-"], "working-directory=">, Flags<[CC1Option]>,
   Alias<working_directory>;
 
@@ -3933,7 +3934,7 @@ def target_feature : Separate<["-"], "target-feature">,
 def triple : Separate<["-"], "triple">,
   HelpText<"Specify target triple (e.g. i686-apple-darwin9)">,
   MarshallingInfoString<"TargetOpts->Triple", "llvm::Triple::normalize(llvm::sys::getDefaultTargetTriple())">,
-  AlwaysEmit, Normalizer<"normalizeTriple">, DenormalizeString;
+  AlwaysEmit, Normalizer<"normalizeTriple">;
 def target_abi : Separate<["-"], "target-abi">,
   HelpText<"Target a particular ABI type">;
 def target_sdk_version_EQ : Joined<["-"], "target-sdk-version=">,
@@ -3998,7 +3999,8 @@ def analyzer_viz_egraph_graphviz : Flag<["-"], "analyzer-viz-egraph-graphviz">,
   HelpText<"Display exploded graph using GraphViz">,
   MarshallingInfoFlag<"AnalyzerOpts->visualizeExplodedGraphWithGraphViz">;
 def analyzer_dump_egraph : Separate<["-"], "analyzer-dump-egraph">,
-  HelpText<"Dump exploded graph to the specified file">;
+  HelpText<"Dump exploded graph to the specified file">,
+  MarshallingInfoString<"AnalyzerOpts->DumpExplodedGraphTo">;
 def analyzer_dump_egraph_EQ : Joined<["-"], "analyzer-dump-egraph=">, Alias<analyzer_dump_egraph>;
 
 def analyzer_inline_max_stack_depth : Separate<["-"], "analyzer-inline-max-stack-depth">,

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -272,6 +272,15 @@ static void denormalizeSimpleEnumJoined(SmallVectorImpl<const char *> &Args,
                      "the tablegen option description");
 }
 
+static Optional<std::string> normalizeString(OptSpecifier Opt, int TableIndex,
+                                             const ArgList &Args,
+                                             DiagnosticsEngine &Diags) {
+  auto *Arg = Args.getLastArg(Opt);
+  if (!Arg)
+    return None;
+  return std::string(Arg->getValue());
+}
+
 static void denormalizeString(SmallVectorImpl<const char *> &Args,
                               const char *Spelling,
                               CompilerInvocation::StringAllocator SA,
@@ -498,8 +507,6 @@ static bool ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args,
         .Case("false", false)
         .Default(false);
 
-  Opts.DumpExplodedGraphTo =
-      std::string(Args.getLastArgValue(OPT_analyzer_dump_egraph));
   Opts.AnalyzeSpecificFunction =
       std::string(Args.getLastArgValue(OPT_analyze_function));
   Opts.maxBlockVisitOnPath =
@@ -1869,10 +1876,6 @@ bool clang::ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
   return Success;
 }
 
-static void ParseFileSystemArgs(FileSystemOptions &Opts, ArgList &Args) {
-  Opts.WorkingDir = std::string(Args.getLastArgValue(OPT_working_directory));
-}
-
 /// Parse the argument to the -ftest-module-file-extension
 /// command-line argument.
 ///
@@ -3832,7 +3835,6 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res,
   Success &= ParseDiagnosticArgs(Res.getDiagnosticOpts(), Args, &Diags,
                                  /*DefaultDiagColor=*/false);
   ParseCommentArgs(LangOpts.CommentOpts, Args);
-  ParseFileSystemArgs(Res.getFileSystemOpts(), Args);
   // FIXME: We shouldn't have to pass the DashX option around here
   InputKind DashX = ParseFrontendArgs(Res.getFrontendOpts(), Args, Diags,
                                       LangOpts.IsHeaderFile);

diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -509,24 +509,31 @@ set(aarch64_SOURCES
 )
 
 # Generate outline atomics helpers from lse.S base
+set(CUSTOM_FLAGS ${CMAKE_C_FLAGS})
+if(NOT ANDROID)
+  append_list_if(COMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG -DVISIBILITY_HIDDEN CUSTOM_FLAGS)
+endif()
+append_list_if(COMPILER_RT_HAS_ASM_LSE -DHAS_ASM_LSE CUSTOM_FLAGS)
+string(REPLACE " " "\t" CUSTOM_FLAGS "${CUSTOM_FLAGS}")
 set(OA_HELPERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/outline_atomic_helpers.dir")
-file(MAKE_DIRECTORY "${OA_HELPERS_DIR}")
+file(MAKE_DIRECTORY ${OA_HELPERS_DIR})
 
 foreach(pat cas swp ldadd ldclr ldeor ldset)
   foreach(size 1 2 4 8 16)
     foreach(model 1 2 3 4)
       if(pat STREQUAL "cas" OR NOT size STREQUAL "16")
-        set(helper_asm "${OA_HELPERS_DIR}/outline_atomic_${pat}${size}_${model}.S")
+        set(helper_asm ${OA_HELPERS_DIR}/outline_atomic_${pat}${size}_${model}.S)
         add_custom_command(
           OUTPUT ${helper_asm}
-          COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/aarch64/lse.S" "${helper_asm}"
+          COMMAND ${CMAKE_C_COMPILER} -E ${CUSTOM_FLAGS} -DL_${pat} -DSIZE=${size} -DMODEL=${model}
+                  ${CMAKE_CURRENT_SOURCE_DIR}/aarch64/lse.S -o ${helper_asm}
+          DEPENDS aarch64/lse.S assembly.h
         )
-        set_source_files_properties("${helper_asm}"
-          PROPERTIES
-          COMPILE_DEFINITIONS "L_${pat};SIZE=${size};MODEL=${model}"
-          INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}"
+        set_source_files_properties(${helper_asm} PROPERTIES GENERATED TRUE)
+        set(aarch64_SOURCES
+          ${aarch64_SOURCES}
+          ${helper_asm}
         )
-        list(APPEND aarch64_SOURCES "${helper_asm}")
       endif()
     endforeach(model)
   endforeach(size)
@@ -680,8 +687,6 @@ else ()
     append_list_if(COMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG VISIBILITY_HIDDEN BUILTIN_DEFS)
   endif()
 
-  append_list_if(COMPILER_RT_HAS_ASM_LSE HAS_ASM_LSE BUILTIN_DEFS)
-
   foreach (arch ${BUILTIN_SUPPORTED_ARCH})
     if (CAN_TARGET_${arch})
       # For ARM archs, exclude any VFP builtins if VFP is not supported

diff --git a/compiler-rt/lib/builtins/aarch64/lse.S b/compiler-rt/lib/builtins/aarch64/lse.S
@@ -2,7 +2,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "assembly.h"
+#include "../assembly.h"
 
 // Out-of-line LSE atomics helpers. Ported from libgcc library.
 // N = {1, 2, 4, 8}

diff --git a/compiler-rt/lib/xray/xray_x86_64.inc b/compiler-rt/lib/xray/xray_x86_64.inc
@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 #include <cstdint>
-#include <x86intrin.h>
 
 #include "sanitizer_common/sanitizer_internal_defs.h"
 #include "xray_defs.h"

diff --git a/lld/test/ELF/arm-abs32-dyn.s b/lld/test/ELF/arm-abs32-dyn.s
@@ -26,7 +26,7 @@ bar:
 // CHECK:      Dynamic Relocations {
 // CHECK-NEXT:   0x30204 R_ARM_RELATIVE
 // CHECK-NEXT:   0x30208 R_ARM_RELATIVE
-// CHECK-NEXT:   0x30200 R_ARM_ABS32 foo 0x0
+// CHECK-NEXT:   0x30200 R_ARM_ABS32 foo
 // CHECK-NEXT: }
 
 // CHECK:      Symbols [

diff --git a/lld/test/ELF/arm-copy.s b/lld/test/ELF/arm-copy.s
@@ -38,13 +38,11 @@ _start:
 // CHECK-NEXT:      Offset: 0x40220
 // CHECK-NEXT:      Type: R_ARM_COPY
 // CHECK-NEXT:      Symbol: y
-// CHECK-NEXT:      Addend: 0x0
 // CHECK-NEXT:    }
 // CHECK-NEXT:    Relocation {
 // CHECK-NEXT:      Offset: 0x40224
 // CHECK-NEXT:      Type: R_ARM_COPY
 // CHECK-NEXT:      Symbol: z
-// CHECK-NEXT:      Addend: 0x0
 // CHECK-NEXT:    }
 // CHECK-NEXT:  }
 

diff --git a/lld/test/ELF/arm-gnu-ifunc-plt.s b/lld/test/ELF/arm-gnu-ifunc-plt.s
@@ -10,14 +10,14 @@
 // Check that the IRELATIVE relocations are last in the .got
 // CHECK: Relocations [
 // CHECK-NEXT:   Section (5) .rel.dyn {
-// CHECK-NEXT:     0x302E0 R_ARM_GLOB_DAT bar2 0x0
-// CHECK-NEXT:     0x302E4 R_ARM_GLOB_DAT zed2 0x0
-// CHECK-NEXT:     0x302E8 R_ARM_IRELATIVE - 0x0
-// CHECK-NEXT:     0x302EC R_ARM_IRELATIVE - 0x0
+// CHECK-NEXT:     0x302E0 R_ARM_GLOB_DAT bar2
+// CHECK-NEXT:     0x302E4 R_ARM_GLOB_DAT zed2
+// CHECK-NEXT:     0x302E8 R_ARM_IRELATIVE -
+// CHECK-NEXT:     0x302EC R_ARM_IRELATIVE -
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section (6) .rel.plt {
-// CHECK-NEXT:     0x402FC R_ARM_JUMP_SLOT bar2 0x0
-// CHECK-NEXT:     0x40300 R_ARM_JUMP_SLOT zed2 0x0
+// CHECK-NEXT:     0x402FC R_ARM_JUMP_SLOT bar2
+// CHECK-NEXT:     0x40300 R_ARM_JUMP_SLOT zed2
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 

diff --git a/lld/test/ELF/arm-got-relative.s b/lld/test/ELF/arm-got-relative.s
@@ -28,7 +28,7 @@ function:
  bx lr
 
 // CHECK: Dynamic Relocations {
-// CHECK-NEXT:  0x2020C R_ARM_GLOB_DAT function 0x0
+// CHECK-NEXT:  0x2020C R_ARM_GLOB_DAT function
 
 // CHECK: Name: _GLOBAL_OFFSET_TABLE_
 // CHECK-NEXT:    Value: 0x2020C

diff --git a/lld/test/ELF/arm-plt-reloc.s b/lld/test/ELF/arm-plt-reloc.s
@@ -101,9 +101,9 @@ _start:
 // DSOREL-NEXT:    EntrySize:
 // DSOREL:  Relocations [
 // DSOREL-NEXT:  Section {{.*}} .rel.plt {
-// DSOREL-NEXT:    0x302E4 R_ARM_JUMP_SLOT func1 0x0
-// DSOREL-NEXT:    0x302E8 R_ARM_JUMP_SLOT func2 0x0
-// DSOREL-NEXT:    0x302EC R_ARM_JUMP_SLOT func3 0x0
+// DSOREL-NEXT:    0x302E4 R_ARM_JUMP_SLOT func1
+// DSOREL-NEXT:    0x302E8 R_ARM_JUMP_SLOT func2
+// DSOREL-NEXT:    0x302EC R_ARM_JUMP_SLOT func3
 
 // Test a large separation between the .plt and .got.plt
 // The .got.plt and .plt displacement is large but still within the range
@@ -170,9 +170,9 @@ _start:
 // DSORELHIGH-NEXT:     Address: 0x1100000
 // DSORELHIGH: Relocations [
 // DSORELHIGH-NEXT:   Section {{.*}} .rel.plt {
-// DSORELHIGH-NEXT:     0x110000C R_ARM_JUMP_SLOT func1 0x0
-// DSORELHIGH-NEXT:     0x1100010 R_ARM_JUMP_SLOT func2 0x0
-// DSORELHIGH-NEXT:     0x1100014 R_ARM_JUMP_SLOT func3 0x0
+// DSORELHIGH-NEXT:     0x110000C R_ARM_JUMP_SLOT func1
+// DSORELHIGH-NEXT:     0x1100010 R_ARM_JUMP_SLOT func2
+// DSORELHIGH-NEXT:     0x1100014 R_ARM_JUMP_SLOT func3
 
 // Test a very large separation between the .plt and .got.plt so we must use
 // large plt entries that do not have any range restriction.
@@ -238,9 +238,9 @@ _start:
 // DSORELLONG-NEXT:     Address: 0x11111100
 // DSORELLONG: Relocations [
 // DSORELLONG-NEXT:   Section {{.*}} .rel.plt {
-// DSORELLONG-NEXT:     0x1111110C R_ARM_JUMP_SLOT func1 0x0
-// DSORELLONG-NEXT:     0x11111110 R_ARM_JUMP_SLOT func2 0x0
-// DSORELLONG-NEXT:     0x11111114 R_ARM_JUMP_SLOT func3 0x0
+// DSORELLONG-NEXT:     0x1111110C R_ARM_JUMP_SLOT func1
+// DSORELLONG-NEXT:     0x11111110 R_ARM_JUMP_SLOT func2
+// DSORELLONG-NEXT:     0x11111114 R_ARM_JUMP_SLOT func3
 
 // Test a separation between the .plt and .got.plt that is part in range of
 // short table entries and part needing long entries. We use the long entries
@@ -306,6 +306,6 @@ _start:
 // DSORELMIX-NEXT:     ]
 // DSORELMIX-NEXT:     Address: 0x8002020
 // DSORELMIX:   Section {{.*}} .rel.plt {
-// DSORELMIX-NEXT:     0x800202C R_ARM_JUMP_SLOT func1 0x0
-// DSORELMIX-NEXT:     0x8002030 R_ARM_JUMP_SLOT func2 0x0
-// DSORELMIX-NEXT:     0x8002034 R_ARM_JUMP_SLOT func3 0x0
+// DSORELMIX-NEXT:     0x800202C R_ARM_JUMP_SLOT func1
+// DSORELMIX-NEXT:     0x8002030 R_ARM_JUMP_SLOT func2
+// DSORELMIX-NEXT:     0x8002034 R_ARM_JUMP_SLOT func3
diff --git a/lld/test/ELF/arm-target1.s b/lld/test/ELF/arm-target1.s
@@ -15,7 +15,7 @@
 
 // RELOC: Relocations [
 // RELOC:   .rel.text {
-// RELOC:     0x0 R_ARM_TARGET1 patatino 0x0
+// RELOC:     0x0 R_ARM_TARGET1 patatino
 // RELOC:   }
 // RELOC: ]
 

diff --git a/lld/test/ELF/arm-thumb-plt-reloc.s b/lld/test/ELF/arm-thumb-plt-reloc.s
@@ -109,6 +109,6 @@ _start:
 // DSOREL-NEXT:    EntrySize:
 // DSOREL:  Relocations [
 // DSOREL-NEXT:  Section (5) .rel.plt {
-// DSOREL-NEXT:    0x302E4 R_ARM_JUMP_SLOT func1 0x0
-// DSOREL-NEXT:    0x302E8 R_ARM_JUMP_SLOT func2 0x0
-// DSOREL-NEXT:    0x302EC R_ARM_JUMP_SLOT func3 0x0
+// DSOREL-NEXT:    0x302E4 R_ARM_JUMP_SLOT func1
+// DSOREL-NEXT:    0x302E8 R_ARM_JUMP_SLOT func2
+// DSOREL-NEXT:    0x302EC R_ARM_JUMP_SLOT func3
diff --git a/lld/test/ELF/arm-tls-ldm32.s b/lld/test/ELF/arm-tls-ldm32.s
@@ -55,7 +55,7 @@ x:
 // SEC:      Size: 4
 
 // SEC: Dynamic Relocations {
-// SEC-NEXT:  0x20224 R_ARM_TLS_DTPMOD32 - 0x0
+// SEC-NEXT:  0x20224 R_ARM_TLS_DTPMOD32 -
 
 // CHECK: Disassembly of section .text:
 // CHECK-EMPTY:

diff --git a/lld/test/ELF/dynamic-got.s b/lld/test/ELF/dynamic-got.s
@@ -44,7 +44,7 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.dyn {
-// CHECK-NEXT:     0x21C4 R_386_RELATIVE - 0x0
+// CHECK-NEXT:     0x21C4 R_386_RELATIVE -
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 

diff --git a/lld/test/ELF/gnu-ifunc-plt-i386.s b/lld/test/ELF/gnu-ifunc-plt-i386.s
@@ -16,13 +16,13 @@
 /// other regular relocations (e.g. GLOB_DAT).
 // CHECK: Relocations [
 // CHECK-NEXT:   Section (4) .rel.dyn {
-// CHECK-NEXT:     0x4022C8 R_386_GLOB_DAT bar3 0x0
-// CHECK-NEXT:     0x4032E0 R_386_IRELATIVE - 0x0
-// CHECK-NEXT:     0x4032E4 R_386_IRELATIVE - 0x0
+// CHECK-NEXT:     0x4022C8 R_386_GLOB_DAT bar3
+// CHECK-NEXT:     0x4032E0 R_386_IRELATIVE -
+// CHECK-NEXT:     0x4032E4 R_386_IRELATIVE -
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section (5) .rel.plt {
-// CHECK-NEXT:     0x4032D8 R_386_JUMP_SLOT bar2 0x0
-// CHECK-NEXT:     0x4032DC R_386_JUMP_SLOT zed2 0x0
+// CHECK-NEXT:     0x4032D8 R_386_JUMP_SLOT bar2
+// CHECK-NEXT:     0x4032DC R_386_JUMP_SLOT zed2
 // CHECK-NEXT:   }
 
 // Check that IRELATIVE .got.plt entries point to ifunc resolver and not

diff --git a/lld/test/ELF/i386-got-value.s b/lld/test/ELF/i386-got-value.s
@@ -24,7 +24,7 @@
 # CHECK-NEXT:   0000: 00000000
 # CHECK-NEXT: )
 
-# CHECK: R_386_GLOB_DAT bar 0x0
+# CHECK: R_386_GLOB_DAT bar
 
         movl    bar@GOT(%eax), %eax
 

diff --git a/lld/test/ELF/i386-plt.s b/lld/test/ELF/i386-plt.s
@@ -43,8 +43,8 @@
 // &.got.plt[4] = 0x403278 + 16 = 0x403288
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.plt {
-// CHECK-NEXT:     0x403284 R_386_JUMP_SLOT bar 0x0
-// CHECK-NEXT:     0x403288 R_386_JUMP_SLOT zed 0x0
+// CHECK-NEXT:     0x403284 R_386_JUMP_SLOT bar
+// CHECK-NEXT:     0x403288 R_386_JUMP_SLOT zed
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
@@ -113,8 +113,8 @@
 // 0x3000 + got.plt.reserved(12) + 4 = 0x3010
 // CHECKSHARED:        Relocations [
 // CHECKSHARED-NEXT:     Section ({{.*}}) .rel.plt {
-// CHECKSHARED-NEXT:       0x329C R_386_JUMP_SLOT bar 0x0
-// CHECKSHARED-NEXT:       0x32A0 R_386_JUMP_SLOT zed 0x0
+// CHECKSHARED-NEXT:       0x329C R_386_JUMP_SLOT bar
+// CHECKSHARED-NEXT:       0x32A0 R_386_JUMP_SLOT zed
 // CHECKSHARED-NEXT:     }
 // CHECKSHARED-NEXT:   ]
 

diff --git a/lld/test/ELF/i386-relative.s b/lld/test/ELF/i386-relative.s
@@ -5,7 +5,7 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.dyn {
-// CHECK-NEXT:     R_386_RELATIVE - 0x0
+// CHECK-NEXT:     R_386_RELATIVE -
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 

diff --git a/lld/test/ELF/i386-tls-dynamic.s b/lld/test/ELF/i386-tls-dynamic.s
@@ -66,13 +66,13 @@ addl tls1@gotntpoff(%ebx),%eax
 
 # CHECK: Relocations [
 # CHECK:      Section ({{.+}}) .rel.dyn {
-# CHECK-NEXT: 0x2368 R_386_TLS_DTPMOD32 - 0x0
-# CHECK-NEXT: 0x2358 R_386_TLS_DTPMOD32 tls0 0x0
-# CHECK-NEXT: 0x235C R_386_TLS_DTPOFF32 tls0 0x0
-# CHECK-NEXT: 0x2370 R_386_TLS_TPOFF tls0 0x0
-# CHECK-NEXT: 0x2360 R_386_TLS_DTPMOD32 tls1 0x0
-# CHECK-NEXT: 0x2364 R_386_TLS_DTPOFF32 tls1 0x0
-# CHECK-NEXT: 0x2374 R_386_TLS_TPOFF tls1 0x0
+# CHECK-NEXT: 0x2368 R_386_TLS_DTPMOD32 -
+# CHECK-NEXT: 0x2358 R_386_TLS_DTPMOD32 tls0
+# CHECK-NEXT: 0x235C R_386_TLS_DTPOFF32 tls0
+# CHECK-NEXT: 0x2370 R_386_TLS_TPOFF tls0
+# CHECK-NEXT: 0x2360 R_386_TLS_DTPMOD32 tls1
+# CHECK-NEXT: 0x2364 R_386_TLS_DTPOFF32 tls1
+# CHECK-NEXT: 0x2374 R_386_TLS_TPOFF tls1
 # CHECK-NEXT: }
 
 # DIS:      Disassembly of section .text:

diff --git a/lld/test/ELF/i386-tls-gdiele.s b/lld/test/ELF/i386-tls-gdiele.s
@@ -8,8 +8,8 @@
 
 // NORELOC:      Relocations [
 // NORELOC-NEXT: Section ({{.*}}) .rel.dyn {
-// NORELOC-NEXT:   0x402258 R_386_TLS_TPOFF tlsshared0 0x0
-// NORELOC-NEXT:   0x40225C R_386_TLS_TPOFF tlsshared1 0x0
+// NORELOC-NEXT:   0x402258 R_386_TLS_TPOFF tlsshared0
+// NORELOC-NEXT:   0x40225C R_386_TLS_TPOFF tlsshared1
 // NORELOC-NEXT:   }
 // NORELOC-NEXT: ]
 

diff --git a/lld/test/ELF/i386-tls-ie-local.s b/lld/test/ELF/i386-tls-ie-local.s
@@ -22,8 +22,8 @@
 # CHECK-NEXT:   0000: 00000000 04000000
 # CHECK-NEXT: )
 
-# CHECK:      R_386_TLS_TPOFF - 0x0
-# CHECK-NEXT: R_386_TLS_TPOFF - 0x0
+# CHECK:      R_386_TLS_TPOFF -
+# CHECK-NEXT: R_386_TLS_TPOFF -
 
 	movl	bar1@GOTNTPOFF(%eax), %ecx
 	movl	bar2@GOTNTPOFF(%eax), %eax