summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2017-05-02 10:25:53 -0400
committerMark Benvenuto <mark.benvenuto@mongodb.com>2017-05-02 10:25:53 -0400
commit3b4c774c33428a0cd33f9a12cbdfcb12aafe1bee (patch)
tree4c064cda98fa5eefa81bb569ef5194299fad0aef
parent2d7be840ecf1b7928a99def51fe3bea8304738f8 (diff)
downloadmongo-3b4c774c33428a0cd33f9a12cbdfcb12aafe1bee.tar.gz
SERVER-28007 Re-enable support for CRC32 hardware acceleration on s390x
(cherry picked from commit c49c689fd78432b9df204185f25b79dddbbdebb2)
-rw-r--r--etc/evergreen.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index a70fe56b87f..df4300ce973 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -4319,7 +4319,7 @@ buildvariants:
push_bucket: downloads.10gen.com
push_name: linux
push_arch: s390x-enterprise-ubuntu1604
- compile_flags: --ssl MONGO_DISTMOD=ubuntu1604 --release -j$(grep -c ^processor /proc/cpuinfo) CCFLAGS="-march=z196 -mtune=zEC12" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy --use-s390x-crc32=off
+ compile_flags: --ssl MONGO_DISTMOD=ubuntu1604 --release -j$(grep -c ^processor /proc/cpuinfo) CCFLAGS="-march=z196 -mtune=zEC12" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy
num_jobs_available: 2
variant_excluded_flags: requires_mmapv1
has_packages: true
@@ -6400,7 +6400,7 @@ buildvariants:
expansions:
gorootvars: PATH=/opt/mongodbtoolchain/v2/bin:$PATH
tooltags: -gccgoflags "$(pkg-config --libs --cflags libssl libsasl2)" -tags 'sasl ssl'
- compile_flags: --ssl MONGO_DISTMOD=rhel72 --release -j3 CCFLAGS="-march=z196 -mtune=zEC12" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy --use-s390x-crc32=off
+ compile_flags: --ssl MONGO_DISTMOD=rhel72 --release -j3 CCFLAGS="-march=z196 -mtune=zEC12" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy
num_jobs_available: 2
variant_excluded_flags: requires_mmapv1
has_packages: true
@@ -6939,7 +6939,7 @@ buildvariants:
push_bucket: downloads.10gen.com
push_name: linux
push_arch: s390x-enterprise-suse12
- compile_flags: --ssl MONGO_DISTMOD=suse12 --release -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) CCFLAGS="-march=z196 -mtune=zEC12" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy --use-s390x-crc32=off
+ compile_flags: --ssl MONGO_DISTMOD=suse12 --release -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) CCFLAGS="-march=z196 -mtune=zEC12" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy
num_jobs_available: $(grep -c ^processor /proc/cpuinfo)
variant_excluded_flags: requires_mmapv1
has_packages: true
@@ -8107,7 +8107,7 @@ buildvariants:
expansions:
gorootvars: PATH=/opt/mongodbtoolchain/v2/bin:$PATH
tooltags: -gccgoflags "$(pkg-config --libs --cflags libssl libsasl2)" -tags 'sasl ssl'
- compile_flags: --dbg=on --opt=on --ssl --link-model=static MONGO_DISTMOD=rhel72 -j3 CCFLAGS="-march=z196 -mtune=zEC12" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy --use-s390x-crc32=off
+ compile_flags: --dbg=on --opt=on --ssl --link-model=static MONGO_DISTMOD=rhel72 -j3 CCFLAGS="-march=z196 -mtune=zEC12" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy
num_jobs_available: 2
test_flags: --storageEngine=inMemory
variant_excluded_flags: requires_persistence,requires_mmapv1,requires_journaling