---
- branch: matt-nb5-mips64
  date: Mon Dec 14 06:57:17 UTC 2009
  files:
  - new: 1.87.8.1
    old: '1.87'
    path: src/libexec/ld.elf_so/Makefile
    pathrev: src/libexec/ld.elf_so/Makefile@1.87.8.1
    type: modified
  - new: 1.11.2.1.4.1
    old: 1.11.2.1
    path: src/libexec/ld.elf_so/arch/i386/Makefile.inc
    pathrev: src/libexec/ld.elf_so/arch/i386/Makefile.inc@1.11.2.1.4.1
    type: modified
  - new: '0'
    old: 1.1.2.2
    path: src/libexec/ld.elf_so/arch/i386/Makefile.ld32
    pathrev: src/libexec/ld.elf_so/arch/i386/Makefile.ld32@0
    type: deleted
  - new: 1.15.32.5
    old: 1.15.32.4
    path: src/libexec/ld.elf_so/arch/mips/Makefile.inc
    pathrev: src/libexec/ld.elf_so/arch/mips/Makefile.inc@1.15.32.5
    type: modified
  - new: 1.11.2.1.4.1
    old: 1.11.2.1
    path: src/libexec/ld.elf_so/arch/sparc/Makefile.inc
    pathrev: src/libexec/ld.elf_so/arch/sparc/Makefile.inc@1.11.2.1.4.1
    type: modified
  - new: '0'
    old: 1.1.2.2
    path: src/libexec/ld.elf_so/arch/sparc/Makefile.ld32
    pathrev: src/libexec/ld.elf_so/arch/sparc/Makefile.ld32@0
    type: deleted
  id: 20091214T065717Z.1d6c0da489b7a1ff5ef2cf71a2989cc88e5fe71f
  log: |
    merge from -current:
    >rename LD32DIR to MLIBDIR.

    >- adjust the logic for compat ldd: add an elf32_compat module and arrange
    >  for mips64 to build this with MLIBDIR set to o32
    >- make mips64 ldd call elf32_compat_ldd as well
    >- make mips64 elf64 set MLIBDIR to 64
    >- don't need ld.elf_so's Makefile.ld32 files anymore (they are going away
    >  soon anyway)
    >
    >tested on amd64 and sparc64, and an earlier version tested on mips64.

    >if BSD_MK_COMPAT_FILE is defined, .include it.

    >simplify the logic for compat ld.elf_so and move it here.  we now can
    >find the libc objdir for multiple compat ld.elf_so's, too.
  module: src
  subject: 'CVS commit: [matt-nb5-mips64] src/libexec/ld.elf_so'
  unixtime: '1260773837'
  user: mrg