Ticket #2121: clean-arm-support.diff

build/premake/premake4.lua

@@ -283 +283 @@
             end
 
             if arch == "arm" then
-                -- disable warnings about va_list ABI change
+                -- disable warnings about va_list ABI change and use
+                -- compile-time flags for futher configuration.
                 buildoptions { "-Wno-psabi" }
                 if _OPTIONS["android"] then
-                    -- target generic arm CPUs with NEON
-                    buildoptions { "-mtune=generic-arm -mfpu=neon -mfloat-abi=softfp" }
-                else
-                    -- target Cortex-A15 CPUs with NEON
-                    buildoptions { "-mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard" }
+                    -- Android uses softfp, so we should too.
+                    buildoptions { "-mfloat-abi=softfp" }
                 end
             end
 

libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp

@@ -2 +2 @@
     Copyright (C) 2005-2007 Feeling Software Inc.
     Portions of the code are:
     Copyright (C) 2005-2007 Sony Computer Entertainment America
+    Portions of the code are:
+    Copyright (C) 2013 Wildfire Games
     
     MIT License: http://www.opensource.org/licenses/mit-license.php
 */
 
 #include "StdAfx.h"
 #include "FUAssert.h"
+
+#ifndef WIN32
+    #include "sys/signal.h" // Used for throw(SIGTRAP) on UNIX-like systems
+#endif
+
 #ifdef __APPLE__
-#include <CoreServices/CoreServices.h>
+    #include <CoreServices/CoreServices.h>
 #endif
 
 
@@ -30 +37 @@
 #ifdef _DEBUG
     else
     {
-#ifdef WIN32
+    #ifdef WIN32
+        // Use windows builtins
         int32 buttonPressed = MessageBoxA(NULL, message, "Assertion failed.", MB_ABORTRETRYIGNORE | MB_ICONWARNING);
         if (buttonPressed == IDABORT)
         {
@@ -41 +49 @@
         { 
             return true; 
         }
-#elif defined (__APPLE__)
-        Debugger();
-        //SysBreak();
-#elif defined (__arm__)
-        __asm__("bkpt 0");
-#else
-        // AFAIK This is available on all X86 platforms
-        __asm__("int $0x03");
-#endif // WIN32
+    #elif defined(__APPLE__)
+        // Use apple builtins
+        Debugger();
+    #elif defined(__i386__) or defined(__LP64__)
+        // Use hardware breakpoints on UNIX-like x86 based hardware
+        __asm__("int $0x03");
+    #else
+        // Use software breakpoints as a fallback on UNIX-like systems
+        throw(SIGTRAP);
+    #endif
         return false;
     }
 #else // _DEBUG

libraries/source/fcollada/src/Makefile

@@ -1 +1 @@
 OS_ARCH := $(shell uname -s)
-OS_CPU := $(shell uname -p)
 
 ifeq ($(OS_ARCH),Darwin)
-PIC_FLAGS ?= -fPIC
+    PIC_FLAGS ?= -fPIC
 else
-OS_DEFINE ?= -DLINUX
-PIC_FLAGS ?= -fpic
+    OS_DEFINE ?= -DLINUX
+    PIC_FLAGS ?= -fpic
 endif
 
 CXX ?= g++
 CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
-# If we're compiling on *nix ARM, target Cortex-A15 CPUs with NEON ***mfloat-abi setting must be the same on everything linked to FCollada***
-ifeq ($(OS_CPU),armv7l)
-CXXFLAGS += -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard
-endif
 CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
 CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
 # (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1 until gcc >4.3 is typical.)