From 948221a8bd69c734e599d0cd9f0d7227b6bfdc02 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 19 May 1999 07:27:14 +0000 Subject: [PATCH] Use renamed ARM cpu flag bits --- bfd/ChangeLog | 6 ++++++ bfd/coff-arm.c | 2 +- bfd/coffcode.h | 14 ++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 96151486f22..0b687c0fe57 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +Mon May 17 13:35:35 1999 Stan Cox + * coff-arm.c (_bfd_coff_arm_set_private_flags): Changed + F_PIC_INT to F_PIC. + * coffcode.h (coff_set_arch_mach_hook): Added F_ARM_2a, and + F_ARM_3M labels. Changed F_PIC_INT to F_PIC. + 1999-05-16 Nick Clifton * coff-mcore.c (in_reloc_p): Reinstate. diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c index 4b9ee8420a0..3c9934117a7 100644 --- a/bfd/coff-arm.c +++ b/bfd/coff-arm.c @@ -2189,7 +2189,7 @@ _bfd_coff_arm_set_private_flags (abfd, flags) if (APCS_SET (abfd) && ( (APCS_26_FLAG (abfd) != flag) || (APCS_FLOAT_FLAG (abfd) != (flags & F_APCS_FLOAT)) - || (PIC_FLAG (abfd) != (flags & F_PIC_INT ? F_PIC : 0)) + || (PIC_FLAG (abfd) != (flags & F_PIC)) )) return false; diff --git a/bfd/coffcode.h b/bfd/coffcode.h index bee6b666e47..bdd9769d5bb 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -1419,11 +1419,13 @@ coff_set_arch_mach_hook (abfd, filehdr) arch = bfd_arch_arm; switch (internal_f->f_flags & F_ARM_ARCHITECTURE_MASK) { - case F_ARM_2: machine = bfd_mach_arm_2; break; - case F_ARM_3: machine = bfd_mach_arm_3; break; - default: - case F_ARM_4: machine = bfd_mach_arm_4; break; - case F_ARM_4T: machine = bfd_mach_arm_4T; break; + case F_ARM_2: machine = bfd_mach_arm_2; break; + case F_ARM_2a: machine = bfd_mach_arm_2a; break; + case F_ARM_3: machine = bfd_mach_arm_3; break; + default: + case F_ARM_3M: machine = bfd_mach_arm_3M; break; + case F_ARM_4: machine = bfd_mach_arm_4; break; + case F_ARM_4T: machine = bfd_mach_arm_4T; break; } break; #endif @@ -2050,7 +2052,7 @@ coff_set_flags (abfd, magicp, flagsp) * flagsp |= F_APCS_FLOAT; if (PIC_FLAG (abfd)) - * flagsp |= F_PIC_INT; + * flagsp |= F_PIC; } if (INTERWORK_SET (abfd) && INTERWORK_FLAG (abfd)) * flagsp |= F_INTERWORK; -- 2.30.2