Merge lld r369828 and r371013 into 9.0

[DimitryAndric]

Bugzilla Link	43236
Resolution	FIXED
Resolved on	Sep 06, 2019 04:21
Version	unspecified
OS	All
Blocks	#41819
CC	@zmodem,@rui314,@smithp35

Extended Description

Please merge https://reviews.llvm.org/rLLD371013 ("Align output segments correctly") and its prerequisite https://reviews.llvm.org/rLLD369828 ("[ELF] Align the first section of a PT_LOAD even if its type is SHT_NOBITS") into lld 9.0.

This fixes bug 43212, which was about incorrectly aligned segments when the --omagic or --nmagic link options were used.

[DimitryAndric]

Hans, I'm not marking this as blocking for 9.0.0, but since I saw in another bug that you said "we are doing another release candidate", maybe this minor fix can still go in?

Otherwise, let's just keep it until 9.0.0 ships.

[zmodem]

Yes, there will be an rc4, so let's take these.

Merged in r371196 and r371197, respectively.