2009-05-23 Zoltan Varga <vargaz@gmail.com>

	* image-writer.c: Fix the definition of TARGET_ASM_....

svn path=/trunk/mono/; revision=134634

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index b5b1f8442bfadf3377ca359874b5e6b5b4ddfdc6..8846be5f25bb3c8148bd141e3da6fab4d214b897 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,7 @@
 2009-05-23  Zoltan Varga  <vargaz@gmail.com>
 
+       * image-writer.c: Fix the definition of TARGET_ASM_....
+       
        * image-writer.c: Fix the emission of assembler directives in the last
        change.
 

diff --git a/mono/mini/image-writer.c b/mono/mini/image-writer.c
index c983f08f37920582ac532c39ed6d539c669ef401..eac16b97a3da11dd3dd26f18fe26e6247b9583f0 100644 (file)
--- a/mono/mini/image-writer.c
+++ b/mono/mini/image-writer.c
@@ -52,19 +52,13 @@
  * TARGET_ASM_APPLE == apple assembler on OSX
  * TARGET_ASM_GAS == GNU assembler
  */
-#ifndef TARGET_ASM
+#if !defined(TARGET_ASM_APPLE) && !defined(TARGET_ASM_GAS)
 #ifdef __MACH__
-#define TARGET_ASM APPLE
-#else
-#define TARGET_ASM GAS
-#endif
-#endif
-
-#if TARGET_ASM == APPLE
 #define TARGET_ASM_APPLE
-#elif TARGET_ASM == GAS
+#else
 #define TARGET_ASM_GAS
 #endif
+#endif
 
 /*
  * Defines for the directives used by different assemblers