Received: by mail.netbsd.org (Postfix, from userid 0) id 35D1E63B177; Mon, 14 Dec 2009 06:57:25 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 77FFD63B23D for ; Mon, 14 Dec 2009 06:57:18 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id B8443175DF; Mon, 14 Dec 2009 06:57:17 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: binary Content-Type: text/plain Date: Mon, 14 Dec 2009 06:57:17 +0000 From: matthew green Subject: CVS commit: [matt-nb5-mips64] src/libexec/ld.elf_so To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20091214065717.B8443175DF@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: list Reply-To: source-changes-d@NetBSD.org Module Name: src Committed By: mrg Date: Mon Dec 14 06:57:17 UTC 2009 Modified Files: src/libexec/ld.elf_so [matt-nb5-mips64]: Makefile src/libexec/ld.elf_so/arch/i386 [matt-nb5-mips64]: Makefile.inc src/libexec/ld.elf_so/arch/mips [matt-nb5-mips64]: Makefile.inc src/libexec/ld.elf_so/arch/sparc [matt-nb5-mips64]: Makefile.inc Removed Files: src/libexec/ld.elf_so/arch/i386 [matt-nb5-mips64]: Makefile.ld32 src/libexec/ld.elf_so/arch/sparc [matt-nb5-mips64]: Makefile.ld32 Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.87.8.1 src/libexec/ld.elf_so/Makefile cvs rdiff -u -r1.11.2.1 -r1.11.2.1.4.1 \ src/libexec/ld.elf_so/arch/i386/Makefile.inc cvs rdiff -u -r1.1.2.2 -r0 src/libexec/ld.elf_so/arch/i386/Makefile.ld32 cvs rdiff -u -r1.15.32.4 -r1.15.32.5 \ src/libexec/ld.elf_so/arch/mips/Makefile.inc cvs rdiff -u -r1.11.2.1 -r1.11.2.1.4.1 \ src/libexec/ld.elf_so/arch/sparc/Makefile.inc cvs rdiff -u -r1.1.2.2 -r0 src/libexec/ld.elf_so/arch/sparc/Makefile.ld32 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.