Now try and make -pie stick for 32-bit Linux too.

Now try and make -pie stick for 32-bit Linux too.

TBR=jeffbailey
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=90335

[Chris Evans, 2011-06-24 03:08:36]

Rolling this in (and then probably out :P ) as discussed.

[Jeff Bailey (chromium), 2011-06-24 03:51:56]

Lgtm. Good luck!
On Jun 23, 2011 8:08 PM, <cevans@chromium.org> wrote:
> Reviewers: Jeff Bailey (chromium),
>
> Message:
> Rolling this in (and then probably out :P ) as discussed.
>
> Description:
> Now try and make -pie stick for 32-bit Linux too.
>
> TBR=jeffbailey
>
> Please review this at http://codereview.chromium.org/7240019/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
> M build/common.gypi
> M chrome/chrome_exe.gypi
>
>
> Index: build/common.gypi
> ===================================================================
> --- build/common.gypi (revision 89999)
> +++ build/common.gypi (working copy)
> @@ -145,6 +145,10 @@
> # Has no effect if 'clang' is not set as well.
> 'clang_use_chrome_plugins%': 0,
>
> + # Set to 1 compile with -fPIC cflag on linux. This is a must for
> shared
> + # libraries on linux x86-64 and arm, plus ASLR.
> + 'linux_fpic%': 1,
> +
> 'conditions': [
> # Use Skia as WebKit renderer on Mac
> ['OS=="mac"', {
> @@ -179,14 +183,6 @@
> 'use_gnome_keyring%': 1,
> }],
>
> - # Set to 1 compile with -fPIC cflag on linux. This is a must for
> shared
> - # libraries on linux x86-64 and arm.
> - ['host_arch=="ia32"', {
> - 'linux_fpic%': 0,
> - }, {
> - 'linux_fpic%': 1,
> - }],
> -
> ['toolkit_views==0 or OS=="mac"', {
> # GTK+ and Mac wants Title Case strings
> 'use_titlecase_in_grd_files%': 1,
> Index: chrome/chrome_exe.gypi
> ===================================================================
> --- chrome/chrome_exe.gypi (revision 89999)
> +++ chrome/chrome_exe.gypi (working copy)
> @@ -201,11 +201,10 @@
> ['disable_pie==1', {
> 'ldflags': ['-nopie'],
> }, {
> - # Building with -fPIE fails on ARM and ia32 bots.
> - # http://code.google.com/p/chromium/issues/detail?id=57908
> - # Until that is fixed, at least use it on Linux 64-bit.
> + # Building with -pie needs investigating on ARM.
> + # For now, at least use it on Linux Intel.
> 'conditions': [
> - ['target_arch=="x64"', {
> + ['target_arch=="x64" or target_arch=="ia32"', {
> 'ldflags': ['-pie'],
> }],
> ],
>
>