Signed-off-by: André Hentschel nerv@dawncrow.de --- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_ppc.c | 305 ---------------------------------- programs/winedbg/gdbproxy.c | 4 - programs/winedbg/tgt_active.c | 2 - programs/winedbg/winedbg.c | 4 - 5 files changed, 316 deletions(-) delete mode 100644 programs/winedbg/be_ppc.c
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 22c4cd23e85..ca60d566288 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -8,7 +8,6 @@ C_SRCS = \ be_arm.c \ be_arm64.c \ be_i386.c \ - be_ppc.c \ be_x86_64.c \ break.c \ crashdlg.c \ diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c deleted file mode 100644 index 2057590d94e..00000000000 --- a/programs/winedbg/be_ppc.c +++ /dev/null @@ -1,305 +0,0 @@ -/* - * Debugger Power PC specific functions - * - * Copyright 2000-2003 Marcus Meissner - * 2004 Eric Pouech - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "debugger.h" - -#if defined(__powerpc__) - -static BOOL be_ppc_get_addr(HANDLE hThread, const dbg_ctx_t *ctx, - enum be_cpu_addr bca, ADDRESS64* addr) -{ - switch (bca) - { - case be_cpu_addr_pc: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->ctx.Iar); - default: - case be_cpu_addr_stack: - case be_cpu_addr_frame: - dbg_printf("not done\n"); - } - return FALSE; -} - -static BOOL be_ppc_get_register_info(int regno, enum be_cpu_addr* kind) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static void be_ppc_single_step(dbg_ctx_t *ctx, BOOL enable) -{ -#ifndef MSR_SE -# define MSR_SE (1<<10) -#endif - if (enable) ctx->ctx.Msr |= MSR_SE; - else ctx->ctx.Msr &= ~MSR_SE; -} - -static void be_ppc_print_context(HANDLE hThread, const dbg_ctx_t *ctx, int all_regs) -{ - dbg_printf("Context printing for PPC not done yet\n"); -} - -static void be_ppc_print_segment_info(HANDLE hThread, const dbg_ctx_t *ctx) -{ -} - -static struct dbg_internal_var be_ppc_ctx[] = -{ - {0, NULL, 0, dbg_itype_none} -}; - -static BOOL be_ppc_is_step_over_insn(const void* insn) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_is_function_return(const void* insn) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_is_break_insn(const void* insn) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_is_func_call(const void* insn, ADDRESS64* callee) -{ - return FALSE; -} - -static BOOL be_ppc_is_jump(const void* insn, ADDRESS64* jumpee) -{ - return FALSE; -} - -static void be_ppc_disasm_one_insn(ADDRESS64* addr, int display) - -{ - dbg_printf("Disasm NIY\n"); -} - -static BOOL be_ppc_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - dbg_ctx_t *ctx, enum be_xpoint_type type, - void* addr, unsigned long* val, unsigned size) -{ - unsigned long xbp; - SIZE_T sz; - - switch (type) - { - case be_xpoint_break: - if (!size) return FALSE; - if (!pio->read(hProcess, addr, val, 4, &sz) || sz != 4) return FALSE; - xbp = 0x7d821008; /* 7d 82 10 08 ... in big endian */ - if (!pio->write(hProcess, addr, &xbp, 4, &sz) || sz != 4) return FALSE; - break; - default: - dbg_printf("Unknown/unsupported bp type %c\n", type); - return FALSE; - } - return TRUE; -} - -static BOOL be_ppc_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - dbg_ctx_t *ctx, enum be_xpoint_type type, - void* addr, unsigned long val, unsigned size) -{ - SIZE_T sz; - - switch (type) - { - case be_xpoint_break: - if (!size) return FALSE; - if (!pio->write(hProcess, addr, &val, 4, &sz) || sz == 4) return FALSE; - break; - default: - dbg_printf("Unknown/unsupported bp type %c\n", type); - return FALSE; - } - return TRUE; -} - -static BOOL be_ppc_is_watchpoint_set(const dbg_ctx_t *ctx, unsigned idx) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static void be_ppc_clear_watchpoint(dbg_ctx_t *ctx, unsigned idx) -{ - dbg_printf("not done\n"); -} - -static int be_ppc_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) -{ - dbg_printf("not done\n"); - return 0; -} - -static BOOL be_ppc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - BOOL is_signed, LONGLONG* ret) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_store_integer(const struct dbg_lvalue* lvalue, unsigned size, - BOOL is_signed, LONGLONG val) -{ - dbg_printf("be_ppc_store_integer: not done\n"); - return FALSE; -} - -static BOOL be_ppc_get_context(HANDLE thread, dbg_ctx_t *ctx) -{ - ctx->ctx.ContextFlags = CONTEXT_ALL; - return GetThreadContext(thread, &ctx->ctx); -} - -static BOOL be_ppc_set_context(HANDLE thread, const dbg_ctx_t *ctx) -{ - return SetThreadContext(thread, &ctx->ctx); -} - -#define REG(f,n,t,r) {f, n, t, FIELD_OFFSET(CONTEXT, r), sizeof(((CONTEXT*)NULL)->r)} - -static struct gdb_register be_ppc_gdb_register_map[] = { - REG("core", "r0", NULL, Gpr0), - REG(NULL, "r1", NULL, Gpr1), - REG(NULL, "r2", NULL, Gpr2), - REG(NULL, "r3", NULL, Gpr3), - REG(NULL, "r4", NULL, Gpr4), - REG(NULL, "r5", NULL, Gpr5), - REG(NULL, "r6", NULL, Gpr6), - REG(NULL, "r7", NULL, Gpr7), - REG(NULL, "r8", NULL, Gpr8), - REG(NULL, "r9", NULL, Gpr9), - REG(NULL, "r10", NULL, Gpr10), - REG(NULL, "r11", NULL, Gpr11), - REG(NULL, "r12", NULL, Gpr12), - REG(NULL, "r13", NULL, Gpr13), - REG(NULL, "r14", NULL, Gpr14), - REG(NULL, "r15", NULL, Gpr15), - REG(NULL, "r16", NULL, Gpr16), - REG(NULL, "r17", NULL, Gpr17), - REG(NULL, "r18", NULL, Gpr18), - REG(NULL, "r19", NULL, Gpr19), - REG(NULL, "r20", NULL, Gpr20), - REG(NULL, "r21", NULL, Gpr21), - REG(NULL, "r22", NULL, Gpr22), - REG(NULL, "r23", NULL, Gpr23), - REG(NULL, "r24", NULL, Gpr24), - REG(NULL, "r25", NULL, Gpr25), - REG(NULL, "r26", NULL, Gpr26), - REG(NULL, "r27", NULL, Gpr27), - REG(NULL, "r28", NULL, Gpr28), - REG(NULL, "r29", NULL, Gpr29), - REG(NULL, "r30", NULL, Gpr30), - REG(NULL, "r31", NULL, Gpr31), - REG(NULL, "pc", "code_ptr", Iar), - REG(NULL, "msr", NULL, Msr), - REG(NULL, "cr", NULL, Cr), - REG(NULL, "lr", "code_ptr", Lr), - REG(NULL, "ctr", NULL, Ctr), - REG(NULL, "xer", NULL, Xer), - - REG("fpu", "f0", "ieee_single", Fpr0, 4), - REG(NULL, "f1", "ieee_single", Fpr1, 4), - REG(NULL, "f2", "ieee_single", Fpr2, 4), - REG(NULL, "f3", "ieee_single", Fpr3, 4), - REG(NULL, "f4", "ieee_single", Fpr4, 4), - REG(NULL, "f5", "ieee_single", Fpr5, 4), - REG(NULL, "f6", "ieee_single", Fpr6, 4), - REG(NULL, "f7", "ieee_single", Fpr7, 4), - REG(NULL, "f8", "ieee_single", Fpr8, 4), - REG(NULL, "f9", "ieee_single", Fpr9, 4), - REG(NULL, "f10", "ieee_single", Fpr10, 4), - REG(NULL, "f11", "ieee_single", Fpr11, 4), - REG(NULL, "f12", "ieee_single", Fpr12, 4), - REG(NULL, "f13", "ieee_single", Fpr13, 4), - REG(NULL, "f14", "ieee_single", Fpr14, 4), - REG(NULL, "f15", "ieee_single", Fpr15, 4), - REG(NULL, "f16", "ieee_single", Fpr16, 4), - REG(NULL, "f17", "ieee_single", Fpr17, 4), - REG(NULL, "f18", "ieee_single", Fpr18, 4), - REG(NULL, "f19", "ieee_single", Fpr19, 4), - REG(NULL, "f20", "ieee_single", Fpr20, 4), - REG(NULL, "f21", "ieee_single", Fpr21, 4), - REG(NULL, "f22", "ieee_single", Fpr22, 4), - REG(NULL, "f23", "ieee_single", Fpr23, 4), - REG(NULL, "f24", "ieee_single", Fpr24, 4), - REG(NULL, "f25", "ieee_single", Fpr25, 4), - REG(NULL, "f26", "ieee_single", Fpr26, 4), - REG(NULL, "f27", "ieee_single", Fpr27, 4), - REG(NULL, "f28", "ieee_single", Fpr28, 4), - REG(NULL, "f29", "ieee_single", Fpr29, 4), - REG(NULL, "f30", "ieee_single", Fpr30, 4), - REG(NULL, "f31", "ieee_single", Fpr31, 4), - REG(NULL, "fpscr", NULL, Fpscr, 4), - - /* FIXME: MQ is missing? FIELD_OFFSET(CONTEXT, Mq), */ - /* see gdb/nlm/ppc.c */ -}; - -struct backend_cpu be_ppc = -{ - IMAGE_FILE_MACHINE_POWERPC, - 4, - be_cpu_linearize, - be_cpu_build_addr, - be_ppc_get_addr, - be_ppc_get_register_info, - be_ppc_single_step, - be_ppc_print_context, - be_ppc_print_segment_info, - be_ppc_ctx, - be_ppc_is_step_over_insn, - be_ppc_is_function_return, - be_ppc_is_break_insn, - be_ppc_is_func_call, - be_ppc_is_jump, - be_ppc_disasm_one_insn, - be_ppc_insert_Xpoint, - be_ppc_remove_Xpoint, - be_ppc_is_watchpoint_set, - be_ppc_clear_watchpoint, - be_ppc_adjust_pc_for_break, - be_ppc_fetch_integer, - be_ppc_fetch_float, - be_ppc_store_integer, - be_ppc_get_context, - be_ppc_set_context, - be_ppc_gdb_register_map, - ARRAY_SIZE(be_ppc_gdb_register_map), -}; -#endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 332fb0c9d3b..c51fd342496 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1650,10 +1650,6 @@ static void packet_query_target_xml(struct gdb_context* gdbctx, struct backend_c packet_reply_add(gdbctx, "<architecture>i386</architecture>"); feature_prefix = "org.gnu.gdb.i386."; break; - case IMAGE_FILE_MACHINE_POWERPC: - packet_reply_add(gdbctx, "<architecture>powerpc:common</architecture>"); - feature_prefix = "org.gnu.gdb.power."; - break; case IMAGE_FILE_MACHINE_ARMNT: packet_reply_add(gdbctx, "<architecture>arm</architecture>"); feature_prefix = "org.gnu.gdb.arm."; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 91dea2f9d88..d4e2d7d6347 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -756,8 +756,6 @@ static void output_system_info(void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; -#elif defined(__powerpc__) - static const char platform[] = "powerpc"; #elif defined(__arm__) static const char platform[] = "arm"; #elif defined(__aarch64__) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 19f30f04e5d..abad9ef9984 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -281,8 +281,6 @@ struct dbg_process* dbg_get_process_h(HANDLE h)
#ifdef __i386__ extern struct backend_cpu be_i386; -#elif defined(__powerpc__) -extern struct backend_cpu be_ppc; #elif defined(__x86_64__) extern struct backend_cpu be_i386; extern struct backend_cpu be_x86_64; @@ -330,8 +328,6 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid,
#ifdef __i386__ p->be_cpu = &be_i386; -#elif defined(__powerpc__) - p->be_cpu = &be_ppc; #elif defined(__x86_64__) p->be_cpu = wow64 ? &be_i386 : &be_x86_64; #elif defined(__arm__) && !defined(__ARMEB__)
Signed-off-by: André Hentschel nerv@dawncrow.de --- programs/winetest/main.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 9d6a318e9cd..1731850bfdb 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -344,8 +344,6 @@ static void print_version (void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; -#elif defined(__powerpc__) - static const char platform[] = "powerpc"; #elif defined(__arm__) static const char platform[] = "arm"; #elif defined(__aarch64__)
Signed-off-by: André Hentschel nerv@dawncrow.de --- libs/wine/port.c | 17 ----------------- 1 file changed, 17 deletions(-)
diff --git a/libs/wine/port.c b/libs/wine/port.c index fb749bb75ec..618b280881e 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -114,23 +114,6 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") -#elif defined(__powerpc__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, - "mflr 0\n\t" /* get return address */ - "stw 0, 4(1)\n\t" /* save return address */ - "subi 5, 5, 16\n\t" /* reserve space on new stack */ - "stw 1, 12(5)\n\t" /* store old sp */ - "mtctr 3\n\t" /* func -> ctr */ - "mr 3,4\n\t" /* args -> function param 1 (r3) */ - "mr 1,5\n\t" /* stack */ - "li 0, 0\n\t" /* zero */ - "stw 0, 0(1)\n\t" /* bottom of stack */ - "stwu 1, -16(1)\n\t" /* create a frame for this function */ - "bctrl\n\t" /* call ctr */ - "lwz 1, 28(1)\n\t" /* fetch old sp */ - "lwz 0, 4(1)\n\t" /* fetch return address */ - "mtlr 0\n\t" /* return address -> lr */ - "blr") /* return */ #elif defined(__arm__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, "push {r4,LR}\n\t" /* save return address on stack */
Signed-off-by: André Hentschel nerv@dawncrow.de --- dlls/dbghelp/Makefile.in | 1 - dlls/dbghelp/cpu_ppc.c | 100 --------------------------------------- dlls/dbghelp/dbghelp.c | 2 - 3 files changed, 103 deletions(-) delete mode 100644 dlls/dbghelp/cpu_ppc.c
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 076c50323dd..a370b94e7ce 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -10,7 +10,6 @@ C_SRCS = \ cpu_arm.c \ cpu_arm64.c \ cpu_i386.c \ - cpu_ppc.c \ cpu_x86_64.c \ dbghelp.c \ dwarf.c \ diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c deleted file mode 100644 index 80db2be704b..00000000000 --- a/dlls/dbghelp/cpu_ppc.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * File cpu_ppc.c - * - * Copyright (C) 2009-2009, Eric Pouech. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "dbghelp_private.h" -#include "winternl.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); - -static BOOL ppc_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) -{ - switch (ca) - { -#if defined(__powerpc__) - case cpu_addr_pc: - addr->Mode = AddrModeFlat; - addr->Segment = 0; /* don't need segment */ - addr->Offset = ctx->Iar; - return TRUE; -#endif - default: - case cpu_addr_stack: - case cpu_addr_frame: - FIXME("not done\n"); - } - return FALSE; -} - -static BOOL ppc_stack_walk(struct cpu_stack_walk* csw, STACKFRAME64 *frame, - union ctx *ctx) -{ - FIXME("not done\n"); - return FALSE; -} - -static unsigned ppc_map_dwarf_register(unsigned regno, const struct module* module, BOOL eh_frame) -{ - FIXME("not done\n"); - return 0; -} - -static void *ppc_fetch_context_reg(union ctx *ctx, unsigned regno, unsigned *size) -{ - FIXME("NIY\n"); - return NULL; -} - -static const char* ppc_fetch_regname(unsigned regno) -{ - FIXME("Unknown register %x\n", regno); - return NULL; -} - -static BOOL ppc_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) -{ - FIXME("NIY\n"); - return FALSE; -} - -static BOOL ppc_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) -{ - FIXME("NIY\n"); - return FALSE; -} - -DECLSPEC_HIDDEN struct cpu cpu_ppc = { - IMAGE_FILE_MACHINE_POWERPC, - 4, - CV_REG_NONE, /* FIXME */ - ppc_get_addr, - ppc_stack_walk, - NULL, - ppc_map_dwarf_register, - ppc_fetch_context_reg, - ppc_fetch_regname, - ppc_fetch_minidump_thread, - ppc_fetch_minidump_module, -}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 67e249f6a0b..366343584b3 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -155,8 +155,6 @@ struct cpu* dbghelp_current_cpu = &cpu_i386 #elif defined(__x86_64__) &cpu_x86_64 -#elif defined(__powerpc__) - &cpu_ppc #elif defined(__arm__) &cpu_arm #elif defined(__aarch64__)
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=73636
Your paranoid android.
=== debiant (build log) ===
dbghelp.cross.o:dbghelp.c:(.data+0x1c): undefined reference to `cpu_ppc' collect2: error: ld returned 1 exit status Task: The win32 Wine build failed
=== debiant (build log) ===
/usr/bin/x86_64-w64-mingw32-ld: dbghelp.cross.o:dbghelp.c:(.data+0x30): undefined reference to `make[1]: Entering directory '/home/winetest/tools/testbot/var/wine-wow64/dlls/qedit' collect2: error: ld returned 1 exit status Task: The wow64 Wine build failed
Signed-off-by: André Hentschel nerv@dawncrow.de --- dlls/kernel32/tests/file.c | 2 -- dlls/kernel32/tests/loader.c | 2 -- dlls/kernel32/tests/module.c | 2 -- 3 files changed, 6 deletions(-)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 7001baa1730..0f2c00d75ad 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2309,8 +2309,6 @@ static BOOL create_fake_dll( LPCSTR filename ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; #elif defined __x86_64__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; -#elif defined __powerpc__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4bafd0f6349..59965984a67 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -105,8 +105,6 @@ static const IMAGE_NT_HEADERS nt_header_template = IMAGE_FILE_MACHINE_I386, /* Machine */ #elif defined __x86_64__ IMAGE_FILE_MACHINE_AMD64, /* Machine */ -#elif defined __powerpc__ - IMAGE_FILE_MACHINE_POWERPC, /* Machine */ #elif defined __arm__ IMAGE_FILE_MACHINE_ARMNT, /* Machine */ #elif defined __aarch64__ diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 59510442fec..6eb2fc804d1 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -68,8 +68,6 @@ static const struct IMAGE_FILE_MACHINE_I386, /* Machine */ #elif defined __x86_64__ IMAGE_FILE_MACHINE_AMD64, /* Machine */ -#elif defined __powerpc__ - IMAGE_FILE_MACHINE_POWERPC, /* Machine */ #elif defined __arm__ IMAGE_FILE_MACHINE_ARMNT, /* Machine */ #elif defined __aarch64__
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=73637
Your paranoid android.
=== w1064v1809_he (32 bit report) ===
kernel32: loader.c:3249: Test failed: child process failed to terminate
=== w1064v1809_ja (32 bit report) ===
kernel32: loader.c:3221: Test failed: child process failed to terminate
=== w1064v1809_zh_CN (32 bit report) ===
kernel32: loader.c:3249: Test failed: child process failed to terminate
=== w1064v1809 (64 bit report) ===
kernel32: loader.c:704: Test failed: 1426: got test dll but expected fallback loader.c:704: Test failed: 1432: got test dll but expected fallback loader.c:704: Test failed: 1438: got test dll but expected fallback loader.c:704: Test failed: 1445: got test dll but expected fallback loader.c:704: Test failed: 1472: got test dll but expected fallback
=== debiant (build log) ===
/usr/bin/i686-w64-mingw32-ld: dbghelp.cross.o:dbghelp.c:(.data+0x1c): undefined reference to `cpu_ppc' collect2: error: ld returned 1 exit status Task: The win32 Wine build failed
=== debiant (build log) ===
/usr/bin/x86_64-w64-mingw32-ld: dbghelp.cross.o:dbghelp.c:(.data+0x30): undefined reference to `cpu_ppc' collect2: error: ld returned 1 exit status Task: The wow64 Wine build failed
Signed-off-by: André Hentschel nerv@dawncrow.de --- dlls/setupapi/fakedll.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8cb80a9ef18..e83bbb2512c 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -280,8 +280,6 @@ static BOOL build_fake_dll( HANDLE file, const WCHAR *name ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; #elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; -#elif defined __powerpc__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #else nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; #endif
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=73638
Your paranoid android.
=== debiant (build log) ===
/usr/bin/i686-w64-mingw32-ld: dbghelp.cross.o:dbghelp.c:(.data+0x1c): undefined reference to `cpu_ppc' collect2: error: ld returned 1 exit status Task: The win32 Wine build failed
=== debiant (build log) ===
/usr/bin/x86_64-w64-mingw32-ld: dbghelp.cross.o:dbghelp.c:(.data+0x30): undefined reference to `cpu_ppc' collect2: error: ld returned 1 exit status Task: The wow64 Wine build failed
-
André Hentschel -
Marvin