21c21
< /* $FreeBSD: head/contrib/binutils/bfd/elf32-i386.c 104840 2002-10-11 06:10:28Z obrien $ */
---
> /* $FreeBSD: head/contrib/binutils/bfd/elf32-i386.c 107497 2002-12-02 09:22:58Z obrien $ */
509,510d508
<
< #ifndef ELF_DYNAMIC_INTERPRETER
512d509
< #endif
514d510
<
2625,2629d2620
< if (val != 0xa1)
< {
< BFD_ASSERT (rel->r_offset >= 2);
< type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
< }
2633c2624
< bfd_put_8 (output_bfd, 0xb8, contents + rel->r_offset - 2);
---
> bfd_put_8 (output_bfd, 0xb8, contents + rel->r_offset - 1);
2635c2626
< else if (type == 0x8b)
---
> else
2637,2642c2628,2653
< /* movl */
< BFD_ASSERT ((val & 0xc7) == 0x05);
< bfd_put_8 (output_bfd, 0xc7,
< contents + rel->r_offset - 2);
< bfd_put_8 (output_bfd, 0xc0 | ((val >> 3) & 7),
< contents + rel->r_offset - 1);
---
> BFD_ASSERT (rel->r_offset >= 2);
> type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
> switch (type)
> {
> case 0x8b:
> /* movl */
> BFD_ASSERT ((val & 0xc7) == 0x05);
> bfd_put_8 (output_bfd, 0xc7,
> contents + rel->r_offset - 2);
> bfd_put_8 (output_bfd,
> 0xc0 | ((val >> 3) & 7),
> contents + rel->r_offset - 1);
> break;
> case 0x03:
> /* addl */
> BFD_ASSERT ((val & 0xc7) == 0x05);
> bfd_put_8 (output_bfd, 0x81,
> contents + rel->r_offset - 2);
> bfd_put_8 (output_bfd,
> 0xc0 | ((val >> 3) & 7),
> contents + rel->r_offset - 1);
> break;
> default:
> BFD_FAIL ();
> break;
> }
2644,2654d2654
< else if (type == 0x03)
< {
< /* addl */
< BFD_ASSERT ((val & 0xc7) == 0x05);
< bfd_put_8 (output_bfd, 0x81,
< contents + rel->r_offset - 2);
< bfd_put_8 (output_bfd, 0xc0 | ((val >> 3) & 7),
< contents + rel->r_offset - 1);
< }
< else
< BFD_FAIL ();
3393d3392
< #ifndef ELF32_I386_C_INCLUDED
3395d3393
< #endif