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

Side by Side Diff: generate_gypi.sh

Issue 982363003: Add -fsanitize=cfi-vptr to list of flags disabled in AVX2 code. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 9 months 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
« no previous file with comments | « no previous file | libvpx_srcs_x86_64_intrinsics.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash -e 1 #!/bin/bash -e
2 # 2 #
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # This script is used to generate .gypi, .gni files and files in the 7 # This script is used to generate .gypi, .gni files and files in the
8 # config/platform directories needed to build libvpx. 8 # config/platform directories needed to build libvpx.
9 # Every time libvpx source code is updated just run this script. 9 # Every time libvpx source code is updated just run this script.
10 # 10 #
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 echo " 'cflags': [ '-m$4', ]," >> "$2" 118 echo " 'cflags': [ '-m$4', ]," >> "$2"
119 echo " 'xcode_settings': { 'OTHER_CFLAGS': [ '-m$4' ] }," >> "$2" 119 echo " 'xcode_settings': { 'OTHER_CFLAGS': [ '-m$4' ] }," >> "$2"
120 if [[ $4 == avx2 ]]; then 120 if [[ $4 == avx2 ]]; then
121 echo " 'msvs_settings': {" >> "$2" 121 echo " 'msvs_settings': {" >> "$2"
122 echo " 'VCCLCompilerTool': {" >> "$2" 122 echo " 'VCCLCompilerTool': {" >> "$2"
123 echo " 'EnableEnhancedInstructionSet': '5', # /arch:AVX2" >> "$2" 123 echo " 'EnableEnhancedInstructionSet': '5', # /arch:AVX2" >> "$2"
124 echo " }," >> "$2" 124 echo " }," >> "$2"
125 echo " }," >> "$2" 125 echo " }," >> "$2"
126 echo " # TODO(pcc): Remove this once we properly support subtarget specif ic" >> "$2" 126 echo " # TODO(pcc): Remove this once we properly support subtarget specif ic" >> "$2"
127 echo " # code generation in LLVM (http://llvm.org/PR19416)." >> "$2" 127 echo " # code generation in LLVM (http://llvm.org/PR19416)." >> "$2"
128 echo " 'cflags!': [ '-flto' ]," >> "$2" 128 echo " 'cflags!': [ '-flto', '-fsanitize=cfi-vptr', ]," >> "$2"
129 elif [[ $4 == ssse3 || $4 == sse4.1 ]]; then 129 elif [[ $4 == ssse3 || $4 == sse4.1 ]]; then
130 echo " 'conditions': [" >> "$2" 130 echo " 'conditions': [" >> "$2"
131 echo " ['OS==\"win\" and clang==1', {" >> "$2" 131 echo " ['OS==\"win\" and clang==1', {" >> "$2"
132 echo " # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe" >> "$2" 132 echo " # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe" >> "$2"
133 echo " # doesn't need it for intrinsics. clang-cl does need it, thoug h." >> "$2" 133 echo " # doesn't need it for intrinsics. clang-cl does need it, thoug h." >> "$2"
134 echo " 'msvs_settings': {" >> "$2" 134 echo " 'msvs_settings': {" >> "$2"
135 echo " 'VCCLCompilerTool': { 'AdditionalOptions': [ '-m$4' ] }," >> "$2" 135 echo " 'VCCLCompilerTool': { 'AdditionalOptions': [ '-m$4' ] }," >> "$2"
136 echo " }," >> "$2" 136 echo " }," >> "$2"
137 echo " }]," >> "$2" 137 echo " }]," >> "$2"
138 echo " ]," >> "$2" 138 echo " ]," >> "$2"
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 make_clean 515 make_clean
516 make libvpx_srcs.txt target=libs $config > /dev/null 516 make libvpx_srcs.txt target=libs $config > /dev/null
517 convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_generic 517 convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_generic
518 518
519 echo "Remove temporary directory." 519 echo "Remove temporary directory."
520 cd $BASE_DIR 520 cd $BASE_DIR
521 rm -rf $TEMP_DIR 521 rm -rf $TEMP_DIR
522 522
523 # TODO(fgalligan): Is "--disable-fast-unaligned" needed on mipsel? 523 # TODO(fgalligan): Is "--disable-fast-unaligned" needed on mipsel?
524 # TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel? 524 # TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel?
OLDNEW
« no previous file with comments | « no previous file | libvpx_srcs_x86_64_intrinsics.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698