Date: Fri, 8 Jan 2010 23:30:43 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r201854 - in projects/ngroups: gnu/lib/libgcc gnu/usr.bin/binutils gnu/usr.bin/binutils/ld gnu/usr.bin/cc sys/conf sys/kern sys/rpc/rpcsec_gss Message-ID: <201001082330.o08NUhpi024999@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Jan 8 23:30:43 2010 New Revision: 201854 URL: http://svn.freebsd.org/changeset/base/201854 Log: MFC at r201853 Modified: projects/ngroups/gnu/lib/libgcc/Makefile projects/ngroups/gnu/usr.bin/binutils/Makefile.inc0 projects/ngroups/gnu/usr.bin/binutils/ld/Makefile.mips projects/ngroups/gnu/usr.bin/cc/Makefile.tgt projects/ngroups/sys/conf/NOTES projects/ngroups/sys/kern/kern_cpu.c projects/ngroups/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c projects/ngroups/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Directory Properties: projects/ngroups/ (props changed) projects/ngroups/cddl/contrib/opensolaris/ (props changed) projects/ngroups/contrib/ee/ (props changed) projects/ngroups/contrib/expat/ (props changed) projects/ngroups/contrib/less/ (props changed) projects/ngroups/contrib/tcsh/ (props changed) projects/ngroups/sys/cddl/contrib/opensolaris/ (props changed) projects/ngroups/sys/cddl/contrib/opensolaris/uts/common/rpc/ (props changed) projects/ngroups/sys/contrib/dev/acpica/ (props changed) projects/ngroups/sys/dev/xen/xenpci/ (props changed) Modified: projects/ngroups/gnu/lib/libgcc/Makefile ============================================================================== --- projects/ngroups/gnu/lib/libgcc/Makefile Fri Jan 8 23:26:10 2010 (r201853) +++ projects/ngroups/gnu/lib/libgcc/Makefile Fri Jan 8 23:30:43 2010 (r201854) @@ -115,6 +115,10 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns # _fixsfsi _fixunssfsi _floatdidf _floatdisf .endif +.if ${TARGET_ARCH} == "mips" +LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c +.endif + .if ${TARGET_ARCH} == "ia64" # from config/ia64/t-ia64 LIB1ASMSRC = lib1funcs.asm @@ -179,7 +183,7 @@ OBJ_GRPS = STD DIV # # Floating point emulation functions # -.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "mips" || \ +.if ${TARGET_ARCH} == "armNOT_YET" || \ ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" FPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES -DFLOAT Modified: projects/ngroups/gnu/usr.bin/binutils/Makefile.inc0 ============================================================================== --- projects/ngroups/gnu/usr.bin/binutils/Makefile.inc0 Fri Jan 8 23:26:10 2010 (r201853) +++ projects/ngroups/gnu/usr.bin/binutils/Makefile.inc0 Fri Jan 8 23:30:43 2010 (r201854) @@ -22,7 +22,8 @@ RELTOP:= .. RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" +.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || \ + ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "mips" CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 .else CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 Modified: projects/ngroups/gnu/usr.bin/binutils/ld/Makefile.mips ============================================================================== --- projects/ngroups/gnu/usr.bin/binutils/ld/Makefile.mips Fri Jan 8 23:26:10 2010 (r201853) +++ projects/ngroups/gnu/usr.bin/binutils/ld/Makefile.mips Fri Jan 8 23:30:43 2010 (r201854) @@ -10,15 +10,22 @@ NATIVE_EMULATION=elf${_sz}btsmip_fbsd NATIVE_EMULATION=elf${_sz}ltsmip_fbsd .endif -SRCS+= e${NATIVE_EMULATION}.c -CLEANFILES+= e${NATIVE_EMULATION}.c - +MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd +.for abi in ${MIPS_ABIS} +#.if (${abi} != ${NATIVE_EMULATION}) +EMS+= ${abi} +#.endif +.for ext in ${ELF_SCR_EXT} +LDSCRIPTS+= ${abi}.${ext} +.endfor +SRCS+= e${abi}.c +CLEANFILES+= e${abi}.c # nb: elf32 handles both elf32 and elf64 targets -e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \ +e${abi}.c: ${.CURDIR}/${abi}.sh emultempl/elf32.em \ scripttempl/elf.sc genscripts.sh stringify.sed sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \ - ${.CURDIR}/${NATIVE_EMULATION}.sh - + ${abi} "" no ${abi} ${TARGET_TUPLE} \ + ${.CURDIR}/${abi}.sh +.endfor Modified: projects/ngroups/gnu/usr.bin/cc/Makefile.tgt ============================================================================== --- projects/ngroups/gnu/usr.bin/cc/Makefile.tgt Fri Jan 8 23:26:10 2010 (r201853) +++ projects/ngroups/gnu/usr.bin/cc/Makefile.tgt Fri Jan 8 23:30:43 2010 (r201854) @@ -15,9 +15,6 @@ GCC_CPU= ${TARGET_ARCH} .if ${TARGET_ARCH} == "ia64" TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD .endif -.if ${TARGET_ARCH} == "mips" -TARGET_CPU_DEFAULT= 16 -.endif .if ${TARGET_ARCH} == "sparc64" TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc .endif Modified: projects/ngroups/sys/conf/NOTES ============================================================================== --- projects/ngroups/sys/conf/NOTES Fri Jan 8 23:26:10 2010 (r201853) +++ projects/ngroups/sys/conf/NOTES Fri Jan 8 23:30:43 2010 (r201854) @@ -973,6 +973,7 @@ options NFSSERVER #Network File System options NFSLOCKD #Network Lock Manager options NFSCL #experimental NFS client with NFSv4 options NFSD #experimental NFS server with NFSv4 +options KGSSAPI #Kernel GSSAPI implementaion # NT File System. Read-mostly, see mount_ntfs(8) for details. # For a full read-write NTFS support consider sysutils/fusefs-ntfs Modified: projects/ngroups/sys/kern/kern_cpu.c ============================================================================== --- projects/ngroups/sys/kern/kern_cpu.c Fri Jan 8 23:26:10 2010 (r201853) +++ projects/ngroups/sys/kern/kern_cpu.c Fri Jan 8 23:30:43 2010 (r201854) @@ -935,8 +935,10 @@ cpufreq_levels_sysctl(SYSCTL_HANDLER_ARG /* Get settings from the device and generate the output string. */ count = CF_MAX_LEVELS; levels = malloc(count * sizeof(*levels), M_TEMP, M_NOWAIT); - if (levels == NULL) + if (levels == NULL) { + sbuf_delete(&sb); return (ENOMEM); + } error = CPUFREQ_LEVELS(sc->dev, levels, &count); if (error) { if (error == E2BIG) @@ -974,8 +976,10 @@ cpufreq_settings_sysctl(SYSCTL_HANDLER_A /* Get settings from the device and generate the output string. */ set_count = MAX_SETTINGS; sets = malloc(set_count * sizeof(*sets), M_TEMP, M_NOWAIT); - if (sets == NULL) + if (sets == NULL) { + sbuf_delete(&sb); return (ENOMEM); + } error = CPUFREQ_DRV_SETTINGS(dev, sets, &set_count); if (error) goto out; Modified: projects/ngroups/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c ============================================================================== --- projects/ngroups/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c Fri Jan 8 23:26:10 2010 (r201853) +++ projects/ngroups/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c Fri Jan 8 23:30:43 2010 (r201854) @@ -307,7 +307,7 @@ xdr_rpc_gss_unwrap_data(struct mbuf **re } #ifdef DEBUG -#include <ctype.h> +#include <machine/stdarg.h> void rpc_gss_log_debug(const char *fmt, ...) @@ -315,9 +315,9 @@ rpc_gss_log_debug(const char *fmt, ...) va_list ap; va_start(ap, fmt); - fprintf(stderr, "rpcsec_gss: "); - vfprintf(stderr, fmt, ap); - fprintf(stderr, "\n"); + printf("rpcsec_gss: "); + vprintf(fmt, ap); + printf("\n"); va_end(ap); } @@ -328,7 +328,7 @@ rpc_gss_log_status(const char *m, gss_OI gss_buffer_desc msg; int msg_ctx = 0; - fprintf(stderr, "rpcsec_gss: %s: ", m); + printf("rpcsec_gss: %s: ", m); gss_display_status(&min, maj_stat, GSS_C_GSS_CODE, GSS_C_NULL_OID, &msg_ctx, &msg); Modified: projects/ngroups/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c ============================================================================== --- projects/ngroups/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Fri Jan 8 23:26:10 2010 (r201853) +++ projects/ngroups/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Fri Jan 8 23:30:43 2010 (r201854) @@ -935,7 +935,7 @@ svc_rpc_gss_accept_sec_context(struct sv "<mech %.*s, qop %d, svc %d>", client->cl_rawcred.client_principal->name, mechname.length, (char *)mechname.value, - client->cl_qop, client->rawcred.service); + client->cl_qop, client->cl_rawcred.service); gss_release_buffer(&min_stat, &mechname); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001082330.o08NUhpi024999>