File tree Expand file tree Collapse file tree 4 files changed +21
-13
lines changed Expand file tree Collapse file tree 4 files changed +21
-13
lines changed Original file line number Diff line number Diff line change 44
55language : cpp
66dist : bionic
7- osx_image : xcode10.3
7+ osx_image : xcode12.5
88
99compiler :
1010- gcc
2424addons :
2525 apt :
2626 sources :
27- - sourceline : ' deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
27+ - sourceline : ' deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main'
2828 key_url : ' https://apt.llvm.org/llvm-snapshot.gpg.key'
2929 - sourceline : ' ppa:ubuntu-toolchain-r/test'
3030 packages :
31- - clang-9
31+ - clang-12
3232 - cmake
33- - gcc-9
34- - g++-9
33+ - gcc-11
34+ - g++-11
3535 - ninja-build
3636 homebrew :
3737 packages :
3838 - cmake
39- - gcc@9
40- - llvm@9
39+ - gcc@11
40+ - llvm@12
4141 - ninja
4242 update : true
4343
@@ -48,14 +48,14 @@ install:
4848 export PATH="$(brew --prefix llvm)/bin:$PATH";
4949 fi
5050# /usr/bin/gcc points to an older compiler on both Linux and macOS.
51- - if [ "$CXX" = "g++" ]; then export CXX="g++-9 " CC="gcc-9 "; fi
51+ - if [ "$CXX" = "g++" ]; then export CXX="g++-11 " CC="gcc-11 "; fi
5252# /usr/bin/clang points to an older compiler on both Linux and macOS.
5353#
5454# Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values
5555# below don't work on macOS. Fortunately, the path change above makes the
5656# default values (clang and clang++) resolve to the correct compiler on macOS.
5757- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
58- if [ "$CXX" = "clang++" ]; then export CXX="clang++-9 " CC="clang-9 "; fi;
58+ if [ "$CXX" = "clang++" ]; then export CXX="clang++-12 " CC="clang-12 "; fi;
5959 fi
6060- echo ${CC}
6161- echo ${CXX}
Original file line number Diff line number Diff line change 44"""YouCompleteMe configuration that interprets a .clang_complete file.
55
66This module implementes the YouCompleteMe configuration API documented at:
7- https://github.com/Valloric /ycmd#ycm_extra_confpy-specification
7+ https://github.com/ycm-core /ycmd#ycm_extra_confpy-specification
88
99The implementation loads and processes a .clang_complete file, documented at:
10- https://github.com/Rip-Rip /clang_complete/blob/master/README.md
10+ https://github.com/xavierd /clang_complete/blob/master/README.md
1111"""
1212
1313import os
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ apm install autocomplete-clang build build-cmake clang-format language-cmake \
6565
6666If you don't mind more setup in return for more speed, replace
6767` autocomplete-clang ` and ` linter-clang ` with ` you-complete-me ` . This requires
68- [ setting up ycmd] ( https://github.com/Valloric /ycmd#building ) .
68+ [ setting up ycmd] ( https://github.com/ycm-core /ycmd#building ) .
6969
7070``` bash
7171apm install autocomplete-plus build build-cmake clang-format language-cmake \
Original file line number Diff line number Diff line change @@ -40,7 +40,15 @@ inline bool CanUseArm64Crc32() {
4040 // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code.
4141 constexpr unsigned long kHWCAP_PMULL = 1 << 4 ;
4242 constexpr unsigned long kHWCAP_CRC32 = 1 << 7 ;
43- unsigned long hwcap = (&getauxval != nullptr ) ? getauxval (AT_HWCAP) : 0 ;
43+ unsigned long hwcap =
44+ #if HAVE_STRONG_GETAUXVAL
45+ // Some compilers warn on (&getauxval != nullptr) in the block below.
46+ getauxval (AT_HWCAP);
47+ #elif HAVE_WEAK_GETAUXVAL
48+ (&getauxval != nullptr ) ? getauxval (AT_HWCAP) : 0 ;
49+ #else
50+ #error This is supposed to be nested inside a check for HAVE_*_GETAUXVAL.
51+ #endif // HAVE_STRONG_GETAUXVAL
4452 return (hwcap & (kHWCAP_PMULL | kHWCAP_CRC32 )) ==
4553 (kHWCAP_PMULL | kHWCAP_CRC32 );
4654#elif defined(__APPLE__)
You can’t perform that action at this time.
0 commit comments