head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2019.11.03.12.10.29;	author kamil;	state dead;
branches;
next	1.1;
commitid	pSAz7RMpuekaVoJB;

1.1
date	2019.10.21.22.07.58;	author rjs;	state Exp;
branches;
next	;
commitid	Ygr4vZyn5JnEEMHB;


desc
@@


1.2
log
@lld: Sync local patches with merged and pending patches upstream

Cherry-pick upstream patch commit 2a0fcae3d4d1fd85d6ae8378d7c6f12430c0087d
[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STAC dummy option for an AArch64 erratum.

[LLD] Add NetBSD support as a new flavor of LLD (nb.lld)
https://reviews.llvm.org/D69755

Clang >=clang-9.0.0nb3 is required.
@
text
@$NetBSD: patch-ELF_Arch_AArch64.cpp,v 1.1 2019/10/21 22:07:58 rjs Exp $

Set correct base address on NetBSD.

--- ELF/Arch/AArch64.cpp.orig	2019-07-16 05:50:45.000000000 +0000
+++ ELF/Arch/AArch64.cpp
@@@@ -66,9 +66,12 @@@@ AArch64::AArch64() {
   pltHeaderSize = 32;
   defaultMaxPageSize = 65536;
 
-  // Align to the 2 MiB page size (known as a superpage or huge page).
-  // FreeBSD automatically promotes 2 MiB-aligned allocations.
-  defaultImageBase = 0x200000;
+  if (config->targetTriple.isOSNetBSD())
+    defaultImageBase = 0x200100000;
+  else
+    // Align to the 2 MiB page size (known as a superpage or huge page).
+    // FreeBSD automatically promotes 2 MiB-aligned allocations.
+    defaultImageBase = 0x200000;
 
   needsThunks = true;
 }
@


1.1
log
@Restore NetBSD patches.

Set correct link address for NetBSD/aarch64.
Add a dummy option for an aarch64 erratum for gcc compatibility.
@
text
@d1 1
a1 1
$NetBSD$
@