Module Name: src Committed By: yamt Date: Thu May 22 11:26:35 UTC 2014
Modified Files: src/compat [yamt-pagecache]: archdirs.mk src/compat/arm/eabi [yamt-pagecache]: bsd.eabi.mk src/compat/mips64/o32 [yamt-pagecache]: bsd.o32.mk Added Files: src/compat/arm/oabi [yamt-pagecache]: Makefile bsd.oabi.mk src/compat/powerpc64/powerpc [yamt-pagecache]: Makefile bsd.powerpc.mk Log Message: sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") To generate a diff of this commit: cvs rdiff -u -r1.1.8.1 -r1.1.8.2 src/compat/archdirs.mk cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/compat/arm/eabi/bsd.eabi.mk cvs rdiff -u -r0 -r1.1.10.2 src/compat/arm/oabi/Makefile cvs rdiff -u -r0 -r1.2.4.2 src/compat/arm/oabi/bsd.oabi.mk cvs rdiff -u -r1.9 -r1.9.2.1 src/compat/mips64/o32/bsd.o32.mk cvs rdiff -u -r0 -r1.1.4.2 src/compat/powerpc64/powerpc/Makefile cvs rdiff -u -r0 -r1.2.4.2 src/compat/powerpc64/powerpc/bsd.powerpc.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/compat/archdirs.mk diff -u src/compat/archdirs.mk:1.1.8.1 src/compat/archdirs.mk:1.1.8.2 --- src/compat/archdirs.mk:1.1.8.1 Tue Oct 30 18:46:16 2012 +++ src/compat/archdirs.mk Thu May 22 11:26:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: archdirs.mk,v 1.1.8.1 2012/10/30 18:46:16 yamt Exp $ +# $NetBSD: archdirs.mk,v 1.1.8.2 2014/05/22 11:26:34 yamt Exp $ # list of subdirs used per-platform @@ -10,10 +10,22 @@ ARCHDIR_SUBDIR= sparc64/sparc ARCHDIR_SUBDIR= amd64/i386 .endif -.if (${MACHINE_ARCH} == "armeb" || ${MACHINE_ARCH} == "arm") +.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb") ARCHDIR_SUBDIR= arm/eabi .endif +.if (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb") +ARCHDIR_SUBDIR= arm/oabi +.endif + +.if (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb") +ARCHDIR_SUBDIR= arm/oabi arm/eabi +.endif + .if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") ARCHDIR_SUBDIR= mips64/64 mips64/o32 .endif + +.if ${MACHINE_ARCH} == "powerpc64" +ARCHDIR_SUBDIR= powerpc64/powerpc +.endif Index: src/compat/arm/eabi/bsd.eabi.mk diff -u src/compat/arm/eabi/bsd.eabi.mk:1.1.4.2 src/compat/arm/eabi/bsd.eabi.mk:1.1.4.3 --- src/compat/arm/eabi/bsd.eabi.mk:1.1.4.2 Tue Oct 30 18:46:17 2012 +++ src/compat/arm/eabi/bsd.eabi.mk Thu May 22 11:26:34 2014 @@ -1,11 +1,28 @@ -# $NetBSD: bsd.eabi.mk,v 1.1.4.2 2012/10/30 18:46:17 yamt Exp $ +# $NetBSD: bsd.eabi.mk,v 1.1.4.3 2014/05/22 11:26:34 yamt Exp $ -MLIBDIR= eabi +MLIBDIR= eabi +.if ${MACHINE_ARCH:M*eb} != "" +EARM_MACHINE_ARCH= earmeb +LD+= -m armelfb_nbsd_eabi +.else +EARM_MACHINE_ARCH= earm +LD+= -m armelf_nbsd_eabi +.endif +LIBC_MACHINE_ARCH= ${EARM_MACHINE_ARCH} +LIBGCC_MACHINE_ARCH= ${EARM_MACHINE_ARCH} +COMMON_MACHINE_ARCH= ${EARM_MACHINE_ARCH} +KVM_MACHINE_ARCH= ${EARM_MACHINE_ARCH} +PTHREAD_MACHINE_ARCH= ${EARM_MACHINE_ARCH} +BFD_MACHINE_ARCH= ${EARM_MACHINE_ARCH} +CSU_MACHINE_ARCH= ${EARM_MACHINE_ARCH} +CRYPTO_MACHINE_CPU= ${EARM_MACHINE_ARCH} +LDELFSO_MACHINE_CPU= ${EARM_MACHINE_ARCH} +GOMP_MACHINE_ARCH= ${EARM_MACHINE_ARCH} -COPTS+= -mabi=aapcs-linux -CPUFLAGS+= -mabi=aapcs-linux -LDADD+= -mabi=aapcs-linux -LDFLAGS+= -mabi=aapcs-linux -MKDEPFLAGS+= -mabi=aapcs-linux +COPTS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5 +CPUFLAGS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5 +LDADD+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5 +LDFLAGS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5 +MKDEPFLAGS+= -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5 .include "${.PARSEDIR}/../../Makefile.compat" Index: src/compat/mips64/o32/bsd.o32.mk diff -u src/compat/mips64/o32/bsd.o32.mk:1.9 src/compat/mips64/o32/bsd.o32.mk:1.9.2.1 --- src/compat/mips64/o32/bsd.o32.mk:1.9 Fri Sep 23 06:44:37 2011 +++ src/compat/mips64/o32/bsd.o32.mk Thu May 22 11:26:35 2014 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.o32.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $ +# $NetBSD: bsd.o32.mk,v 1.9.2.1 2014/05/22 11:26:35 yamt Exp $ .if ${MACHINE_ARCH} == "mips64eb" LD+= -m elf32btsmip @@ -7,6 +7,7 @@ LD+= -m elf32ltsmip .endif MLIBDIR= o32 +LIBGCC_MACHINE_ARCH= ${MACHINE_ARCH:S/64//} GOMP_MACHINE_ARCH= ${MACHINE_ARCH:S/64//} COPTS+= -mabi=32 -march=mips3 Added files: Index: src/compat/arm/oabi/Makefile diff -u /dev/null src/compat/arm/oabi/Makefile:1.1.10.2 --- /dev/null Thu May 22 11:26:35 2014 +++ src/compat/arm/oabi/Makefile Thu May 22 11:26:35 2014 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1.10.2 2014/05/22 11:26:35 yamt Exp $ + +BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.oabi.mk + +.include "../../compatsubdir.mk" Index: src/compat/arm/oabi/bsd.oabi.mk diff -u /dev/null src/compat/arm/oabi/bsd.oabi.mk:1.2.4.2 --- /dev/null Thu May 22 11:26:35 2014 +++ src/compat/arm/oabi/bsd.oabi.mk Thu May 22 11:26:35 2014 @@ -0,0 +1,29 @@ +# $NetBSD: bsd.oabi.mk,v 1.2.4.2 2014/05/22 11:26:35 yamt Exp $ + +MLIBDIR= oabi +.if ${MACHINE_ARCH:M*eb} != "" +ARM_MACHINE_ARCH= armeb +LD+= -m armelfb +.else +ARM_MACHINE_ARCH= arm +LD+= -m armelf +.endif +LIBC_MACHINE_ARCH= ${ARM_MACHINE_ARCH} +LIBGCC_MACHINE_ARCH= ${ARM_MACHINE_ARCH} +LIBEXECINFO_MACHINE_ARCH= ${ARM_MACHINE_ARCH} +COMMON_MACHINE_ARCH= ${ARM_MACHINE_ARCH} +KVM_MACHINE_ARCH= ${ARM_MACHINE_ARCH} +PTHREAD_MACHINE_ARCH= ${ARM_MACHINE_ARCH} +BFD_MACHINE_ARCH= ${ARM_MACHINE_ARCH} +CSU_MACHINE_ARCH= ${ARM_MACHINE_ARCH} +CRYPTO_MACHINE_CPU= ${ARM_MACHINE_ARCH} +LDELFSO_MACHINE_CPU= ${ARM_MACHINE_ARCH} +GOMP_MACHINE_ARCH= ${ARM_MACHINE_ARCH} + +COPTS+= ${ARM_APCS_FLAGS} +CPUFLAGS+= ${ARM_APCS_FLAGS} +LDADD+= ${ARM_APCS_FLAGS} +LDFLAGS+= ${ARM_APCS_FLAGS} +MKDEPFLAGS+= ${ARM_APCS_FLAGS} + +.include "${.PARSEDIR}/../../Makefile.compat" Index: src/compat/powerpc64/powerpc/Makefile diff -u /dev/null src/compat/powerpc64/powerpc/Makefile:1.1.4.2 --- /dev/null Thu May 22 11:26:35 2014 +++ src/compat/powerpc64/powerpc/Makefile Thu May 22 11:26:35 2014 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1.4.2 2014/05/22 11:26:35 yamt Exp $ + +BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.powerpc.mk + +.include "../../compatsubdir.mk" Index: src/compat/powerpc64/powerpc/bsd.powerpc.mk diff -u /dev/null src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.2.4.2 --- /dev/null Thu May 22 11:26:35 2014 +++ src/compat/powerpc64/powerpc/bsd.powerpc.mk Thu May 22 11:26:35 2014 @@ -0,0 +1,15 @@ +# $NetBSD: bsd.powerpc.mk,v 1.2.4.2 2014/05/22 11:26:35 yamt Exp $ + +LD+= -m elf32ppc_nbsd +MLIBDIR= powerpc +LIBC_MACHINE_ARCH= ${MLIBDIR} +COMMON_MACHINE_ARCH= ${MLIBDIR} +KVM_MACHINE_ARCH= ${MLIBDIR} +PTHREAD_MACHINE_ARCH= ${MLIBDIR} +BFD_MACHINE_ARCH= ${MLIBDIR} +CSU_MACHINE_ARCH= ${MLIBDIR} +CRYPTO_MACHINE_CPU= ${MLIBDIR} +LDELFSO_MACHINE_ARCH= ${MLIBDIR} +GOMP_MACHINE_ARCH= ${MLIBDIR} + +.include "${.PARSEDIR}/../../m32.mk"