CVS commit: [matt-nb5-mips64] src/compat
Module Name:src
Committed By: matt
Date: Wed Apr 21 05:17:03 UTC 2010
Modified Files:
src/compat [matt-nb5-mips64]: Makefile.md_subdir
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/compat/Makefile.md_subdir
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile.md_subdir
diff -u src/compat/Makefile.md_subdir:1.1.2.2 src/compat/Makefile.md_subdir:1.1.2.3
--- src/compat/Makefile.md_subdir:1.1.2.2 Wed Jan 27 06:52:47 2010
+++ src/compat/Makefile.md_subdir Wed Apr 21 05:17:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.md_subdir,v 1.1.2.2 2010/01/27 06:52:47 matt Exp $
+# $NetBSD: Makefile.md_subdir,v 1.1.2.3 2010/04/21 05:17:03 matt Exp $
# list of subdirs
@@ -11,5 +11,9 @@
.endif
.if (${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el)
-MD_SUBDIR= mips64/64 .WAIT mips64/o32
+MD_SUBDIR= mips64/64
+.if target(obj)
+MD_SUBDIR+= .WAIT
+.endif
+MD_SUBDIR+= mips64/o32
.endif
CVS commit: [matt-nb5-mips64] src/compat
Module Name:src
Committed By: matt
Date: Wed Jan 27 06:52:48 UTC 2010
Modified Files:
src/compat [matt-nb5-mips64]: Makefile.md_subdir
src/compat/dirshack [matt-nb5-mips64]: Makefile
Log Message:
Make compat build more tolerant of large number of parallel jobs
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/compat/Makefile.md_subdir
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/compat/dirshack/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile.md_subdir
diff -u src/compat/Makefile.md_subdir:1.1.2.1 src/compat/Makefile.md_subdir:1.1.2.2
--- src/compat/Makefile.md_subdir:1.1.2.1 Mon Dec 14 06:20:58 2009
+++ src/compat/Makefile.md_subdir Wed Jan 27 06:52:47 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.md_subdir,v 1.1.2.1 2009/12/14 06:20:58 mrg Exp $
+# $NetBSD: Makefile.md_subdir,v 1.1.2.2 2010/01/27 06:52:47 matt Exp $
# list of subdirs
@@ -11,5 +11,5 @@
.endif
.if (${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el)
-MD_SUBDIR= mips64/64 mips64/o32
+MD_SUBDIR= mips64/64 .WAIT mips64/o32
.endif
Index: src/compat/dirshack/Makefile
diff -u src/compat/dirshack/Makefile:1.1.2.2 src/compat/dirshack/Makefile:1.1.2.3
--- src/compat/dirshack/Makefile:1.1.2.2 Mon Dec 14 06:20:58 2009
+++ src/compat/dirshack/Makefile Wed Jan 27 06:52:47 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.2 2009/12/14 06:20:58 mrg Exp $
+# $NetBSD: Makefile,v 1.1.2.3 2010/01/27 06:52:47 matt Exp $
# hacky method to get compat multilib base objdirs created before
# make tries to go create the subdirs used for builds.
@@ -22,7 +22,7 @@
MAKEDIRTARGETENV= BOOTSTRAP_SUBDIRS=
-SUBDIR= ${MD_SUBDIR:C/^/..\//}
+SUBDIR= ${MD_SUBDIR:N.WAIT:C/^/..\//}
.endif # make(obj)
.endif # MKCOMPAT != no
CVS commit: [matt-nb5-mips64] src/compat
Module Name:src Committed By: mrg Date: Mon Dec 14 06:21:12 UTC 2009 Modified Files: src/compat [matt-nb5-mips64]: Makefile Makefile.compat README Added Files: src/compat [matt-nb5-mips64]: Makefile.common Makefile.m32 Makefile.md_subdir src/compat/amd64/i386 [matt-nb5-mips64]: Makefile bsd.i386.mk src/compat/dirshack [matt-nb5-mips64]: Makefile src/compat/mips64/64 [matt-nb5-mips64]: Makefile bsd.64.mk src/compat/mips64/o32 [matt-nb5-mips64]: Makefile bsd.o32.mk src/compat/sparc64/sparc [matt-nb5-mips64]: Makefile bsd.sparc.mk Removed Files: src/compat [matt-nb5-mips64]: build-makefiles src/compat/external/bsd/openldap/lib [matt-nb5-mips64]: Makefile src/compat/external/bsd/openldap/lib/liblber [matt-nb5-mips64]: Makefile src/compat/external/bsd/openldap/lib/libldap [matt-nb5-mips64]: Makefile src/compat/external/bsd/openldap/lib/libldap_r [matt-nb5-mips64]: Makefile src/compat/external/bsd/openldap/lib/liblutil [matt-nb5-mips64]: Makefile src/compat/gnu/lib [matt-nb5-mips64]: Makefile src/compat/gnu/lib/crtstuff4 [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libbfd [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libgcc4 [matt-nb5-mips64]: Makefile Makefile.inc src/compat/gnu/lib/libgcc4/libgcc [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libgcc4/libgcc_eh [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libgcc4/libgcc_s [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libgcc4/libgcov [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libiberty [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libmalloc [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libobjc4 [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libopcodes [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libstdc++-v3_4 [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libstdc++-v3_4/include [matt-nb5-mips64]: Makefile src/compat/gnu/lib/libsupc++4 [matt-nb5-mips64]: Makefile src/compat/lib [matt-nb5-mips64]: Makefile Makefile.inc src/compat/lib/csu [matt-nb5-mips64]: Makefile Makefile.real src/compat/lib/csu/i386_elf [matt-nb5-mips64]: Makefile crt0.c src/compat/lib/csu/mips [matt-nb5-mips64]: Makefile crt0.c src/compat/lib/csu/sparc_elf [matt-nb5-mips64]: Makefile crt0.c src/compat/lib/i18n_module [matt-nb5-mips64]: Makefile Makefile.inc src/compat/lib/i18n_module/BIG5 [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/DECHanyu [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/EUC [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/EUCTW [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/GBK2K [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/HZ [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/ISO2022 [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/JOHAB [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/MSKanji [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/UES [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/UTF1632 [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/UTF7 [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/UTF8 [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/VIQR [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/ZW [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/iconv_none [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/iconv_std [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/mapper_646 [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/mapper_none [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/mapper_parallel [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/mapper_serial [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/mapper_std [matt-nb5-mips64]: Makefile src/compat/lib/i18n_module/mapper_zone [matt-nb5-mips64]: Makefile src/compat/lib/libarch [matt-nb5-mips64]: Makefile src/compat/lib/libasn1 [matt-nb5-mips64]: Makefile src/compat/lib/libatf-c [matt-nb5-mips64]: Makefile src/compat/lib/libatf-c++ [matt-nb5-mips64]: Makefile src/compat/lib/libbind9 [matt-nb5-mips64]: Makefile src/compat/lib/libbluetooth [matt-nb5-mips64]: Makefile src/compat/lib/libbsdmalloc [matt-nb5-mips64]: Makefile src/compat/lib/libbz2 [matt-nb5-mips64]: Makefile src/compat/lib/libc [matt-nb5-mips64]: Makefile Makefile.inc src/compat/lib/libcom_err [matt-nb5-mips64]: Makefile src/compat/lib/libcompat [matt-nb5-mips64]: Makefile src/compat/lib/libcrypt [matt-nb5-mips64]: Makefile src/compat/lib/libcrypto [matt-nb5-mips64]:
CVS commit: [matt-nb5-mips64] src/compat
Module Name:src
Committed By: matt
Date: Sun Sep 13 21:21:17 UTC 2009
Modified Files:
src/compat [matt-nb5-mips64]: Makefile Makefile.compat
src/compat/lib/csu [matt-nb5-mips64]: Makefile
src/compat/libexec/ld.elf_so [matt-nb5-mips64]: Makefile
Added Files:
src/compat/lib/csu/mips [matt-nb5-mips64]: Makefile crt0.c
Log Message:
Add mips64 support (making n64 libraries) to compat
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.8.1 src/compat/Makefile
cvs rdiff -u -r1.3 -r1.3.8.1 src/compat/Makefile.compat
cvs rdiff -u -r1.3 -r1.3.8.1 src/compat/lib/csu/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/compat/lib/csu/mips/Makefile \
src/compat/lib/csu/mips/crt0.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.1.4.1 src/compat/libexec/ld.elf_so/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile
diff -u src/compat/Makefile:1.1 src/compat/Makefile:1.1.8.1
--- src/compat/Makefile:1.1 Sun Oct 26 07:38:27 2008
+++ src/compat/Makefile Sun Sep 13 21:21:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/10/26 07:38:27 mrg Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2009/09/13 21:21:16 matt Exp $
# Build 32-bit compat versions of:
# src/gnu/lib/libgcc4 into ${DESTDIR}/usr/lib/32arch
@@ -10,7 +10,8 @@
.include bsd.own.mk
.if ${MKCOMPAT} != no \
-(${MACHINE} == sparc64 || ${MACHINE} == amd64)
+(${MACHINE} == sparc64 || ${MACHINE} == amd64) || \
+(${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el)
.if !make(includes)
SUBDIR= gnu/lib/crtstuff4 .WAIT \
Index: src/compat/Makefile.compat
diff -u src/compat/Makefile.compat:1.3 src/compat/Makefile.compat:1.3.8.1
--- src/compat/Makefile.compat:1.3 Tue Oct 28 22:58:23 2008
+++ src/compat/Makefile.compat Sun Sep 13 21:21:16 2009
@@ -1,17 +1,36 @@
-# $NetBSD: Makefile.compat,v 1.3 2008/10/28 22:58:23 mrg Exp $
+# $NetBSD: Makefile.compat,v 1.3.8.1 2009/09/13 21:21:16 matt Exp $
+# XXX ugly
+.if ${MACHINE} == sparc64
+LD+= -m elf32_sparc
+LDFLAGS+= -m32
+LD32DIR= sparc
+ARCH32DIR= sparc
COPTS+= -m32
CPUFLAGS+= -m32
LDADD+= -m32
MKDEPFLAGS+= -m32
-# XXX ugly
-.if ${MACHINE} == sparc64
-LD+= -m elf32_sparc
-LD32DIR= sparc
.elif ${MACHINE} == amd64
LD+= -m elf_i386
+LDFLAGS+= -m32
LD32DIR= i386
+ARCH32DIR= i386
+COPTS+= -m32
+CPUFLAGS+= -m32
+LDADD+= -m32
+MKDEPFLAGS+= -m32
+
+.elif ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
+LD+= -m elf64${MACHINE_ARCH:S/mips64e//}tsmip
+LDFLAGS+= -mabi=64
+LD32DIR= lib64
+ARCH32DIR= ${MACHINE_ARCH}
+COPTS+= -mabi=64
+CPUFLAGS+= -mabi=64
+LDADD+= -mabi=64
+MKDEPFLAGS+= -mabi=64
+
.endif
LIBDIR= /usr/lib/${LD32DIR}
Index: src/compat/lib/csu/Makefile
diff -u src/compat/lib/csu/Makefile:1.3 src/compat/lib/csu/Makefile:1.3.8.1
--- src/compat/lib/csu/Makefile:1.3 Mon Oct 27 07:42:55 2008
+++ src/compat/lib/csu/Makefile Sun Sep 13 21:21:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/27 07:42:55 mrg Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2009/09/13 21:21:16 matt Exp $
# XXX
.include bsd.own.mk
@@ -11,6 +11,8 @@
SUBDIR= i386_elf
.elif ${MACHINE_ARCH} == sparc64
SUBDIR= sparc_elf
+.elif ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
+SUBDIR= mips
.endif
.include bsd.subdir.mk
Index: src/compat/libexec/ld.elf_so/Makefile
diff -u src/compat/libexec/ld.elf_so/Makefile:1.1.2.1 src/compat/libexec/ld.elf_so/Makefile:1.1.2.1.4.1
--- src/compat/libexec/ld.elf_so/Makefile:1.1.2.1 Thu Nov 6 23:51:26 2008
+++ src/compat/libexec/ld.elf_so/Makefile Sun Sep 13 21:21:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.1 2008/11/06 23:51:26 snj Exp $
+# $NetBSD: Makefile,v 1.1.2.1.4.1 2009/09/13 21:21:17 matt Exp $
NOMAN= # defined
@@ -9,8 +9,6 @@
SHLINKINSTALLDIR= /usr/libexec
-LDFLAGS+= -m32
-
#CPPFLAGS+= -DDEBUG
#CPPFLAGS+= -DRTLD_DEBUG
#CPPFLAGS+= -DRTLD_DEBUG_RELOC
@@ -28,6 +26,10 @@
.elif ${MACHINE} == amd64
PROG= ld.elf_so-i386
ARCHSUBDIR= i386
+.elif ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
+PROG= ld.elf_so-64
+ARCHSUBDIR= mips
+ABI64= -mabi=64
.endif
# XXX why do i need this?
Added files:
Index: src/compat/lib/csu/mips/Makefile
diff -u /dev/null src/compat/lib/csu/mips/Makefile:1.1.2.1
--- /dev/null Sun Sep 13 21:21:17 2009
+++ src/compat/lib/csu/mips/Makefile Sun Sep 13 21:21:17 2009
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1.2.1 2009/09/13 21:21:17 matt Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+
+NOCHECKVER= # defined
+
+.include bsd.obj.mk
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/lib/csu/mips
+.CURDIR:=${NETBSDSRCDIR}/lib/csu/mips
+
+.include ${NETBSDSRCDIR}/compat/Makefile.compat
+.include
