diff --git a/bld/owl/c/owcoff.c b/bld/owl/c/owcoff.c index bbd6741031..34ea55f2cf 100644 --- a/bld/owl/c/owcoff.c +++ b/bld/owl/c/owcoff.c @@ -2,6 +2,7 @@ * * Open Watcom Project * +* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved. * Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved. * * ======================================================================== @@ -38,10 +39,9 @@ // must correspond to owl_cpu enums in owl.h - first entry is for PowerPC static uint_16 cpuTypes[] = { - COFF_IMAGE_FILE_MACHINE_POWERPC, - COFF_IMAGE_FILE_MACHINE_ALPHA, - COFF_IMAGE_FILE_MACHINE_R4000, - COFF_IMAGE_FILE_MACHINE_I386 + #define OWL_CPU(c,e,o) o, + OWL_CPUS + #undef OWL_CPU }; #define _OWLIndexToCOFFIndex( x ) ( (x) + FIRST_USER_SECTION ) diff --git a/bld/owl/c/owelf.c b/bld/owl/c/owelf.c index 898f0b5137..86a6efdfbd 100644 --- a/bld/owl/c/owelf.c +++ b/bld/owl/c/owelf.c @@ -58,7 +58,7 @@ static unsigned numSymbols( owl_file_handle file ) { } static Elf32_Half machineTypes[] = { - #define OWL_CPU(c,e) e, + #define OWL_CPU(c,e,o) e, OWL_CPUS #undef OWL_CPU }; diff --git a/bld/owl/h/owl.h b/bld/owl/h/owl.h index 12fa1d279e..a1b8ed5e20 100644 --- a/bld/owl/h/owl.h +++ b/bld/owl/h/owl.h @@ -39,11 +39,11 @@ #include #define OWL_CPUS \ - OWL_CPU( OWL_CPU_PPC, EM_PPC ) \ - OWL_CPU( OWL_CPU_ALPHA, EM_ALPHA ) \ - OWL_CPU( OWL_CPU_MIPS, EM_MIPS ) \ - OWL_CPU( OWL_CPU_X86, EM_386 ) \ - OWL_CPU( OWL_CPU_X64, EM_X86_64 ) + OWL_CPU( OWL_CPU_PPC, EM_PPC, COFF_IMAGE_FILE_MACHINE_POWERPC ) \ + OWL_CPU( OWL_CPU_ALPHA, EM_ALPHA, COFF_IMAGE_FILE_MACHINE_ALPHA ) \ + OWL_CPU( OWL_CPU_MIPS, EM_MIPS, COFF_IMAGE_FILE_MACHINE_R4000 ) \ + OWL_CPU( OWL_CPU_X86, EM_386, COFF_IMAGE_FILE_MACHINE_I386 ) \ + OWL_CPU( OWL_CPU_X64, EM_X86_64, COFF_IMAGE_FILE_MACHINE_AMD64 ) #define OWL_RELOCS \ OWL_RELOC( OWL_RELOC_ABSOLUTE ) /* ref to a 32-bit absolute address */ \ @@ -88,7 +88,7 @@ typedef enum { } owl_format; typedef enum { - #define OWL_CPU(c,e) c, + #define OWL_CPU(c,e,o) c, OWL_CPUS #undef OWL_CPU } owl_cpu;