diff options
| -rw-r--r-- | include/elf/ChangeLog | 5 | ||||
| -rw-r--r-- | include/elf/sh.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index beb85a7f2..e87cdd2e0 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 3 20:35:58 2003 J"orn Rennecke <joern.rennecke@superh.com> + + * sh.h (EF_SH_MERGE_MACH): Make sure SH2E & SH3/SH3E merge to SH3E, + and SH2E & SH4 merge to SH4, not SH2E. + 2003-02-21 Ian Wienand <ianw@gelato.unsw.edu.au> * ia64.h (SHT_IA_64_LOPSREG, SHT_IA_64_HIPSREG, diff --git a/include/elf/sh.h b/include/elf/sh.h index 41bf0bf69..00a5f2adc 100644 --- a/include/elf/sh.h +++ b/include/elf/sh.h @@ -56,7 +56,8 @@ : (((mach1) == EF_SH3E && (mach2) == EF_SH_UNKNOWN) \ || ((mach2) == EF_SH3E && (mach1) == EF_SH_UNKNOWN)) \ ? EF_SH4 \ - : ((mach1) > (mach2) ? (mach1) : (mach2))) + : (((mach1) == EF_SH2E ? 7 : (mach1)) > ((mach2) == EF_SH2E ? 7 : (mach2)) \ + ? (mach1) : (mach2))) /* Flags for the st_other symbol field. Keep away from the STV_ visibility flags (bit 0..1). */ |