On 1 November 2017 at 15:13, Gao, Liming <liming....@intel.com> wrote: > Reviewed-by: Liming Gao <liming....@intel.com> >
Thanks - pushed as 3380a591232de2ab3007ab051010a67c3d000d1c >> -----Original Message----- >> From: Ard Biesheuvel [mailto:ard.biesheu...@linaro.org] >> Sent: Wednesday, November 1, 2017 11:01 PM >> To: edk2-devel@lists.01.org; leif.lindh...@linaro.org; Gao, Liming >> <liming....@intel.com>; Zhu, Yonghong >> <yonghong....@intel.com> >> Cc: daniel.thomp...@linaro.org; Ard Biesheuvel <ard.biesheu...@linaro.org> >> Subject: [PATCH] BaseTools/tools_def AARCH64 ARM: disable PIE linking for >> .aslc sources >> >> Commit 1894a7c64c0a ("BaseTools/tools_def AARCH64 ARM: disable PIE >> linking") works around an issue that was caught due to the fact that >> PIE linking produces broken .acpi files. However, v2 of that fix >> inadvertently only applied the workaround to the normal linker command >> line, and not to the ASLD one, so the issue still persists. >> >> So add the missing -no-pie options for ASLD on ARM and AARCH64. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> >> --- >> BaseTools/Conf/tools_def.template | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/BaseTools/Conf/tools_def.template >> b/BaseTools/Conf/tools_def.template >> index 98df0ffc9294..aebd7d558633 100755 >> --- a/BaseTools/Conf/tools_def.template >> +++ b/BaseTools/Conf/tools_def.template >> @@ -4498,8 +4498,8 @@ DEFINE GCC5_ARM_DLINK_FLAGS = >> DEF(GCC49_ARM_DLINK_FLAGS) -no-pie >> DEFINE GCC5_ARM_DLINK2_FLAGS = DEF(GCC49_ARM_DLINK2_FLAGS) >> -Wno-error >> DEFINE GCC5_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) >> -no-pie >> DEFINE GCC5_AARCH64_DLINK2_FLAGS = DEF(GCC49_AARCH64_DLINK2_FLAGS) >> -Wno-error >> -DEFINE GCC5_ARM_ASLDLINK_FLAGS = DEF(GCC49_ARM_ASLDLINK_FLAGS) >> -DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) >> +DEFINE GCC5_ARM_ASLDLINK_FLAGS = DEF(GCC49_ARM_ASLDLINK_FLAGS) -no-pie >> +DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) >> -no-pie >> >> >> #################################################################################### >> # >> -- >> 2.11.0 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
