Browse Source

Misc

tags/1.9.7
falkTX 9 years ago
parent
commit
5d1236c8b5
2 changed files with 4 additions and 10 deletions
  1. +3
    -9
      source/Makefile.mk
  2. +1
    -1
      source/utils/CarlaSemUtils.hpp

+ 3
- 9
source/Makefile.mk View File

@@ -80,9 +80,9 @@ else
LINK_OPTS = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed -Wl,--strip-all LINK_OPTS = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
endif 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 LINK_OPTS = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
endif 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 LINK_OPTS = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
endif 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) ifeq ($(NOOPT),true)
# No optimization flags # No optimization flags
BASE_OPTS = -O2 -ffast-math -fdata-sections -ffunction-sections BASE_OPTS = -O2 -ffast-math -fdata-sections -ffunction-sections


+ 1
- 1
source/utils/CarlaSemUtils.hpp View File

@@ -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) 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; return true;
} }




Loading…
Cancel
Save