From a3d9e6d1a47627638466cb333b65fb89eb065f59 Mon Sep 17 00:00:00 2001 From: Victor Costan Date: Sun, 13 Dec 2020 19:23:42 -0800 Subject: [PATCH 1/5] Updated third_party/ and Travis CI config. (#48) --- .travis.yml | 16 ++++++++-------- third_party/benchmark | 2 +- third_party/glog | 2 +- third_party/googletest | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index d990a89..3193503 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: cpp dist: bionic -osx_image: xcode10.3 +osx_image: xcode11.3 compiler: - gcc @@ -28,16 +28,16 @@ addons: key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - sourceline: 'ppa:ubuntu-toolchain-r/test' packages: - - clang-9 + - clang-10 - cmake - - gcc-9 - - g++-9 + - gcc-10 + - g++-10 - ninja-build homebrew: packages: - cmake - - gcc@9 - - llvm@9 + - gcc@10 + - llvm@10 - ninja update: true @@ -48,14 +48,14 @@ install: export PATH="$(brew --prefix llvm)/bin:$PATH"; fi # /usr/bin/gcc points to an older compiler on both Linux and macOS. -- if [ "$CXX" = "g++" ]; then export CXX="g++-9" CC="gcc-9"; fi +- if [ "$CXX" = "g++" ]; then export CXX="g++-10" CC="gcc-10"; fi # /usr/bin/clang points to an older compiler on both Linux and macOS. # # Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values # below don't work on macOS. Fortunately, the path change above makes the # default values (clang and clang++) resolve to the correct compiler on macOS. - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$CXX" = "clang++" ]; then export CXX="clang++-9" CC="clang-9"; fi; + if [ "$CXX" = "clang++" ]; then export CXX="clang++-10" CC="clang-10"; fi; fi - echo ${CC} - echo ${CXX} diff --git a/third_party/benchmark b/third_party/benchmark index a77d5f7..bf585a2 160000 --- a/third_party/benchmark +++ b/third_party/benchmark @@ -1 +1 @@ -Subproject commit a77d5f70efaebe2b7e8c10134526a23a7ce7ef35 +Subproject commit bf585a2789e30585b4e3ce6baf11ef2750b54677 diff --git a/third_party/glog b/third_party/glog index 4cc89c9..c8f8135 160000 --- a/third_party/glog +++ b/third_party/glog @@ -1 +1 @@ -Subproject commit 4cc89c9e2b452db579397887c37f302fb28f6ca1 +Subproject commit c8f8135a5720aee7de8328b42e4c43f8aa2e60aa diff --git a/third_party/googletest b/third_party/googletest index e3f0319..18f8200 160000 --- a/third_party/googletest +++ b/third_party/googletest @@ -1 +1 @@ -Subproject commit e3f0319d89f4cbf32993de595d984183b1a9fc57 +Subproject commit 18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6 From 7fa4c263e8ab14d11e2632aa99c309aed619ab51 Mon Sep 17 00:00:00 2001 From: Victor Costan Date: Sun, 13 Dec 2020 22:55:19 -0800 Subject: [PATCH 2/5] Update Travis CI config. (#49) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3193503..45c5538 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: cpp dist: bionic -osx_image: xcode11.3 +osx_image: xcode12.2 compiler: - gcc From e31619a5b7c4f31c427cb25d47c59eb0429b989a Mon Sep 17 00:00:00 2001 From: Francois Marier Date: Wed, 2 Jun 2021 12:18:58 -0700 Subject: [PATCH 3/5] Fix GitHub links. (#50) These repos have moved to different GitHub user accounts or orgs. --- .ycm_extra_conf.py | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py index 536aadc..62daa8a 100644 --- a/.ycm_extra_conf.py +++ b/.ycm_extra_conf.py @@ -4,10 +4,10 @@ """YouCompleteMe configuration that interprets a .clang_complete file. This module implementes the YouCompleteMe configuration API documented at: -https://github.com/Valloric/ycmd#ycm_extra_confpy-specification +https://github.com/ycm-core/ycmd#ycm_extra_confpy-specification The implementation loads and processes a .clang_complete file, documented at: -https://github.com/Rip-Rip/clang_complete/blob/master/README.md +https://github.com/xavierd/clang_complete/blob/master/README.md """ import os diff --git a/README.md b/README.md index 0bd69f7..58ba38e 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ apm install autocomplete-clang build build-cmake clang-format language-cmake \ If you don't mind more setup in return for more speed, replace `autocomplete-clang` and `linter-clang` with `you-complete-me`. This requires -[setting up ycmd](https://github.com/Valloric/ycmd#building). +[setting up ycmd](https://github.com/ycm-core/ycmd#building). ```bash apm install autocomplete-plus build build-cmake clang-format language-cmake \ From db08d22129aee22bf3acd414152c2ff4c2623cd1 Mon Sep 17 00:00:00 2001 From: Chris Mumford Date: Sun, 20 Jun 2021 08:18:01 -0700 Subject: [PATCH 4/5] Updated Travis-CI configuration. (#51) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit clang/llvm: 10 → 12 gcc: 10 → 11 --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45c5538..183a5fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: cpp dist: bionic -osx_image: xcode12.2 +osx_image: xcode12.5 compiler: - gcc @@ -24,20 +24,20 @@ env: addons: apt: sources: - - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main' + - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main' key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - sourceline: 'ppa:ubuntu-toolchain-r/test' packages: - - clang-10 + - clang-12 - cmake - - gcc-10 - - g++-10 + - gcc-11 + - g++-11 - ninja-build homebrew: packages: - cmake - - gcc@10 - - llvm@10 + - gcc@11 + - llvm@12 - ninja update: true @@ -48,14 +48,14 @@ install: export PATH="$(brew --prefix llvm)/bin:$PATH"; fi # /usr/bin/gcc points to an older compiler on both Linux and macOS. -- if [ "$CXX" = "g++" ]; then export CXX="g++-10" CC="gcc-10"; fi +- if [ "$CXX" = "g++" ]; then export CXX="g++-11" CC="gcc-11"; fi # /usr/bin/clang points to an older compiler on both Linux and macOS. # # Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values # below don't work on macOS. Fortunately, the path change above makes the # default values (clang and clang++) resolve to the correct compiler on macOS. - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$CXX" = "clang++" ]; then export CXX="clang++-10" CC="clang-10"; fi; + if [ "$CXX" = "clang++" ]; then export CXX="clang++-12" CC="clang-12"; fi; fi - echo ${CC} - echo ${CXX} From fa5ade41ee480003d9c5af6f43567ba22e4e17e6 Mon Sep 17 00:00:00 2001 From: Victor Costan Date: Tue, 22 Jun 2021 14:30:59 -0700 Subject: [PATCH 5/5] Fix compilation warnings on ARM64 with old GCC versions. (#52) Tested on Chrome OS M93 Linux (Debian 10.10) on kukui. --- src/crc32c_arm64_check.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/crc32c_arm64_check.h b/src/crc32c_arm64_check.h index 6fc547d..c5a5e46 100644 --- a/src/crc32c_arm64_check.h +++ b/src/crc32c_arm64_check.h @@ -38,7 +38,15 @@ inline bool CanUseArm64Crc32() { // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code. constexpr unsigned long kHWCAP_PMULL = 1 << 4; constexpr unsigned long kHWCAP_CRC32 = 1 << 7; - unsigned long hwcap = (&getauxval != nullptr) ? getauxval(AT_HWCAP) : 0; + unsigned long hwcap = +#if HAVE_STRONG_GETAUXVAL + // Some compilers warn on (&getauxval != nullptr) in the block below. + getauxval(AT_HWCAP); +#elif HAVE_WEAK_GETAUXVAL + (&getauxval != nullptr) ? getauxval(AT_HWCAP) : 0; +#else +#error This is supposed to be nested inside a check for HAVE_*_GETAUXVAL. +#endif // HAVE_STRONG_GETAUXVAL return (hwcap & (kHWCAP_PMULL | kHWCAP_CRC32)) == (kHWCAP_PMULL | kHWCAP_CRC32); #elif defined(__APPLE__)