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 4
4
5
5
language : cpp
6
6
dist : bionic
7
- osx_image : xcode10.3
7
+ osx_image : xcode12.5
8
8
9
9
compiler :
10
10
- gcc
24
24
addons :
25
25
apt :
26
26
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'
28
28
key_url : ' https://apt.llvm.org/llvm-snapshot.gpg.key'
29
29
- sourceline : ' ppa:ubuntu-toolchain-r/test'
30
30
packages :
31
- - clang-9
31
+ - clang-12
32
32
- cmake
33
- - gcc-9
34
- - g++-9
33
+ - gcc-11
34
+ - g++-11
35
35
- ninja-build
36
36
homebrew :
37
37
packages :
38
38
- cmake
39
- - gcc@9
40
- - llvm@9
39
+ - gcc@11
40
+ - llvm@12
41
41
- ninja
42
42
update : true
43
43
@@ -48,14 +48,14 @@ install:
48
48
export PATH="$(brew --prefix llvm)/bin:$PATH";
49
49
fi
50
50
# /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
52
52
# /usr/bin/clang points to an older compiler on both Linux and macOS.
53
53
#
54
54
# Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values
55
55
# below don't work on macOS. Fortunately, the path change above makes the
56
56
# default values (clang and clang++) resolve to the correct compiler on macOS.
57
57
- 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;
59
59
fi
60
60
- echo ${CC}
61
61
- echo ${CXX}
Original file line number Diff line number Diff line change 4
4
"""YouCompleteMe configuration that interprets a .clang_complete file.
5
5
6
6
This 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
8
8
9
9
The 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
11
11
"""
12
12
13
13
import 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 \
65
65
66
66
If you don't mind more setup in return for more speed, replace
67
67
` 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 ) .
69
69
70
70
``` bash
71
71
apm 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() {
40
40
// From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code.
41
41
constexpr unsigned long kHWCAP_PMULL = 1 << 4 ;
42
42
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
44
52
return (hwcap & (kHWCAP_PMULL | kHWCAP_CRC32 )) ==
45
53
(kHWCAP_PMULL | kHWCAP_CRC32 );
46
54
#elif defined(__APPLE__)
You can’t perform that action at this time.
0 commit comments