Index: ELF/Config.h
===================================================================
--- ELF/Config.h
+++ ELF/Config.h
@@ -136,6 +136,7 @@
   uint16_t EMachine = llvm::ELF::EM_NONE;
   uint64_t EntryAddr = 0;
   uint64_t ImageBase;
+  uint64_t MaxPageSize;
   uint64_t ZStackSize = -1;
   unsigned LtoJobs;
   unsigned LtoO;
Index: ELF/Driver.cpp
===================================================================
--- ELF/Driver.cpp
+++ ELF/Driver.cpp
@@ -646,6 +646,15 @@
   for (auto *Arg : Args.filtered(OPT_trace_symbol))
     Symtab.trace(Arg->getValue());
 
+  // Initialize Config->MaxPageSize. The default value is defined by the
+  // target, but it can be overriden using the -z max-page-size option.
+  if (Optional<StringRef> Value = getZOptionValue(Args, "max-page-size")) {
+    if (Value->getAsInteger(0, Config->MaxPageSize))
+      error("invalid max page size: " + *Value);
+  } else {
+    Config->MaxPageSize = Target->MaxPageSize;
+  }
+
   // Initialize Config->ImageBase.
   if (auto *Arg = Args.getLastArg(OPT_image_base)) {
     StringRef S = Arg->getValue();
Index: ELF/LinkerScript.cpp
===================================================================
--- ELF/LinkerScript.cpp
+++ ELF/LinkerScript.cpp
@@ -1416,7 +1416,7 @@
   if (S == "COMMONPAGESIZE")
     return Target->PageSize;
   if (S == "MAXPAGESIZE")
-    return Target->MaxPageSize;
+    return Config->MaxPageSize;
   error("unknown constant: " + S);
   return 0;
 }
Index: test/ELF/linkerscript/zmax-page-size.s
===================================================================
--- /dev/null
+++ test/ELF/linkerscript/zmax-page-size.s
@@ -0,0 +1,14 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+
+# RUN: echo "SECTIONS { \
+# RUN:         symbol = CONSTANT(MAXPAGESIZE); \
+# RUN:       }" > %t.script
+# RUN: ld.lld -z max-page-size=0x1234 -o %t1 --script %t.script %t
+# RUN: llvm-objdump -t %t1 | FileCheck %s
+
+# CHECK: 0000000000001234 *ABS* 00000000 symbol
+
+.global _start
+_start:
+ nop