1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH v3] BaseTools/GCC ARM/AARCH64: Force disable PIE

dann frazier posted 1 patch 6 years, 10 months ago
Failed in applying to current master (apply log)
BaseTools/Conf/tools_def.template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[edk2] [PATCH v3] BaseTools/GCC ARM/AARCH64: Force disable PIE
Posted by dann frazier 6 years, 10 months ago 
v3:
* Drop -static, no longer needed after:
  00b00cc5 BaseTools/Scripts: discard .gnu.hash section in GCC builds
v2:
* Replace -no-pie w/ -static for compat with GCC 4.9

After Debian's toolchain switched to PIE by default, our edk2 builds began
to fail to build (GCC49 w/ gcc 6.3). This patch fixes the build by forcing
off PIE for both ARM and AARCH64 builds.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: dann frazier <dannf@debian.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 4b1b7b548c..f68c836bca 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -4339,9 +4339,9 @@ DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-stri
 DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
 DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
 DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
-DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft
+DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -fno-pie
 DEFINE GCC_ARM_CC_XIPFLAGS         = -mno-unaligned-access
-DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-pic
+DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-pic -fno-pie
 DEFINE GCC_AARCH64_CC_XIPFLAGS     = -mstrict-align
 DEFINE GCC_DLINK_FLAGS_COMMON      = -nostdlib --pie
 DEFINE GCC_DLINK2_FLAGS_COMMON     = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds
-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v3] BaseTools/GCC ARM/AARCH64: Force disable PIE
Posted by Ard Biesheuvel 6 years, 10 months ago 
On 31 May 2017 at 16:57, dann frazier <dannf@debian.org> wrote:
> v3:
> * Drop -static, no longer needed after:
>   00b00cc5 BaseTools/Scripts: discard .gnu.hash section in GCC builds
> v2:
> * Replace -no-pie w/ -static for compat with GCC 4.9
>
> After Debian's toolchain switched to PIE by default, our edk2 builds began
> to fail to build (GCC49 w/ gcc 6.3). This patch fixes the build by forcing
> off PIE for both ARM and AARCH64 builds.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: dann frazier <dannf@debian.org>

Hi Dan,

This looks fine to me, although I only just spotted that ARM now uses
-fno-pie only, whereas AARCH64 uses -fno-pic -fno-pie. I'd prefer to
have the two aligned, but I can fix that up when committing.

Liming, Yonghong: any objections? If not, I will go ahead and merge it
(with -fno-pic added for ARM as well)

Thanks,
Ard.


> ---
>  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 4b1b7b548c..f68c836bca 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -4339,9 +4339,9 @@ DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-stri
>  DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
>  DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
>  DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
> -DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft
> +DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -fno-pie
>  DEFINE GCC_ARM_CC_XIPFLAGS         = -mno-unaligned-access
> -DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-pic
> +DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-pic -fno-pie
>  DEFINE GCC_AARCH64_CC_XIPFLAGS     = -mstrict-align
>  DEFINE GCC_DLINK_FLAGS_COMMON      = -nostdlib --pie
>  DEFINE GCC_DLINK2_FLAGS_COMMON     = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds
> --
> 2.11.0
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v3] BaseTools/GCC ARM/AARCH64: Force disable PIE
Posted by Gao, Liming 6 years, 10 months ago 
Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
>Sent: Thursday, June 01, 2017 1:31 AM
>To: dann frazier <dannf@debian.org>; Gao, Liming <liming.gao@intel.com>;
>Zhu, Yonghong <yonghong.zhu@intel.com>
>Cc: edk2-devel@lists.01.org <edk2-devel@ml01.01.org>; Leif Lindholm
><leif.lindholm@linaro.org>
>Subject: Re: [PATCH v3] BaseTools/GCC ARM/AARCH64: Force disable PIE
>
>On 31 May 2017 at 16:57, dann frazier <dannf@debian.org> wrote:
>> v3:
>> * Drop -static, no longer needed after:
>>   00b00cc5 BaseTools/Scripts: discard .gnu.hash section in GCC builds
>> v2:
>> * Replace -no-pie w/ -static for compat with GCC 4.9
>>
>> After Debian's toolchain switched to PIE by default, our edk2 builds began
>> to fail to build (GCC49 w/ gcc 6.3). This patch fixes the build by forcing
>> off PIE for both ARM and AARCH64 builds.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.0
>> Signed-off-by: dann frazier <dannf@debian.org>
>
>Hi Dan,
>
>This looks fine to me, although I only just spotted that ARM now uses
>-fno-pie only, whereas AARCH64 uses -fno-pic -fno-pie. I'd prefer to
>have the two aligned, but I can fix that up when committing.
>
>Liming, Yonghong: any objections? If not, I will go ahead and merge it
>(with -fno-pic added for ARM as well)
>
>Thanks,
>Ard.
>
>
>> ---
>>  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 4b1b7b548c..f68c836bca 100755
>> --- a/BaseTools/Conf/tools_def.template
>> +++ b/BaseTools/Conf/tools_def.template
>> @@ -4339,9 +4339,9 @@ DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-
>wchar -fno-builtin -fno-stri
>>  DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -
>malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-
>stack-arg-probe
>>  DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-
>zone -Wno-address -mno-stack-arg-probe
>>  DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-
>divide-min-latency
>> -DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-
>endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -
>fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft
>> +DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-
>endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -
>fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft
>-fno-pie
>>  DEFINE GCC_ARM_CC_XIPFLAGS         = -mno-unaligned-access
>> -DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-
>endian -fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections
>-fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-pic
>> +DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-
>endian -fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections
>-fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-pic -
>fno-pie
>>  DEFINE GCC_AARCH64_CC_XIPFLAGS     = -mstrict-align
>>  DEFINE GCC_DLINK_FLAGS_COMMON      = -nostdlib --pie
>>  DEFINE GCC_DLINK2_FLAGS_COMMON     = -Wl,--
>script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds
>> --
>> 2.11.0
>>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v3] BaseTools/GCC ARM/AARCH64: Force disable PIE
Posted by Ard Biesheuvel 6 years, 10 months ago 
On 1 June 2017 at 00:45, Gao, Liming <liming.gao@intel.com> wrote:
> Reviewed-by: Liming Gao <liming.gao@intel.com>
>

Pushed as a6b5380642c4

Thanks,
Ard.


>>-----Original Message-----
>>From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
>>Sent: Thursday, June 01, 2017 1:31 AM
>>To: dann frazier <dannf@debian.org>; Gao, Liming <liming.gao@intel.com>;
>>Zhu, Yonghong <yonghong.zhu@intel.com>
>>Cc: edk2-devel@lists.01.org <edk2-devel@ml01.01.org>; Leif Lindholm
>><leif.lindholm@linaro.org>
>>Subject: Re: [PATCH v3] BaseTools/GCC ARM/AARCH64: Force disable PIE
>>
>>On 31 May 2017 at 16:57, dann frazier <dannf@debian.org> wrote:
>>> v3:
>>> * Drop -static, no longer needed after:
>>>   00b00cc5 BaseTools/Scripts: discard .gnu.hash section in GCC builds
>>> v2:
>>> * Replace -no-pie w/ -static for compat with GCC 4.9
>>>
>>> After Debian's toolchain switched to PIE by default, our edk2 builds began
>>> to fail to build (GCC49 w/ gcc 6.3). This patch fixes the build by forcing
>>> off PIE for both ARM and AARCH64 builds.
>>>
>>> Contributed-under: TianoCore Contribution Agreement 1.0
>>> Signed-off-by: dann frazier <dannf@debian.org>
>>
>>Hi Dan,
>>
>>This looks fine to me, although I only just spotted that ARM now uses
>>-fno-pie only, whereas AARCH64 uses -fno-pic -fno-pie. I'd prefer to
>>have the two aligned, but I can fix that up when committing.
>>
>>Liming, Yonghong: any objections? If not, I will go ahead and merge it
>>(with -fno-pic added for ARM as well)
>>
>>Thanks,
>>Ard.
>>
>>
>>> ---
>>>  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 4b1b7b548c..f68c836bca 100755
>>> --- a/BaseTools/Conf/tools_def.template
>>> +++ b/BaseTools/Conf/tools_def.template
>>> @@ -4339,9 +4339,9 @@ DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-
>>wchar -fno-builtin -fno-stri
>>>  DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -
>>malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-
>>stack-arg-probe
>>>  DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-
>>zone -Wno-address -mno-stack-arg-probe
>>>  DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-
>>divide-min-latency
>>> -DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-
>>endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -
>>fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft
>>> +DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-
>>endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -
>>fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft
>>-fno-pie
>>>  DEFINE GCC_ARM_CC_XIPFLAGS         = -mno-unaligned-access
>>> -DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-
>>endian -fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections
>>-fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-pic
>>> +DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-
>>endian -fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections
>>-fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-pic -
>>fno-pie
>>>  DEFINE GCC_AARCH64_CC_XIPFLAGS     = -mstrict-align
>>>  DEFINE GCC_DLINK_FLAGS_COMMON      = -nostdlib --pie
>>>  DEFINE GCC_DLINK2_FLAGS_COMMON     = -Wl,--
>>script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds
>>> --
>>> 2.11.0
>>>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.