We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Add basic support for compiling on RISC OS

sdl2-riscos.patch (text/plain), 6.32 KB, created by Cameron Cawley on 2020-02-13 22:49:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cameron Cawley

Created: 2020-02-13 22:49:18 UTC

Size: 6.32 KB

patch

obsolete

># HG changeset patch
># User Cameron Cawley <ccawley2011@gmail.com>
># Date 1581627047 0
>#      Thu Feb 13 20:50:47 2020 +0000
># Node ID cff869f235cdb794992719eae5b376e390fc8fb3
># Parent  f09546039da0da94372152d864141b25980e00d6
>Add basic support for compiling on RISC OS
>
>diff -r f09546039da0 -r cff869f235cd CMakeLists.txt
>--- a/CMakeLists.txt	Sat Feb 08 19:34:51 2020 +0000
>+++ b/CMakeLists.txt	Thu Feb 13 20:50:47 2020 +0000
>@@ -129,7 +129,7 @@
> endif()
> 
> # Don't mistake osx for unix
>-if(UNIX AND NOT APPLE)
>+if(UNIX AND NOT APPLE AND NOT RISCOS)
>   set(UNIX_SYS ON)
> else()
>   set(UNIX_SYS OFF)
>@@ -341,7 +341,7 @@
> set_option(PTHREADS            "Use POSIX threads for multi-threading" ${SDL_PTHREADS_ENABLED_BY_DEFAULT})
> dep_option(PTHREADS_SEM        "Use pthread semaphores" ON "PTHREADS" OFF)
> set_option(SDL_DLOPEN          "Use dlopen for shared object loading" ${SDL_DLOPEN_ENABLED_BY_DEFAULT})
>-set_option(OSS                 "Support the OSS audio API" ${UNIX_SYS})
>+dep_option(OSS                 "Support the OSS audio API" ON "UNIX_SYS OR RISCOS" OFF)
> set_option(ALSA                "Support the ALSA audio API" ${UNIX_SYS})
> dep_option(ALSA_SHARED         "Dynamically load ALSA audio support" ON "ALSA" OFF)
> set_option(JACK                "Support the JACK audio API" ${UNIX_SYS})
>@@ -1091,7 +1091,7 @@
>     endif()
>   endif()
> 
>-elseif(UNIX AND NOT APPLE AND NOT ANDROID)
>+elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS)
>   if(SDL_AUDIO)
>     if(SYSV5 OR SOLARIS OR HPUX)
>         set(SDL_AUDIO_DRIVER_SUNAUDIO 1)
>@@ -1814,6 +1814,24 @@
>   endif()
> 
>   CheckPTHREAD()
>+
>+elseif(RISCOS)
>+  if(SDL_TIMERS)
>+    set(SDL_TIMER_UNIX 1)
>+    file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/unix/*.c)
>+    set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES})
>+    set(HAVE_SDL_TIMERS TRUE)
>+
>+    if(CLOCK_GETTIME)
>+      set(HAVE_CLOCK_GETTIME 1)
>+    endif()
>+  endif()
>+
>+  CheckPTHREAD()
>+
>+  if(SDL_AUDIO)
>+    CheckOSS()
>+  endif()
> endif()
> 
> if(VIDEO_VULKAN)
>diff -r f09546039da0 -r cff869f235cd configure
>--- a/configure	Sat Feb 08 19:34:51 2020 +0000
>+++ b/configure	Thu Feb 13 20:50:47 2020 +0000
>@@ -25359,6 +25359,27 @@
>             have_timers=yes
>         fi
>         ;;
>+    *-*-riscos*)
>+        ARCH=riscos
>+        CheckVisibilityHidden
>+        CheckDeclarationAfterStatement
>+        CheckDummyVideo
>+        CheckDiskAudio
>+        CheckDummyAudio
>+        CheckDLOPEN
>+        CheckOSS
>+        CheckPTHREAD
>+        CheckClockGettime
>+
>+        # Set up files for the timer library
>+        if test x$enable_timers = xyes; then
>+
>+$as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
>+
>+            SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
>+            have_timers=yes
>+        fi
>+        ;;
>     *)
>         as_fn_error $? "
> *** Unsupported host:  Please add to configure.ac
>diff -r f09546039da0 -r cff869f235cd configure.ac
>--- a/configure.ac	Sat Feb 08 19:34:51 2020 +0000
>+++ b/configure.ac	Thu Feb 13 20:50:47 2020 +0000
>@@ -4063,6 +4063,25 @@
>             have_timers=yes
>         fi
>         ;;
>+    *-*-riscos*)
>+        ARCH=riscos
>+        CheckVisibilityHidden
>+        CheckDeclarationAfterStatement
>+        CheckDummyVideo
>+        CheckDiskAudio
>+        CheckDummyAudio
>+        CheckDLOPEN
>+        CheckOSS
>+        CheckPTHREAD
>+        CheckClockGettime
>+
>+        # Set up files for the timer library
>+        if test x$enable_timers = xyes; then
>+            AC_DEFINE(SDL_TIMER_UNIX, 1, [ ])
>+            SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
>+            have_timers=yes
>+        fi
>+        ;;
>     *)
>         AC_MSG_ERROR([
> *** Unsupported host:  Please add to configure.ac
>diff -r f09546039da0 -r cff869f235cd src/atomic/SDL_spinlock.c
>--- a/src/atomic/SDL_spinlock.c	Sat Feb 08 19:34:51 2020 +0000
>+++ b/src/atomic/SDL_spinlock.c	Thu Feb 13 20:50:47 2020 +0000
>@@ -32,6 +32,10 @@
> #include <atomic.h>
> #endif
> 
>+#if !defined(HAVE_GCC_ATOMICS) && defined(__RISCOS__)
>+#include <unixlib/local.h>
>+#endif
>+
> #if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
> #include <xmmintrin.h>
> #endif
>@@ -84,6 +88,16 @@
>          defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5TE__) || \
>          defined(__ARM_ARCH_5TEJ__))
>     int result;
>+
>+#if defined(__RISCOS__)
>+    if (__cpucap_have_rex()) {
>+        __asm__ __volatile__ (
>+            "ldrex %0, [%2]\nteq   %0, #0\nstrexeq %0, %1, [%2]"
>+            : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory");
>+        return (result == 0);
>+    }
>+#endif
>+
>     __asm__ __volatile__ (
>         "swp %0, %1, [%2]\n"
>         : "=&r,&r" (result) : "r,0" (1), "r,r" (lock) : "memory");
>diff -r f09546039da0 -r cff869f235cd src/dynapi/SDL_dynapi.h
>--- a/src/dynapi/SDL_dynapi.h	Sat Feb 08 19:34:51 2020 +0000
>+++ b/src/dynapi/SDL_dynapi.h	Thu Feb 13 20:50:47 2020 +0000
>@@ -53,6 +53,8 @@
> #define SDL_DYNAMIC_API 0
> #elif defined(__PSP__) && __PSP__
> #define SDL_DYNAMIC_API 0
>+#elif defined(__riscos__) && __riscos__ /* probably not useful on RISC OS, since dlopen() can't be used when using static linking. */
>+#define SDL_DYNAMIC_API 0
> #elif defined(__clang_analyzer__)
> #define SDL_DYNAMIC_API 0  /* Turn off for static analysis, so reports are more clear. */
> #endif
>diff -r f09546039da0 -r cff869f235cd src/thread/pthread/SDL_systhread.c
>--- a/src/thread/pthread/SDL_systhread.c	Sat Feb 08 19:34:51 2020 +0000
>+++ b/src/thread/pthread/SDL_systhread.c	Thu Feb 13 20:50:47 2020 +0000
>@@ -188,7 +188,7 @@
> int
> SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
> {
>-#if __NACL__ 
>+#if __NACL__ || __RISCOS__
>     /* FIXME: Setting thread priority does not seem to be supported in NACL */
>     return 0;
> #elif __LINUX__
>diff -r f09546039da0 -r cff869f235cd test/configure
>--- a/test/configure	Sat Feb 08 19:34:51 2020 +0000
>+++ b/test/configure	Thu Feb 13 20:50:47 2020 +0000
>@@ -2988,6 +2988,11 @@
>         MATHLIB=""
>         SYS_GL_LIBS=""
>         ;;
>+    *-*-riscos* )
>+        EXE=",e1f"
>+        MATHLIB=""
>+        SYS_GL_LIBS=""
>+        ;;
>     *)
>                 ISUNIX="true"
>         EXE=""
>diff -r f09546039da0 -r cff869f235cd test/configure.ac
>--- a/test/configure.ac	Sat Feb 08 19:34:51 2020 +0000
>+++ b/test/configure.ac	Thu Feb 13 20:50:47 2020 +0000
>@@ -71,6 +71,11 @@
>         MATHLIB=""
>         SYS_GL_LIBS=""
>         ;;
>+    *-*-riscos* )
>+        EXE=",e1f"
>+        MATHLIB=""
>+        SYS_GL_LIBS=""
>+        ;;
>     *)
>         dnl Oh well, call it Unix...
>         ISUNIX="true"

Actions: View | Diff

Attachments on bug 4984: 4215

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.