Fix build with traditional (non-thumb2) ARM

Pull in the BSD licensed SegmentedVector (that is based on Vector)
and use malloc/free instead of fastMalloc/fastFree in the constant pool.

Change-Id: I25aeb34a6f778f2c886a331851d8fc1dd0fc1d61
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h b/src/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h
index 5377ef0c7a..4c729a871c 100644
--- a/src/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h
+++ b/src/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h
@@ -105,14 +105,14 @@ public:
         , m_maxDistance(maxPoolSize)
         , m_lastConstDelta(0)
     {
-        m_pool = static_cast<uint32_t*>(fastMalloc(maxPoolSize));
-        m_mask = static_cast<char*>(fastMalloc(maxPoolSize / sizeof(uint32_t)));
+        m_pool = static_cast<uint32_t*>(malloc(maxPoolSize));
+        m_mask = static_cast<char*>(malloc(maxPoolSize / sizeof(uint32_t)));
     }
 
     ~AssemblerBufferWithConstantPool()
     {
-        fastFree(m_mask);
-        fastFree(m_pool);
+        free(m_mask);
+        free(m_pool);
     }
 
     void ensureSpace(int space)