| OLD | NEW |
| 1 # Copyright 2012 the V8 project authors. All rights reserved. | 1 # Copyright 2012 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 ['target_arch=="arm" and arm_version < 7', { | 172 ['target_arch=="arm" and arm_version < 7', { |
| 173 'ldflags': [ | 173 'ldflags': [ |
| 174 '-L<(android_stlport_libs)/armeabi', | 174 '-L<(android_stlport_libs)/armeabi', |
| 175 ], | 175 ], |
| 176 }], | 176 }], |
| 177 ['target_arch=="mipsel"', { | 177 ['target_arch=="mipsel"', { |
| 178 'ldflags': [ | 178 'ldflags': [ |
| 179 '-L<(android_stlport_libs)/mips', | 179 '-L<(android_stlport_libs)/mips', |
| 180 ], | 180 ], |
| 181 }], | 181 }], |
| 182 ['target_arch=="ia32"', { | 182 ['target_arch=="ia32" or target_arch=="x87"', { |
| 183 'ldflags': [ | 183 'ldflags': [ |
| 184 '-L<(android_stlport_libs)/x86', | 184 '-L<(android_stlport_libs)/x86', |
| 185 ], | 185 ], |
| 186 }], | 186 }], |
| 187 ['target_arch=="x64"', { | 187 ['target_arch=="x64"', { |
| 188 'ldflags': [ | 188 'ldflags': [ |
| 189 '-L<(android_stlport_libs)/x86_64', | 189 '-L<(android_stlport_libs)/x86_64', |
| 190 ], | 190 ], |
| 191 }], | 191 }], |
| 192 ['target_arch=="arm64"', { | 192 ['target_arch=="arm64"', { |
| 193 'ldflags': [ | 193 'ldflags': [ |
| 194 '-L<(android_stlport_libs)/arm64-v8a', | 194 '-L<(android_stlport_libs)/arm64-v8a', |
| 195 ], | 195 ], |
| 196 }], | 196 }], |
| 197 ], | 197 ], |
| 198 }], | 198 }], |
| 199 ['target_arch=="ia32"', { | 199 ['target_arch=="ia32" or target_arch=="x87"', { |
| 200 # The x86 toolchain currently has problems with stack-protector. | 200 # The x86 toolchain currently has problems with stack-protector. |
| 201 'cflags!': [ | 201 'cflags!': [ |
| 202 '-fstack-protector', | 202 '-fstack-protector', |
| 203 ], | 203 ], |
| 204 'cflags': [ | 204 'cflags': [ |
| 205 '-fno-stack-protector', | 205 '-fno-stack-protector', |
| 206 ], | 206 ], |
| 207 }], | 207 }], |
| 208 ['target_arch=="mipsel"', { | 208 ['target_arch=="mipsel"', { |
| 209 # The mips toolchain currently has problems with stack-protector. | 209 # The mips toolchain currently has problems with stack-protector. |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 'ldflags!': [ | 278 'ldflags!': [ |
| 279 '-Wl,-z,noexecstack', | 279 '-Wl,-z,noexecstack', |
| 280 '-Wl,--gc-sections', | 280 '-Wl,--gc-sections', |
| 281 '-Wl,-O1', | 281 '-Wl,-O1', |
| 282 '-Wl,--as-needed', | 282 '-Wl,--as-needed', |
| 283 ], | 283 ], |
| 284 }], | 284 }], |
| 285 ], # target_conditions | 285 ], # target_conditions |
| 286 }, # target_defaults | 286 }, # target_defaults |
| 287 } | 287 } |
| OLD | NEW |