André Hentschel : winebuild: get_asm_ptr_keyword is not needed for ARM.

Alexandre Julliard julliard at winehq.org
Fri Jun 17 13:13:45 CDT 2011


Module: wine
Branch: master
Commit: cd9ff09d8e3b147c376e68b92560de1c1a522fe1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cd9ff09d8e3b147c376e68b92560de1c1a522fe1

Author: André Hentschel <nerv at dawncrow.de>
Date:   Thu Jun 16 22:06:33 2011 +0200

winebuild: get_asm_ptr_keyword is not needed for ARM.

---

 tools/winebuild/import.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index a2c51ea..b0901a6 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -673,7 +673,7 @@ static void output_import_thunk( const char *name, const char *table, int pos )
     case CPU_ARM:
         output( "\tldr IP,[PC,#0]\n");
         output( "\tmov PC,PC\n");
-        output( "\t%s %s\n", get_asm_ptr_keyword(), table );
+        output( "\t.long %s\n", table );
         output( "\tldr PC,[IP,#%d]\n", pos);
         break;
     case CPU_POWERPC:
@@ -989,7 +989,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec )
         output( "\tmov LR,PC\n");
         output( "\tadd LR,LR,#8\n");
         output( "\tldr PC,[PC,#-4]\n");
-        output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name("__wine_spec_delay_load") );
+        output( "\t.long %s\n", asm_name("__wine_spec_delay_load") );
         output( "\tmov IP,r0\n");
         output( "\tldmfd  SP!, {r4-r10,FP,LR}\n" );
         output( "\tldmfd  SP!, {r0-r3}\n" );
@@ -1084,7 +1084,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec )
                 output( "\tmov r0, r1\n" );
                 output( "\tadd r0, #%d\n", j );
                 output( "\tldr PC,[PC,#-4]\n");
-                output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name("__wine_delay_load_asm") );
+                output( "\t.long %s\n", asm_name("__wine_delay_load_asm") );
                 break;
             case CPU_POWERPC:
                 switch(target_platform)




More information about the wine-cvs mailing list