Check for altivec assembly support before trying to use it. :)

libsdl-org · Jan 29, 2004 · c3a387b · c3a387b
1 parent 3d0758a
commit c3a387b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/configure.in b/configure.in
@@ -1723,15 +1723,35 @@ CheckUSBHID()
     fi
 }
 
+dnl Check for altivec instruction support using gas syntax
+CheckAltivec()
+{
+    AC_MSG_CHECKING(for GCC Altivec instruction support)
+    have_gcc_altivec=no
+    AC_TRY_COMPILE([
+    ],[
+        asm volatile ("mtspr 256, %0\n\t"
+                      "vand %%v0, %%v0, %%v0"
+                      :
+                      : "r" (-1));
+    ],[
+    have_gcc_altivec=yes
+    ])
+    if test x$have_gcc_altivec = xyes; then
+        CFLAGS="$CFLAGS -DGCC_ALTIVEC"
+    fi
+    AC_MSG_RESULT($have_gcc_altivec)
+}
+
 case "$target" in
     *-*-linux*|*-*-gnu*|*-*-k*bsd*-gnu)
         case "$target" in
-	  *-*-linux*) ARCH=linux ;;
-	  *-*-kfreebsd*-gnu) ARCH=kfreebsd-gnu ;;
-	  *-*-knetbsd*-gnu) ARCH=knetbsd-gnu ;;
-	  *-*-kopenbsd*-gnu) ARCH=kopenbsd-gnu ;;
-	  *-*-gnu*) ARCH=gnu ;; # must be last
-	esac
+          *-*-linux*) ARCH=linux ;;
+          *-*-kfreebsd*-gnu) ARCH=kfreebsd-gnu ;;
+          *-*-knetbsd*-gnu) ARCH=knetbsd-gnu ;;
+          *-*-kopenbsd*-gnu) ARCH=kopenbsd-gnu ;;
+          *-*-gnu*) ARCH=gnu ;; # must be last
+        esac
         CheckDummyVideo
         CheckDiskAudio
         CheckDLOPEN
@@ -1755,6 +1775,7 @@ case "$target" in
         CheckOpenGL
         CheckInputEvents
         CheckPTHREAD
+        CheckAltivec
         # Set up files for the main() stub
         if test "x$video_qtopia" = "xyes"; then
           SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"

diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c
@@ -236,7 +236,7 @@ static __inline__ int CPU_haveAltiVec()
 	int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0); 
 	if( 0 == error )
 		altivec = (hasVectorUnit != 0); 
-#elseif defined(USE_SETJMP) && defined(__GNUC__) && defined(__powerpc__)
+#elif defined(USE_SETJMP) && defined(GCC_ALTIVEC)
 	void (*handler)(int sig);
 	handler = signal(SIGILL, illegal_instruction);
 	if ( setjmp(jmpbuf) == 0 ) {