Module: wine Branch: master Commit: 46f52f77dccdaae22628b944e307177af5a91fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f52f77dccdaae22628b944e3...
Author: André Hentschel nerv@dawncrow.de Date: Tue Apr 19 19:31:23 2011 +0200
winebuild: Remove Alpha support.
---
tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 14 -------------- tools/winebuild/main.c | 2 -- tools/winebuild/spec32.c | 7 ------- tools/winebuild/utils.c | 4 ---- 5 files changed, 1 insertions(+), 28 deletions(-)
diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index b03b6b2..2429446 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -140,7 +140,7 @@ typedef struct
enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC, CPU_ARM, CPU_LAST = CPU_ARM + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_LAST = CPU_ARM };
enum target_platform diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8c97b32..a2c51ea 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -670,11 +670,6 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\trestore\n" ); } break; - case CPU_ALPHA: - output( "\tlda $0,%s\n", table ); - output( "\tlda $0,%d($0)\n", pos ); - output( "\tjmp $31,($0)\n" ); - break; case CPU_ARM: output( "\tldr IP,[PC,#0]\n"); output( "\tmov PC,PC\n"); @@ -989,10 +984,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp %%o0\n" ); output( "\trestore\n" ); break; - case CPU_ALPHA: - output( "\tjsr $26,%s\n", asm_name("__wine_spec_delay_load") ); - output( "\tjmp $31,($0)\n" ); - break; case CPU_ARM: output( "\tstmfd SP!, {r4-r10,FP,LR}\n" ); output( "\tmov LR,PC\n"); @@ -1082,11 +1073,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tset %d, %%g1\n", (idx << 16) | j ); output( "\tb,a %s\n", asm_name("__wine_delay_load_asm") ); break; - case CPU_ALPHA: - output( "\tlda $0,%d($31)\n", j); - output( "\tldah $0,%d($0)\n", idx); - output( "\tjmp $31,%s\n", asm_name("__wine_delay_load_asm") ); - break; case CPU_ARM: output( "\tstmfd SP!, {r0-r3}\n" ); output( "\tmov r0, #%d\n", idx ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 7c38e44..f6d39b0 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -55,8 +55,6 @@ enum target_cpu target_cpu = CPU_x86; enum target_cpu target_cpu = CPU_x86_64; #elif defined(__sparc__) enum target_cpu target_cpu = CPU_SPARC; -#elif defined(__ALPHA__) -enum target_cpu target_cpu = CPU_ALPHA; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 2429982..e55acf0 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -34,7 +34,6 @@
#define IMAGE_FILE_MACHINE_UNKNOWN 0 #define IMAGE_FILE_MACHINE_I386 0x014c -#define IMAGE_FILE_MACHINE_ALPHA 0x0184 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_ARM 0x01C0 @@ -398,9 +397,6 @@ static void output_asm_constructor( const char *constructor ) output( "\tcall %s\n", asm_name(constructor) ); output( "\tnop\n" ); break; - case CPU_ALPHA: - output( "\tjsr $26,%s\n", asm_name(constructor) ); - break; case CPU_ARM: case CPU_POWERPC: output( "\tbl %s\n", asm_name(constructor) ); @@ -441,7 +437,6 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: case CPU_x86_64: - case CPU_ALPHA: case CPU_SPARC: output( "\tjmp 1f\n" ); break; @@ -470,7 +465,6 @@ void output_module( DLLSPEC *spec ) case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARM; break; case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; - case CPU_ALPHA: machine = IMAGE_FILE_MACHINE_ALPHA; break; case CPU_SPARC: machine = IMAGE_FILE_MACHINE_UNKNOWN; break; } output( "\t%s 0x%04x\n", /* Machine */ @@ -657,7 +651,6 @@ void output_fake_module( DLLSPEC *spec ) case CPU_x86: put_word( IMAGE_FILE_MACHINE_I386 ); break; case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; - case CPU_ALPHA: put_word( IMAGE_FILE_MACHINE_ALPHA ); break; case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_UNKNOWN ); break; case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARM ); break; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 9aadf14..ad637b6 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -57,7 +57,6 @@ static const struct { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, - { "alpha", CPU_ALPHA }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM } }; @@ -844,7 +843,6 @@ unsigned int get_alignment(unsigned int align) if (target_platform != PLATFORM_APPLE) return align; /* fall through */ case CPU_POWERPC: - case CPU_ALPHA: case CPU_ARM: n = 0; while ((1u << n) != align) n++; @@ -865,7 +863,6 @@ unsigned int get_page_size(void) case CPU_POWERPC: return 4096; case CPU_ARM: return 4096; case CPU_SPARC: return 8192; - case CPU_ALPHA: return 8192; } /* unreached */ assert(0); @@ -880,7 +877,6 @@ unsigned int get_ptr_size(void) case CPU_x86: case CPU_POWERPC: case CPU_SPARC: - case CPU_ALPHA: case CPU_ARM: return 4; case CPU_x86_64: