[lld-macho] Implement builtin section renaming

[gkm]

Summary

ld64 automatically renames many sections depending on output type and assorted flags. Here, we implement the most common configs. We can add more obscure flags and behaviors as needed.

Depends on D101393

[int3]

I think we should implement features on an as-needed basis. E.g. we aren't likely to support MH_KEXT_BUNDLE or MH_DYLINKER any time in the near future, so I don't think adding code for them is worthwhile.

Do we have use cases for -data_const and -text_exec? Also, what exactly are shared regions?

[gkm]

This comment was removed by gkm.

[gkm]

In D101395#2720897, @int3 wrote:

I think we should implement features on an as-needed basis. E.g. we aren't likely to support MH_KEXT_BUNDLE or MH_DYLINKER any time in the near future, so I don't think adding code for them is worthwhile.

Done.

Do we have use cases for -data_const and -text_exec? Also, what exactly are shared regions?

• I implemented __DATA -> __DATA_CONST renames since it's default behavior for all PIE executables, so seemed important. Regarding the command-line options, if nothing else, -data_const and -no_data_const are are useful for explicit control of the feature for the test, though without them I can also disable it for executables with -no_pie.

• I don't know the uses cases for -text_exec. I removed it from this diff.

• Shared regions are related to dyld shared cache, and again, I don't know that it's useful now, so I removed it from this diff.

[gkm]

• revise according to review feedback

[gkm]

lld/MachO/MergedOutputSection.cpp

57–64

This has no test. It feels like overkill to make a testcase for it. This is a bug fix discovered during testing section renames. The old message appeared as ...

Cannot add merge section; inconsistent type flags ^@

Where the section type was a raw NUL (0) byte, and clearly wrong.

[gkm]

• Add a test for error diagnistic when merging sections with mismatched types

[gkm]

lld/MachO/MergedOutputSection.cpp

57–64

After adding section names to the diagnostic message, I went ahead and added a test case. ;)

[int3]

Yeah keeping -data_const makes sense. Thanks for removing the rest :)

lld/MachO/Driver.cpp

561–562

Our implementation does so too, right? Would be good to make that explicit... also I think this comment would make more sense at the point where we invoke initializeSectionRenameMap to highlight that we are calling it before handling OPT_rename_section

567–573

nit: I think this would be cleaner as a separately-declared array

578–580

Do we really need to discuss ld64's implementation details here?

799

I think we're unlikely to support -preload any time soon either

802

maybe "unsupported output type when trying to determine data-const"?

lld/MachO/MergedOutputSection.cpp

26–28

intentional change?

57–64

Thanks! I think it's good to test error messages, particularly since they're infrequently executed on typical inputs. (The fact that you discovered a latent bug further demonstrates this :) )

nit: no need for llvm::

lld/test/MachO/builtin-rename.s

6

why the 2>/dev/null?

26–28

[gkm]

• Revise according to review feedback

[int3]

lgtm

lld/MachO/MergedOutputSection.cpp

57–64

reminder to remove llvm:: :)

69–70

ditto (remove llvm::)

[gkm]

lld/MachO/MergedOutputSection.cpp

26–28

Yes, though semi-gratuitous. I like seeing all the simple assignments from both sides if the if (inputs.empty()) stacked together.

lld/test/MachO/builtin-rename.s

6

Copy pasta.

26–28

Ugh. Thanx. Case-insensitive filesystem names suck.

lld/MachO/Config.h

struct Configuration {
   bool printWhyLoad = false;
   bool searchDylibsFirst = false;
   bool saveTemps = false;
   bool adhocCodesign = false;
   bool emitFunctionStarts = false;
   bool emitBitcodeBundle = false;
   bool emitEncryptionInfo = false;
   bool timeTraceEnabled = false;
+  bool dataConst = false;
   uint32_t headerPad;
   uint32_t dylibCompatibilityVersion = 0;
   uint32_t dylibCurrentVersion = 0;
   uint32_t timeTraceGranularity = 500;
   std::string progName;
   llvm::StringRef installName;
   llvm::StringRef mapFile;
   llvm::StringRef outputFile;

lld/MachO/Driver.cpp

for (Symbol *sym : symtab->getSymbols()) {
     replaceSymbol<Defined>(sym, sym->getName(), isec->file, isec, /*value=*/0,
                            /*size=*/0,
                            /*isWeakDef=*/false,
                            /*isExternal=*/true, common->privateExtern,
                            /*isThumb=*/false);
   }
 }
 
+static void initializeSectionRenameMap() {
+  if (config->dataConst) {
+    SmallVector<StringRef> v{section_names::got,
+                             section_names::authGot,
+                             section_names::authPtr,
+                             section_names::nonLazySymbolPtr,
+                             section_names::const_,
+                             section_names::cfString,
+                             section_names::moduleInitFunc,
+                             section_names::moduleTermFunc,
+                             section_names::objcClassList,
+                             section_names::objcNonLazyClassList,
+                             section_names::objcCatList,
+                             section_names::objcNonLazyCatList,
+                             section_names::objcProtoList,
+                             section_names::objcImageInfo};
+    for (StringRef s : v)
+      config->sectionRenameMap[{segment_names::data, s}] = {
+          segment_names::dataConst, s};
+  }
+  config->sectionRenameMap[{segment_names::text, section_names::staticInit}] = {
+      segment_names::text, section_names::text};
+  config->sectionRenameMap[{segment_names::import, section_names::pointers}] = {
+      config->dataConst ? segment_names::dataConst : segment_names::data,
+      section_names::nonLazySymbolPtr};
+}
+
 static inline char toLowerDash(char x) {
   if (x >= 'A' && x <= 'Z')
     return x - 'A' + 'a';
   else if (x == ' ')
     return '-';
   return x;
 }
 
for (char c : protStr) {
     default:
       error("unknown -segprot letter '" + Twine(c) + "' in " + protStr);
       return 0;
     }
   }
   return prot;
 }
 
+static bool dataConstDefault(const InputArgList &args) {
+  switch (config->outputType) {
+  case MH_EXECUTE:
+    return !args.hasArg(OPT_no_pie);
+  case MH_BUNDLE:
+    // FIXME: return false when -final_name ...
+    // has prefix "/System/Library/UserEventPlugins/"
+    // or matches "/usr/libexec/locationd" "/usr/libexec/terminusd"
+    return true;
+  case MH_DYLIB:
+    return true;
+  case MH_OBJECT:
+    return false;
+  default:
+    llvm_unreachable(
+        "unsupported output type for determining data-const default");
+  }
+  return false;
+}
+
 void SymbolPatterns::clear() {
   literals.clear();
   globs.clear();
 }
 
 void SymbolPatterns::insert(StringRef symbolName) {
   if (symbolName.find_first_of("*?[]") == StringRef::npos)
     literals.insert(CachedHashStringRef(symbolName));
if (const Arg *arg =
           args.getLastArg(OPT_search_paths_first, OPT_search_dylibs_first))
     config->searchDylibsFirst =
         arg->getOption().getID() == OPT_search_dylibs_first;
 
   config->dylibCompatibilityVersion =
       parseDylibVersion(args, OPT_compatibility_version);
   config->dylibCurrentVersion = parseDylibVersion(args, OPT_current_version);
 
+  config->dataConst =
+      args.hasFlag(OPT_data_const, OPT_no_data_const, dataConstDefault(args));
+  // Populate config->sectionRenameMap with builtin default renames.
+  // Options -rename_section and -rename_segment are able to override.
+  initializeSectionRenameMap();
   // Reject every special character except '.' and '$'
   // TODO(gkm): verify that this is the proper set of invalid chars
   StringRef invalidNameChars("!\"#%&'()*+,-/:;<=>?@[\\]^`{|}~");
   auto validName = [invalidNameChars](StringRef s) {
     if (s.find_first_of(invalidNameChars) != StringRef::npos)
       error("invalid name for segment or section: " + s);
     return s;
   };

lld/MachO/MergedOutputSection.h

public:
 
   std::vector<InputSection *> inputs;
 
   static bool classof(const OutputSection *sec) {
     return sec->kind() == MergedKind;
   }
 
 private:
-  void mergeFlags(uint32_t inputFlags);
+  void mergeFlags(InputSection *input);
 
   size_t size = 0;
   uint64_t fileSize = 0;
 };
 
 } // namespace macho
 } // namespace lld
 
 #endif

lld/MachO/MergedOutputSection.cpp

 //===- OutputSection.cpp --------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "MergedOutputSection.h"
+#include "OutputSegment.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Memory.h"
 #include "llvm/BinaryFormat/MachO.h"
+#include "llvm/Support/ScopedPrinter.h"
 
 using namespace llvm;
 using namespace llvm::MachO;
 using namespace lld;
 using namespace lld::macho;
 
 void MergedOutputSection::mergeInput(InputSection *input) {
   if (inputs.empty()) {
     align = input->align;
     flags = input->flags;
   } else {
-    mergeFlags(input->flags);
     align = std::max(align, input->align);
+    mergeFlags(input);
   }
 
   inputs.push_back(input);
   input->parent = this;
 }
 
 void MergedOutputSection::finalize() {
   uint64_t isecAddr = addr;
   uint64_t isecFileOff = fileOff;

 void MergedOutputSection::writeTo(uint8_t *buf) const {
   for (InputSection *isec : inputs)
     isec->writeTo(buf + isec->outSecFileOff);
 }
 
 // TODO: this is most likely wrong; reconsider how section flags
 // are actually merged. The logic presented here was written without
 // any form of informed research.
-void MergedOutputSection::mergeFlags(uint32_t inputFlags) {
-  uint8_t sectionFlag = SECTION_TYPE & inputFlags;
-  if (sectionFlag != (SECTION_TYPE & flags))
-    error("Cannot add merge section; inconsistent type flags " +
-          Twine(sectionFlag));
+void MergedOutputSection::mergeFlags(InputSection *input) {
+  uint8_t baseType = flags & SECTION_TYPE;
+  uint8_t inputType = input->flags & SECTION_TYPE;
+  if (baseType != inputType)
+    error("Cannot merge section " + input->name + " (type=0x" +
+          to_hexString(inputType) + ") into " + name + " (type=0x" +
+          to_hexString(baseType) + "): inconsistent types");
 
-  uint32_t inconsistentFlags = S_ATTR_DEBUG | S_ATTR_STRIP_STATIC_SYMS |
+  constexpr uint32_t strictFlags = S_ATTR_DEBUG | S_ATTR_STRIP_STATIC_SYMS |
                                    S_ATTR_NO_DEAD_STRIP | S_ATTR_LIVE_SUPPORT;
-  if ((inputFlags ^ flags) & inconsistentFlags)
-    error("Cannot add merge section; cannot merge inconsistent flags");
+  if ((input->flags ^ flags) & strictFlags)
+    error("Cannot merge section " + input->name + " (flags=0x" +
+          to_hexString(input->flags) + ") into " + name + " (flags=0x" +
+          to_hexString(flags) + "): strict flags differ");
 
   // Negate pure instruction presence if any section isn't pure.
-  uint32_t pureMask = ~S_ATTR_PURE_INSTRUCTIONS | (inputFlags & flags);
+  uint32_t pureMask = ~S_ATTR_PURE_INSTRUCTIONS | (input->flags & flags);
 
   // Merge the rest
-  flags |= inputFlags;
+  flags |= input->flags;
   flags &= pureMask;
 }

lld/MachO/Options.td

 def rename_segment : MultiArg<["-"], "rename_segment", 2>,
     MetaVarName<"<from_segment> <to_segment>">,
     HelpText<"Rename <from_segment> as <to_segment>">,
     Group<grp_rare>;
 def trace_symbol_layout : Flag<["-"], "trace_symbol_layout">,
     HelpText<"Show where and why symbols move, as specified by -move_to_ro_segment, -move_to_rw_segment, -rename_section, and -rename_segment">,
     Flags<[HelpHidden]>,
     Group<grp_rare>;
+def data_const : Flag<["-"], "data_const">,
+    HelpText<"Force migration of readonly data into __DATA_CONST segment">,
+    Group<grp_rare>;
+def no_data_const : Flag<["-"], "no_data_const">,
+    HelpText<"Block migration of readonly data away from __DATA segment">,
+    Group<grp_rare>;
+def text_exec : Flag<["-"], "text_exec">,
+    HelpText<"Rename __segment TEXT to __TEXT_EXEC for sections __text and __stubs">,
+    Flags<[HelpHidden]>,
+    Group<grp_rare>;
 def section_order : MultiArg<["-"], "section_order", 2>,
     MetaVarName<"<segment> <sections>">,
     HelpText<"With -preload, specify layout sequence of colon-separated <sections> in <segment>">,
     Flags<[HelpHidden]>,
     Group<grp_rare>;
 def segment_order : Separate<["-"], "segment_order">,
     MetaVarName<"<colon_separated_segment_list>">,
     HelpText<"With -preload, specify layout sequence of colon-separated <segments>">,

 def bitcode_verify : Flag<["-"], "bitcode_verify">,
     HelpText<"This option is undocumented in ld64">,
     Flags<[HelpHidden]>,
     Group<grp_undocumented>;
 def classic_linker : Flag<["-"], "classic_linker">,
     HelpText<"This option is undocumented in ld64">,
     Flags<[HelpHidden]>,
     Group<grp_undocumented>;
-def data_const : Flag<["-"], "data_const">,
-    HelpText<"This option is undocumented in ld64">,
-    Flags<[HelpHidden]>,
-    Group<grp_undocumented>;
-def no_data_const : Flag<["-"], "no_data_const">,
-    HelpText<"This option is undocumented in ld64">,
-    Flags<[HelpHidden]>,
-    Group<grp_undocumented>;
 def data_in_code_info : Flag<["-"], "data_in_code_info">,
     HelpText<"This option is undocumented in ld64">,
     Flags<[HelpHidden]>,
     Group<grp_undocumented>;
 def no_data_in_code_info : Flag<["-"], "no_data_in_code_info">,
     HelpText<"This option is undocumented in ld64">,
     Flags<[HelpHidden]>,
     Group<grp_undocumented>;

 def snapshot_dir : Flag<["-"], "snapshot_dir">,
     HelpText<"This option is undocumented in ld64">,
     Flags<[HelpHidden]>,
     Group<grp_undocumented>;
 def source_version : Flag<["-"], "source_version">,
     HelpText<"This option is undocumented in ld64">,
     Flags<[HelpHidden]>,
     Group<grp_undocumented>;
-def text_exec : Flag<["-"], "text_exec">,
-    HelpText<"This option is undocumented in ld64">,
-    Flags<[HelpHidden]>,
-    Group<grp_undocumented>;
 def threaded_starts_section : Flag<["-"], "threaded_starts_section">,
     HelpText<"This option is undocumented in ld64">,
     Flags<[HelpHidden]>,
     Group<grp_undocumented>;
 def verbose_optimization_hints : Flag<["-"], "verbose_optimization_hints">,
     HelpText<"This option is undocumented in ld64">,
     Flags<[HelpHidden]>,
     Group<grp_undocumented>;

lld/MachO/Writer.cpp

if (segname == segment_names::text) {
     return StringSwitch<int>(osec->name)
         .Case(section_names::header, -4)
         .Case(section_names::text, -3)
         .Case(section_names::stubs, -2)
         .Case(section_names::stubHelper, -1)
         .Case(section_names::unwindInfo, std::numeric_limits<int>::max() - 1)
         .Case(section_names::ehFrame, std::numeric_limits<int>::max())
         .Default(0);
-  } else if (segname == segment_names::data) {
+  } else if (segname == segment_names::data ||
+             segname == segment_names::dataConst) {
     // For each thread spawned, dyld will initialize its TLVs by copying the
     // address range from the start of the first thread-local data section to
     // the end of the last one. We therefore arrange these sections contiguously
     // to minimize the amount of memory used. Additionally, since zerofill
     // sections must be at the end of their segments, and since TLV data
     // sections can be zerofills, we end up putting all TLV data sections at the
     // end of the segment.
     switch (sectionType(osec->flags)) {

lld/test/MachO/builtin-rename.s

+# REQUIRES: x86
+# RUN: rm -rf %t; split-file %s %t
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin \
+# RUN:     %t/main.s -o %t/main.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin \
+# RUN:     %t/renames.s -o %t/renames.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin \
+# RUN:     %t/error.s -o %t/error.o
+
+# RUN: not %lld            -o %t/error %t/main.o %t/error.o -lSystem 2>&1 | \
+# RUN:     FileCheck %s --check-prefix=ERROR
+
+## Check the error diagnostic for merging mismatched section types
+# ERROR: Cannot merge section __pointers (type=0x0) into __nl_symbol_ptr (type=0x6): inconsistent types
+
+## Check that section and segment renames happen as expected
+# RUN: %lld                -o %t/ydata %t/main.o %t/renames.o -lSystem
+# RUN: %lld -no_data_const -o %t/ndata %t/main.o %t/renames.o -lSystem
+# RUN: %lld -no_pie        -o %t/nopie %t/main.o %t/renames.o -lSystem
+
+# RUN: llvm-objdump --syms %t/ydata | \
+# RUN:     FileCheck %s --check-prefixes=CHECK,YDATA
+# RUN: llvm-objdump --syms %t/ndata | \
+# RUN:     FileCheck %s --check-prefixes=CHECK,NDATA
+# RUN: llvm-objdump --syms %t/nopie | \
+# RUN:     FileCheck %s --check-prefixes=CHECK,NDATA
+
+# CHECK-LABEL: {{^}}SYMBOL TABLE:
+
+# CHECK-DAG: __TEXT,__text __TEXT__StaticInit
+
+# NDATA-DAG: __DATA,__auth_got __DATA__auth_got
+# NDATA-DAG: __DATA,__auth_ptr __DATA__auth_ptr
+# NDATA-DAG: __DATA,__nl_symbol_ptr __DATA__nl_symbol_ptr
+# NDATA-DAG: __DATA,__const __DATA__const
+# NDATA-DAG: __DATA,__cfstring __DATA__cfstring
+# NDATA-DAG: __DATA,__mod_init_func __DATA__mod_init_func
+# NDATA-DAG: __DATA,__mod_term_func __DATA__mod_term_func
+# NDATA-DAG: __DATA,__objc_classlist __DATA__objc_classlist
+# NDATA-DAG: __DATA,__objc_nlclslist __DATA__objc_nlclslist
+# NDATA-DAG: __DATA,__objc_catlist __DATA__objc_catlist
+# NDATA-DAG: __DATA,__objc_nlcatlist __DATA__objc_nlcatlist
+# NDATA-DAG: __DATA,__objc_protolist __DATA__objc_protolist
+# NDATA-DAG: __DATA,__objc_imageinfo __DATA__objc_imageinfo
+# NDATA-DAG: __DATA,__nl_symbol_ptr __IMPORT__pointers
+
+# YDATA-DAG: __DATA_CONST,__auth_got __DATA__auth_got
+# YDATA-DAG: __DATA_CONST,__auth_ptr __DATA__auth_ptr
+# YDATA-DAG: __DATA_CONST,__nl_symbol_ptr __DATA__nl_symbol_ptr
+# YDATA-DAG: __DATA_CONST,__const __DATA__const
+# YDATA-DAG: __DATA_CONST,__cfstring __DATA__cfstring
+# YDATA-DAG: __DATA_CONST,__mod_init_func __DATA__mod_init_func
+# YDATA-DAG: __DATA_CONST,__mod_term_func __DATA__mod_term_func
+# YDATA-DAG: __DATA_CONST,__objc_classlist __DATA__objc_classlist
+# YDATA-DAG: __DATA_CONST,__objc_nlclslist __DATA__objc_nlclslist
+# YDATA-DAG: __DATA_CONST,__objc_catlist __DATA__objc_catlist
+# YDATA-DAG: __DATA_CONST,__objc_nlcatlist __DATA__objc_nlcatlist
+# YDATA-DAG: __DATA_CONST,__objc_protolist __DATA__objc_protolist
+# YDATA-DAG: __DATA_CONST,__objc_imageinfo __DATA__objc_imageinfo
+# YDATA-DAG: __DATA_CONST,__nl_symbol_ptr __IMPORT__pointers
+
+#--- renames.s
+.section __DATA,__auth_got
+.global __DATA__auth_got
+__DATA__auth_got:
+  .space 8
+
+.section __DATA,__auth_ptr
+.global __DATA__auth_ptr
+__DATA__auth_ptr:
+  .space 8
+
+.section __DATA,__nl_symbol_ptr
+.global __DATA__nl_symbol_ptr
+__DATA__nl_symbol_ptr:
+  .space 8
+
+.section __DATA,__const
+.global __DATA__const
+__DATA__const:
+  .space 8
+
+.section __DATA,__cfstring
+.global __DATA__cfstring
+__DATA__cfstring:
+  .space 8
+
+# FIXME: error: conflicts with synthetic section ...
+# FIXME: we can't explicitly define syms in synthetic sections
+# COM: .section __DATA,__got
+# COM: .global __DATA__got
+# COM: __DATA__got:
+# COM:   .space 8
+
+.section __DATA,__mod_init_func,mod_init_funcs
+.global __DATA__mod_init_func
+__DATA__mod_init_func:
+  .space 8
+
+.section __DATA,__mod_term_func,mod_term_funcs
+.global __DATA__mod_term_func
+__DATA__mod_term_func:
+  .space 8
+
+.section __DATA,__objc_classlist
+.global __DATA__objc_classlist
+__DATA__objc_classlist:
+  .space 8
+
+.section __DATA,__objc_nlclslist
+.global __DATA__objc_nlclslist
+__DATA__objc_nlclslist:
+  .space 8
+
+.section __DATA,__objc_catlist
+.global __DATA__objc_catlist
+__DATA__objc_catlist:
+  .space 8
+
+.section __DATA,__objc_nlcatlist
+.global __DATA__objc_nlcatlist
+__DATA__objc_nlcatlist:
+  .space 8
+
+.section __DATA,__objc_protolist
+.global __DATA__objc_protolist
+__DATA__objc_protolist:
+  .space 8
+
+.section __DATA,__objc_imageinfo
+.global __DATA__objc_imageinfo
+__DATA__objc_imageinfo:
+  .space 8
+
+# FIXME: error: conflicts with synthetic section ...
+# FIXME: we can't explicitly define syms in synthetic sections
+# COM: .section __DATA,__la_symbol_ptr,lazy_symbol_pointers
+# COM: .global __DATA__la_symbol_ptr
+# COM: __DATA__la_symbol_ptr:
+# COM:   .space 8
+
+.section __IMPORT,__pointers,non_lazy_symbol_pointers
+.global __IMPORT__pointers
+__IMPORT__pointers:
+  .space 8
+
+.section __TEXT,__StaticInit
+.section __TEXT,__StaticInit
+.global __TEXT__StaticInit
+__TEXT__StaticInit:
+  .space 8
+
+#--- error.s
+
+.section __DATA,__nl_symbol_ptr
+.global __DATA__nl_symbol_ptr
+__DATA__nl_symbol_ptr:
+  .space 8
+
+.section __IMPORT,__pointers
+.global __IMPORT__pointers
+__IMPORT__pointers:
+  .space 8
+
+#--- main.s
+.text
+.global _main
+_main:
+  ret

lld/test/MachO/load-command-sequence.s

 # COMMON: cmd LC_SEGMENT_64
 # COMMON: segname __TEXT
 # COMMON: sectname __text
 # COMMON: segname __TEXT
 # COMMON: sectname __cstring
 # COMMON: segname __TEXT
 # COMMON: cmd LC_SEGMENT_64
 # COMMON: segname __DATA_CONST
+# COMMON: sectname __const
+# COMMON: segname __DATA_CONST
 # COMMON: sectname __got
 # COMMON: segname __DATA_CONST
 # COMMON: cmd LC_SEGMENT_64
 # COMMON: segname __DATA
 # COMMON: sectname __data
 # COMMON: segname __DATA
-# COMMON: sectname __const
-# COMMON: segname __DATA
 # COMMON: cmd LC_SEGMENT_64
 # COMMON: segname __LINKEDIT
 # COMMON: cmd LC_DYLD_INFO_ONLY
 # COMMON: cmd LC_SYMTAB
 # COMMON: cmd LC_DYSYMTAB
 
 # EXEC: cmd LC_LOAD_DYLINKER
 # EXEC: cmd LC_MAIN

lld/test/MachO/local-got.s

 # REQUIRES: x86
 # RUN: mkdir -p %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libhello.s \
 # RUN:   -o %t/libhello.o
 # RUN: %lld -lSystem -dylib -install_name \
 # RUN:   @executable_path/libhello.dylib %t/libhello.o -o %t/libhello.dylib
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/test.o
 
 # RUN: %lld -lSystem -o %t/test %t/test.o -L%t -lhello
 # RUN: llvm-objdump --macho --full-contents --rebase --bind %t/test | FileCheck %s --check-prefixes=CHECK,PIE --match-full-lines
-# RUN: %lld -no_pie -lSystem -o %t/test %t/test.o -L%t -lhello
+# RUN: %lld -no_pie -data_const -lSystem -o %t/test %t/test.o -L%t -lhello
 # RUN: llvm-objdump --macho --full-contents --rebase --bind %t/test | FileCheck %s --check-prefixes=CHECK,NO-PIE --match-full-lines
 
 ## Check that the GOT references the cstrings. --full-contents displays the
 ## address offset and the contents at that address very similarly, so am using
 ## --match-full-lines to make sure we match on the right thing.
 # CHECK:      Contents of section __TEXT,__cstring:
 # CHECK-NEXT: 100000434 {{.*}}
 

lld/test/MachO/x86-64-relocs.s

 ## Test extern (symbol) X86_64_RELOC_SIGNED
 # CHECK:       leaq [[#%u, STR_OFF:]](%rip), %rsi
 # CHECK-NEXT:  [[#%x, CSTRING_ADDR - STR_OFF]]
 ## Test non-extern (section) X86_64_RELOC_SIGNED
 # CHECK:       leaq [[#%u, LSTR_OFF:]](%rip), %rsi
 # CHECK-NEXT:  [[#%x, CSTRING_ADDR + 22 - LSTR_OFF]]
 
 # RUN: llvm-objdump --section=__const --full-contents %t | FileCheck %s --check-prefix=NONPCREL
-# NONPCREL:      Contents of section __DATA,__const:
+# NONPCREL:      Contents of section __DATA_CONST,__const:
 # NONPCREL-NEXT: 100001000 18040000 01000000 18040000 01000000
 
 .section __TEXT,__text
 .globl _main, _f
 _main:
   callq _f # X86_64_RELOC_BRANCH
   mov $0, %rax
   ret

lld/test/MachO/x86-64-stubs.s

 # REQUIRES: x86
 # RUN: rm -rf %t; mkdir -p %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libhello.s \
 # RUN:   -o %t/libhello.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libgoodbye.s \
 # RUN:   -o %t/libgoodbye.o
 # RUN: %lld -dylib \
 # RUN:   -install_name @executable_path/libhello.dylib %t/libhello.o \
 # RUN:   -o %t/libhello.dylib
 # RUN: %lld -dylib \
 # RUN:   -install_name @executable_path/libgoodbye.dylib %t/libgoodbye.o \
 # RUN:   -o %t/libgoodbye.dylib
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/dylink-lazy.o
-# RUN: %lld -no_pie -o %t/dylink-lazy-no-pie \
+# RUN: %lld -no_pie -data_const -o %t/dylink-lazy-no-pie \
 # RUN:   -L%t -lhello -lgoodbye %t/dylink-lazy.o -lSystem
 
 ## When looking at the __stubs section alone, we are unable to easily tell which
 ## symbol each entry points to. So we call objdump twice in order to get the
 ## disassembly of __text and the bind tables first, which allow us to check for
 ## matching entries in __stubs.
 # RUN: llvm-objdump -d --no-show-raw-insn --syms --rebase --bind --lazy-bind %t/dylink-lazy-no-pie > %t/objdump-no-pie
 # RUN: llvm-objdump -D --no-show-raw-insn %t/dylink-lazy-no-pie >> %t/objdump-no-pie