| 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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"', { |
| 183 'ldflags': [ | 183 'ldflags': [ |
| 184 '-L<(android_stlport_libs)/x86', | 184 '-L<(android_stlport_libs)/x86', |
| 185 ], | 185 ], |
| 186 }], | 186 }], |
| 187 ['target_arch=="a64"', { | |
| 188 'ldflags': [ | |
| 189 '-L<(android_stlport_libs)/arm64', | |
| 190 ], | |
| 191 }], | |
| 192 ], | 187 ], |
| 193 }], | 188 }], |
| 194 ['target_arch=="ia32"', { | 189 ['target_arch=="ia32"', { |
| 195 # The x86 toolchain currently has problems with stack-protector. | 190 # The x86 toolchain currently has problems with stack-protector. |
| 196 'cflags!': [ | 191 'cflags!': [ |
| 197 '-fstack-protector', | 192 '-fstack-protector', |
| 198 ], | 193 ], |
| 199 'cflags': [ | 194 'cflags': [ |
| 200 '-fno-stack-protector', | 195 '-fno-stack-protector', |
| 201 ], | 196 ], |
| 202 }], | 197 }], |
| 203 ['target_arch=="mipsel"', { | 198 ['target_arch=="mipsel"', { |
| 204 # The mips toolchain currently has problems with stack-protector. | 199 # The mips toolchain currently has problems with stack-protector. |
| 205 'cflags!': [ | 200 'cflags!': [ |
| 206 '-fstack-protector', | 201 '-fstack-protector', |
| 207 '-U__linux__' | 202 '-U__linux__' |
| 208 ], | 203 ], |
| 209 'cflags': [ | 204 'cflags': [ |
| 210 '-fno-stack-protector', | 205 '-fno-stack-protector', |
| 211 ], | 206 ], |
| 212 }], | 207 }], |
| 213 ], | 208 ], |
| 214 'target_conditions': [ | 209 'target_conditions': [ |
| 215 ['_type=="executable"', { | 210 ['_type=="executable"', { |
| 216 'conditions': [ | |
| 217 ['target_arch=="a64"', { | |
| 218 'ldflags': [ | |
| 219 '-Wl,-dynamic-linker,/system/bin/linker64', | |
| 220 ], | |
| 221 }, { | |
| 222 'ldflags': [ | |
| 223 '-Wl,-dynamic-linker,/system/bin/linker', | |
| 224 ], | |
| 225 }] | |
| 226 ], | |
| 227 'ldflags': [ | 211 'ldflags': [ |
| 228 '-Bdynamic', | 212 '-Bdynamic', |
| 213 '-Wl,-dynamic-linker,/system/bin/linker', |
| 214 '-Wl,--gc-sections', |
| 229 '-Wl,-z,nocopyreloc', | 215 '-Wl,-z,nocopyreloc', |
| 230 # crtbegin_dynamic.o should be the last item in ldflags. | 216 # crtbegin_dynamic.o should be the last item in ldflags. |
| 231 '<(android_lib)/crtbegin_dynamic.o', | 217 '<(android_lib)/crtbegin_dynamic.o', |
| 232 ], | 218 ], |
| 233 'libraries': [ | 219 'libraries': [ |
| 234 # crtend_android.o needs to be the last item in libraries. | 220 # crtend_android.o needs to be the last item in libraries. |
| 235 # Do not add any libraries after this! | 221 # Do not add any libraries after this! |
| 236 '<(android_lib)/crtend_android.o', | 222 '<(android_lib)/crtend_android.o', |
| 237 ], | 223 ], |
| 238 }], | 224 }], |
| (...skipping 18 matching lines...) Expand all Loading... |
| 257 'ldflags!': [ | 243 'ldflags!': [ |
| 258 '-Wl,-z,noexecstack', | 244 '-Wl,-z,noexecstack', |
| 259 '-Wl,--gc-sections', | 245 '-Wl,--gc-sections', |
| 260 '-Wl,-O1', | 246 '-Wl,-O1', |
| 261 '-Wl,--as-needed', | 247 '-Wl,--as-needed', |
| 262 ], | 248 ], |
| 263 }], | 249 }], |
| 264 ], # target_conditions | 250 ], # target_conditions |
| 265 }, # target_defaults | 251 }, # target_defaults |
| 266 } | 252 } |
| OLD | NEW |