Skip to content

Commit

Permalink
deps,v8: fix gyp build on Aix platform
Browse files Browse the repository at this point in the history
Floating this patch since the code does not exist upstream anymore.

deps/v8/testing/gtest.gyp:
Supperss -Wnonnull-compare, -Waddress warnings for deps/v8/testing/gtest
project;

deps/v8/src/compiler/store-store-elimination.cc, deps/v8/src/conversions.cc:
Suppress unused function warnings in order to compile with newer (>4.8.5)
gcc on Aix.

PR-URL: #23958
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: George Adams <george.adams@uk.ibm.com>
  • Loading branch information
Vasili Skurydzin authored and rvagg committed Nov 28, 2018
1 parent 5034729 commit 4f3c9e6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion deps/v8/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 6
#define V8_MINOR_VERSION 2
#define V8_BUILD_NUMBER 414
#define V8_PATCH_LEVEL 74
#define V8_PATCH_LEVEL 75

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
6 changes: 6 additions & 0 deletions deps/v8/src/compiler/store-store-elimination.cc
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ void StoreStoreElimination::Run(JSGraph* js_graph, Zone* temp_zone) {
}
}

#if V8_OS_AIX
ALLOW_UNUSED_TYPE
#endif
bool RedundantStoreFinder::IsEffectful(Node* node) {
return (node->op()->EffectInputCount() >= 1);
}
Expand Down Expand Up @@ -552,6 +555,9 @@ bool UnobservableStore::operator==(const UnobservableStore other) const {
return (id_ == other.id_) && (offset_ == other.offset_);
}

#if V8_OS_AIX
ALLOW_UNUSED_TYPE
#endif
bool UnobservableStore::operator!=(const UnobservableStore other) const {
return !(*this == other);
}
Expand Down
6 changes: 6 additions & 0 deletions deps/v8/src/conversions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,17 @@ class StringCharacterStreamIterator {
};


#if V8_OS_AIX
ALLOW_UNUSED_TYPE
#endif
StringCharacterStreamIterator::StringCharacterStreamIterator(
StringCharacterStream* stream) : stream_(stream) {
++(*this);
}

#if V8_OS_AIX
ALLOW_UNUSED_TYPE
#endif
uint16_t StringCharacterStreamIterator::operator*() const {
return current_;
}
Expand Down
4 changes: 4 additions & 0 deletions deps/v8/testing/gtest.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@
}],
],
}],
['OS=="aix"', {
'cflags': [ '-Wno-nonnull-compare',
'-Wno-address' ],
}],
],
'msvs_disabled_warnings': [4800],
},
Expand Down

0 comments on commit 4f3c9e6

Please sign in to comment.