diff --git a/include/ChangeLog b/include/ChangeLog index 771808c64..79cf42d1f 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2003-01-20 Svein E. Seldal + + * coff/tic4x.h (TICOFF_TARGET_MACHINE_GET): Fixed define bug + * coff/ti.h (TICOFF_TARGET_MACHINE_GET): Added macros + 2002-07-17 Geoffrey Keating * splay-tree.h (GTY): Define if undefined. diff --git a/include/coff/ti.h b/include/coff/ti.h index 0a59b226a..8df15223c 100644 --- a/include/coff/ti.h +++ b/include/coff/ti.h @@ -57,6 +57,14 @@ struct external_filehdr #error "TICOFF_TARGET_ARCH needs to be defined for your CPU" #endif +#ifndef TICOFF_TARGET_MACHINE_GET +#define TICOFF_TARGET_MACHINE_GET(FLAGS) 0 +#endif + +#ifndef TICOFF_TARGET_MACHINE_SET +#define TICOFF_TARGET_MACHINE_SET(FLAGSP, MACHINE) +#endif + /* Default to COFF2 for file output */ #ifndef TICOFF_DEFAULT_MAGIC #define TICOFF_DEFAULT_MAGIC TICOFF2MAGIC diff --git a/include/coff/tic4x.h b/include/coff/tic4x.h index 03215fb53..083cc3b10 100644 --- a/include/coff/tic4x.h +++ b/include/coff/tic4x.h @@ -30,14 +30,14 @@ /* We use COFF2. */ #define TICOFF_DEFAULT_MAGIC TICOFF2MAGIC -#define TICOFF_TARGET_MACHINE_GET (FLAGS) \ +#define TICOFF_TARGET_MACHINE_GET(FLAGS) \ (((FLAGS) & F_VERS) ? bfd_mach_c4x : bfd_mach_c3x) -#define TICOFF_TARGET_MACHINE_SET (FLAGSP, MACHINE) \ +#define TICOFF_TARGET_MACHINE_SET(FLAGSP, MACHINE) \ do \ { \ if ((MACHINE) == bfd_mach_c4x) \ - *(FLAGSP) = F_VERS; \ + *(FLAGSP) |= F_VERS; \ } \ while (0)