[Commit-gnuradio] r3432 - gnuradio/trunk/gnuradio-core/src/lib/filter

[michaelld]

Author: michaelld
Date: 2006-08-26 19:33:06 -0600 (Sat, 26 Aug 2006)
New Revision: 3432

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/filter/assembly.h
Log:
Hopeful fix for ticket:41 .  On Mac-Intel only, forces x86 assembly
for Darwin and XCode to ignore the debugging pseudo-ops, as it already
does in XCode 2.2 and 2.3 but creates an error in XCode 2.4.



Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/assembly.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/assembly.h      2006-08-26 
22:32:41 UTC (rev 3431)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/assembly.h      2006-08-27 
01:33:06 UTC (rev 3432)
@@ -23,10 +23,19 @@
 #ifndef _ASSEMBLY_H_
 #define _ASSEMBLY_H_
 
+#if defined (__APPLE__) && defined (__APPLE_CC__)
 
+// XCode ignores the .scl and .type functions in XCode 2.2.1 and 2.3,
+// but creates an error in XCode 2.4.  Just ignore them.
 
-#ifndef __ELF__
+#define GLOB_SYMB(f)    _ ## f
 
+#define DEF_FUNC_HEAD(f)  /* none */
+
+#define FUNC_TAIL(f)    /* none*/
+
+#elif !defined (__ELF__)
+
 /*
  * Too bad, the following define does not work as expected --SF
  *     #define GLOB_SYMB(f)    __USER_LABEL_PREFIX__ ## f