]>
Commit | Line | Data |
---|---|---|
3fa299a0 JR |
1 | --- modpagespeed-1.8.31.6/third_party/mod_spdy/src/build/common.gypi~ 2015-01-27 23:51:31.000000000 +0100 |
2 | +++ modpagespeed-1.8.31.6/third_party/mod_spdy/src/build/common.gypi 2016-05-29 11:38:30.139293222 +0200 | |
3 | @@ -584,11 +584,6 @@ | |
4 | }, | |
5 | 'conditions': [ | |
6 | [ 'target_arch=="ia32"', { | |
7 | - 'asflags': [ | |
8 | - # Needed so that libs with .s files (e.g. libicudata.a) | |
9 | - # are compatible with the general 32-bit-ness. | |
10 | - '-32', | |
11 | - ], | |
12 | # All floating-point computations on x87 happens in 80-bit | |
13 | # precision. Because the C and C++ language standards allow | |
14 | # the compiler to keep the floating-point values in higher | |
15 | @@ -621,28 +616,7 @@ | |
16 | '-msse2', | |
17 | '-mfpmath=sse', | |
18 | ], | |
19 | - }, { # else: sse2 disabled | |
20 | - 'cflags': [ | |
21 | - '-march=i686', | |
22 | - ], | |
23 | }], | |
24 | - # Install packages have started cropping up with | |
25 | - # different headers between the 32-bit and 64-bit | |
26 | - # versions, so we have to shadow those differences off | |
27 | - # and make sure a 32-bit-on-64-bit build picks up the | |
28 | - # right files. | |
29 | - ['host_arch!="ia32"', { | |
30 | - 'include_dirs+': [ | |
31 | - '/usr/include32', | |
32 | - ], | |
33 | - }], | |
34 | - ], | |
35 | - # -mmmx allows mmintrin.h to be used for mmx intrinsics. | |
36 | - # video playback is mmx and sse2 optimized. | |
37 | - 'cflags': [ | |
38 | - '-mmmx', | |
39 | - ], | |
40 | - 'ldflags': [ | |
41 | ], | |
42 | }], | |
43 | ['linux_fpic==1', { | |
44 | --- modpagespeed-1.8.31.6/third_party/chromium/src/build/common.gypi~ 2015-01-27 23:51:10.000000000 +0100 | |
45 | +++ modpagespeed-1.8.31.6/third_party/chromium/src/build/common.gypi 2016-05-29 11:39:54.573657091 +0200 | |
46 | @@ -3178,11 +3178,6 @@ | |
47 | ['target_arch=="ia32"', { | |
48 | 'target_conditions': [ | |
49 | ['_toolset=="target"', { | |
50 | - 'asflags': [ | |
51 | - # Needed so that libs with .s files (e.g. libicudata.a) | |
52 | - # are compatible with the general 32-bit-ness. | |
53 | - '-32', | |
54 | - ], | |
55 | # All floating-point computations on x87 happens in 80-bit | |
56 | # precision. Because the C and C++ language standards allow | |
57 | # the compiler to keep the floating-point values in higher | |
58 | @@ -3235,24 +3230,6 @@ | |
59 | '-fuse-ld=gold', | |
60 | ], | |
61 | }], | |
62 | - # Install packages have started cropping up with | |
63 | - # different headers between the 32-bit and 64-bit | |
64 | - # versions, so we have to shadow those differences off | |
65 | - # and make sure a 32-bit-on-64-bit build picks up the | |
66 | - # right files. | |
67 | - # For android build, use NDK headers instead of host headers | |
68 | - ['host_arch!="ia32" and OS!="android"', { | |
69 | - 'include_dirs+': [ | |
70 | - '/usr/include32', | |
71 | - ], | |
72 | - }], | |
73 | - ], | |
74 | - # -mmmx allows mmintrin.h to be used for mmx intrinsics. | |
75 | - # video playback is mmx and sse2 optimized. | |
76 | - 'cflags': [ | |
77 | - '-mmmx', | |
78 | - ], | |
79 | - 'ldflags': [ | |
80 | ], | |
81 | }], | |
82 | ], |