Bug#593700: The package has a generic C version of this function

[Chris Butler]

On Mon, Nov 15, 2010 at 09:29:44PM -0500, Asheesh Laroia wrote:
> Take a look at line 35 of source/snd_qf/snd_mix.c. There is (what
> appears to be) a portable C version of the
> S_WriteLinearBlastStereo16 function.
> 
> Now to take a look at what guides the choices at compile time

This seems to have been caused by the following change:

  * New upstream release. (Closes: #544787).
  + Don't apply fix_different_archs.diff, upstream source different.

Part of that patch includes the following change to
./warsow_0.42_src/source/game/q_shared.h:

-#if ( defined ( _M_IX86 ) || defined ( __i386__ ) || defined ( __ia64__ ) ) && 
!defined ( C_ONLY )
+#if (defined(_M_IX86) || defined(__i386__)) && !defined(C_ONLY)
 #define id386
 #else
 #ifdef id386


i.e. it stops it from defining "id386" when __ia6__ is defined. "id386" is
used to determine when to use the x86 assembler code.

The location of this file has changed, it is now at
./source/gameshared/q_arch.h, but the patch is easily applied to that file
instead. Refreshed patch is attached.


This bug doesn't affect the version of the package that's currently in
testing, since this new upstream release never migrated.

-- 
Chris Butler 
  GnuPG Key ID: 4096R/49E3ACD3
Fixes some problems on other architectures.
===
--- a/source/gameshared/q_arch.h
+++ b/source/gameshared/q_arch.h
@@ -185,9 +185,33 @@
 #define ARCH "x86_64"
 #define CPUSTRING "x86_64"
 #endif
-#elif defined ( __powerpc__ )
-#define CPUSTRING "ppc"
-#define ARCH "ppc"
+# elif defined(__powerpc64__)
+#  define CPUSTRING "ppc64"
+#  define ARCH "ppc64"
+# elif defined(__powerpc__)
+#  define CPUSTRING "ppc"
+#  define ARCH "ppc"
+# elif defined(__arm__)
+#  define CPUSTRING "arm"
+#  define ARCH "arm"
+# elif defined(__hppa__)
+#  define CPUSTRING "parisc64"
+#  define ARCH "parisc64"
+# elif defined(__ia64__)
+#  define CPUSTRING "ia64"
+#  define ARCH "ia64"
+# elif defined(__m68k__)
+#  define CPUSTRING "m68k"
+#  define ARCH "m68k"
+# elif defined(__mips__)
+#  define CPUSTRING "mips"
+#  define ARCH "mips"
+# elif defined(__s390__)
+#  define CPUSTRING "s390"
+#  define ARCH "s390"
+# elif defined(__sparc__)
+#  define CPUSTRING "sparc"
+#  define ARCH "sparc"
 #elif defined ( __alpha__ )
 #define CPUSTRING "axp"
 #define ARCH "axp"
@@ -286,7 +310,7 @@
 #endif
 #endif
 
-#if ( defined ( _M_IX86 ) || defined ( __i386__ ) || defined ( __ia64__ ) ) && !defined ( C_ONLY )
+#if ( defined ( _M_IX86 ) || defined ( __i386__ ) ) && !defined ( C_ONLY )
 #define id386
 #else
 #ifdef id386

Bug#593700: The package has a generic C version of this function

[Bálint Réczey]

tag 593700 patch
thanks

Hi,

I think this small patch should fix the ia64 build problem.
I haven't tried it myself because I lack the necessary hardware.

Cheers,
Balint
--- source/snd_qf/snd_mix.c.orig	2010-12-18 00:19:32.0 +0100
+++ source/snd_qf/snd_mix.c	2010-12-18 00:20:47.0 +0100
@@ -27,7 +27,7 @@
 int *snd_p, snd_linear_count, snd_vol, music_vol;
 short *snd_out;
 
-#if !defined ( id386 ) || defined ( __MACOSX__ )
+#if !defined ( id386 ) || defined ( __MACOSX__ ) || defined ( __ia64__ )
 #ifdef _WIN32
 #pragma warning( push )
 #pragma warning( disable : 4310 )   // cast truncates constant value

Bug#593700: The package has a generic C version of this function

[Asheesh Laroia]

Take a look at line 35 of source/snd_qf/snd_mix.c. There is (what appears 
to be) a portable C version of the S_WriteLinearBlastStereo16 function.


Now to take a look at what guides the choices at compile time



--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org