diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-10-17 17:26:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 17:26:39 -0700 |
| commit | 5c5e13058537e520fdcdb7be4cc6c4da233fb528 (patch) | |
| tree | 90015da11c1eb3a839c67bc77c3b7b76c1a34567 /ports/folly/fix-malloc.diff | |
| parent | d7f6a7e4a8e09ce54c18f16dea9f6d3fe9d0ac77 (diff) | |
| parent | c9d3512088240ab7f8ce15eb89f9e1ea8808e207 (diff) | |
| download | vcpkg-5c5e13058537e520fdcdb7be4cc6c4da233fb528.tar.gz vcpkg-5c5e13058537e520fdcdb7be4cc6c4da233fb528.zip | |
Merge pull request #1967 from KindDragon/folly-v2017.10.02.00
[folly] Update to version v2017.10.02.00
Diffstat (limited to 'ports/folly/fix-malloc.diff')
| -rw-r--r-- | ports/folly/fix-malloc.diff | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ports/folly/fix-malloc.diff b/ports/folly/fix-malloc.diff new file mode 100644 index 000000000..db7a23063 --- /dev/null +++ b/ports/folly/fix-malloc.diff @@ -0,0 +1,12 @@ +--- a/folly/Malloc.h Mon Oct 09 04:35:09 2017 ++++ b/folly/Malloc.h Fri Oct 13 15:31:36 2017 +@@ -189,9 +189,6 @@ + return false; + } + +- /* Avoid optimizing away the malloc. */ +- asm volatile("" ::"m"(ptr) : "memory"); +- + return (origAllocated != *counter); + }(); + |