From 5d1236c8b55af4226377e3cecc1ac1ab67aa1003 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sun, 18 Oct 2015 16:13:33 +0200
Subject: [PATCH] Misc

---
 source/Makefile.mk             | 12 +++---------
 source/utils/CarlaSemUtils.hpp |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/source/Makefile.mk b/source/Makefile.mk
index c45b27f0f..2f9dc569b 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -80,9 +80,9 @@ else
 LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
 endif
 
-ifeq ($(MODDUO),true)
-# MOD Duo optimization flags
-BASE_OPTS  = -O2 -ffast-math -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
+ifeq ($(PANDORA),true)
+# OpenPandora optimization flags
+BASE_OPTS  = -O2 -ffast-math -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
 endif
 
@@ -92,12 +92,6 @@ BASE_OPTS  = -O2 -ffast-math -march=armv6 -mfpu=vfp -mfloat-abi=hard
 LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
 endif
 
-ifeq ($(PANDORA),true)
-# OpenPandora optimization flags
-BASE_OPTS  = -O2 -ffast-math -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp
-LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-endif
-
 ifeq ($(NOOPT),true)
 # No optimization flags
 BASE_OPTS  = -O2 -ffast-math -fdata-sections -ffunction-sections
diff --git a/source/utils/CarlaSemUtils.hpp b/source/utils/CarlaSemUtils.hpp
index 1330a9b09..4431a0dbb 100644
--- a/source/utils/CarlaSemUtils.hpp
+++ b/source/utils/CarlaSemUtils.hpp
@@ -156,7 +156,7 @@ bool carla_sem_timedwait(carla_sem_t& sem, const uint msecs) noexcept
     {
         if (::syscall(__NR_futex, &sem.count, FUTEX_WAIT, 0, &timeout, nullptr, 0) == 0)
         {
-            __sync_fetch_and_sub(&sem.count, 1);
+            __sync_sub_and_fetch(&sem.count, 1);
             return true;
         }