Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: third_party/boringssl/boringssl.gyp

Issue 1484883002: clang/arm: Push -no-integrated-as into the four targets that need it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'boringssl', 8 'target_name': 'boringssl',
9 'type': '<(component)', 9 'type': '<(component)',
10 'includes': [ 10 'includes': [
(...skipping 18 matching lines...) Expand all
29 }], 29 }],
30 ['target_arch == "arm" and msan == 0', { 30 ['target_arch == "arm" and msan == 0', {
31 'conditions': [ 31 'conditions': [
32 ['OS == "linux" or OS == "android"', { 32 ['OS == "linux" or OS == "android"', {
33 'sources': [ '<@(boringssl_linux_arm_sources)' ], 33 'sources': [ '<@(boringssl_linux_arm_sources)' ],
34 }, { 34 }, {
35 'defines': [ 'OPENSSL_NO_ASM' ], 35 'defines': [ 'OPENSSL_NO_ASM' ],
36 }], 36 }],
37 ], 37 ],
38 }], 38 }],
39 ['target_arch == "arm" and clang == 1', {
40 # TODO(hans) Enable integrated-as (crbug.com/124610).
41 'cflags': [
42 '-fno-integrated-as',
43 '-B<(android_toolchain)', # Else /usr/bin/as gets picked up.
44 ],
45 }],
39 ['target_arch == "arm64" and msan == 0', { 46 ['target_arch == "arm64" and msan == 0', {
40 'conditions': [ 47 'conditions': [
41 ['OS == "linux" or OS == "android"', { 48 ['OS == "linux" or OS == "android"', {
42 'sources': [ '<@(boringssl_linux_aarch64_sources)' ], 49 'sources': [ '<@(boringssl_linux_aarch64_sources)' ],
43 }, { 50 }, {
44 'defines': [ 'OPENSSL_NO_ASM' ], 51 'defines': [ 'OPENSSL_NO_ASM' ],
45 }], 52 }],
46 ], 53 ],
47 }], 54 }],
48 ['target_arch == "ia32" and msan == 0', { 55 ['target_arch == "ia32" and msan == 0', {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 ['component == "shared_library"', { 118 ['component == "shared_library"', {
112 'defines': [ 119 'defines': [
113 'BORINGSSL_SHARED_LIBRARY', 120 'BORINGSSL_SHARED_LIBRARY',
114 ], 121 ],
115 }], 122 }],
116 ], 123 ],
117 }, 124 },
118 }, 125 },
119 ], 126 ],
120 } 127 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698