Date: Wed, 13 Nov 2013 19:40:34 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258104 - in projects/random_number_generator: contrib/llvm/tools/lldb/source/Host/common contrib/llvm/tools/lldb/source/Target release share/mk sys/arm/samsung/exynos sys/dev/iwn sys/f... Message-ID: <201311131940.rADJeYdK066960@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Wed Nov 13 19:40:34 2013 New Revision: 258104 URL: http://svnweb.freebsd.org/changeset/base/258104 Log: MFC - tracking commit. Deleted: projects/random_number_generator/sys/arm/samsung/exynos/bus_space.c Modified: projects/random_number_generator/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp projects/random_number_generator/contrib/llvm/tools/lldb/source/Target/Thread.cpp projects/random_number_generator/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp projects/random_number_generator/release/release.sh projects/random_number_generator/share/mk/bsd.progs.mk projects/random_number_generator/sys/arm/samsung/exynos/exynos5_machdep.c projects/random_number_generator/sys/arm/samsung/exynos/files.exynos5 projects/random_number_generator/sys/dev/iwn/if_iwn.c projects/random_number_generator/sys/fs/pseudofs/pseudofs_vnops.c projects/random_number_generator/usr.sbin/etcupdate/etcupdate.sh Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/contrib/llvm/ (props changed) projects/random_number_generator/contrib/llvm/tools/lldb/ (props changed) projects/random_number_generator/sys/ (props changed) Modified: projects/random_number_generator/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp ============================================================================== --- projects/random_number_generator/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp Wed Nov 13 19:40:34 2013 (r258104) @@ -61,9 +61,9 @@ Symbols::LocateExecutableSymbolFile (con uuid_str = uuid_str + ".debug"; } - // Get full path to our module. Needed to check debug files like this: - // /usr/lib/debug/usr/lib/libboost_date_time.so.1.46.1 - std::string module_filename = module_spec.GetFileSpec().GetPath(); + // Get directory of our module. Needed to check debug files like this: + // /usr/lib/debug/usr/lib/library.so.debug + std::string module_directory = module_spec.GetFileSpec().GetDirectory().AsCString(); size_t num_directories = debug_file_search_paths.GetSize(); for (size_t idx = 0; idx < num_directories; ++idx) @@ -79,7 +79,7 @@ Symbols::LocateExecutableSymbolFile (con files.push_back (dirname + "/" + symbol_filename); files.push_back (dirname + "/.debug/" + symbol_filename); files.push_back (dirname + "/.build-id/" + uuid_str); - files.push_back (dirname + module_filename); + files.push_back (dirname + module_directory + "/" + symbol_filename); const uint32_t num_files = files.size(); for (size_t idx_file = 0; idx_file < num_files; ++idx_file) Modified: projects/random_number_generator/contrib/llvm/tools/lldb/source/Target/Thread.cpp ============================================================================== --- projects/random_number_generator/contrib/llvm/tools/lldb/source/Target/Thread.cpp Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/contrib/llvm/tools/lldb/source/Target/Thread.cpp Wed Nov 13 19:40:34 2013 (r258104) @@ -511,8 +511,7 @@ Thread::CheckpointThreadState (ThreadSta bool Thread::RestoreRegisterStateFromCheckpoint (ThreadStateCheckpoint &saved_state) { - RestoreSaveFrameZero(saved_state.register_backup); - return true; + return RestoreSaveFrameZero(saved_state.register_backup); } bool Modified: projects/random_number_generator/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp ============================================================================== --- projects/random_number_generator/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp Wed Nov 13 19:40:34 2013 (r258104) @@ -299,7 +299,11 @@ ThreadPlanCallFunction::DoTakedown (bool m_takedown_done = true; m_stop_address = m_thread.GetStackFrameAtIndex(0)->GetRegisterContext()->GetPC(); m_real_stop_info_sp = GetPrivateStopInfo (); - m_thread.RestoreRegisterStateFromCheckpoint(m_stored_thread_state); + if (!m_thread.RestoreRegisterStateFromCheckpoint(m_stored_thread_state)) + { + if (log) + log->Printf("ThreadPlanCallFunction(%p): DoTakedown failed to restore register state", this); + } SetPlanComplete(success); ClearBreakpoints(); if (log && log->GetVerbose()) Modified: projects/random_number_generator/release/release.sh ============================================================================== --- projects/random_number_generator/release/release.sh Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/release/release.sh Wed Nov 13 19:40:34 2013 (r258104) @@ -174,7 +174,8 @@ build_doc_ports() { ## Trick the ports 'run-autotools-fixup' target to do the right thing. _OSVERSION=$(sysctl -n kern.osreldate) if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then - PBUILD_FLAGS="OSVERSION=${_OSVERSION} WITHOUT_JADETEX=yes WITHOUT_X11=yes BATCH=yes" + PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes" + PBUILD_FLAGS="${PBUILD_FLAGS} OPTIONS_UNSET='FOP IGOR'" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ ${PBUILD_FLAGS} install clean distclean fi Modified: projects/random_number_generator/share/mk/bsd.progs.mk ============================================================================== --- projects/random_number_generator/share/mk/bsd.progs.mk Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/share/mk/bsd.progs.mk Wed Nov 13 19:40:34 2013 (r258104) @@ -16,14 +16,20 @@ .MAIN: all -.if defined(PROGS) +.if defined(PROGS) || defined(PROGS_CXX) +# we really only use PROGS below... +PROGS += ${PROGS_CXX} # In meta mode, we can capture dependenices for _one_ of the progs. # if makefile doesn't nominate one, we use the first. +.if defined(.PARSEDIR) .ifndef UPDATE_DEPENDFILE_PROG UPDATE_DEPENDFILE_PROG = ${PROGS:[1]} .export UPDATE_DEPENDFILE_PROG .endif +.else +UPDATE_DEPENDFILE_PROG?= no +.endif .ifndef PROG # They may have asked us to build just one @@ -40,11 +46,13 @@ PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXF .for v in ${PROG_VARS:O:u} .if defined(${v}.${PROG}) $v += ${${v}_${PROG}:U${${v}.${PROG}}} +.else +$v ?= .endif .endfor # for meta mode, there can be only one! -.if ${PROG} == ${UPDATE_DEPENDFILE_PROG:Uno} +.if ${PROG} == ${UPDATE_DEPENDFILE_PROG} UPDATE_DEPENDFILE ?= yes .endif UPDATE_DEPENDFILE ?= NO @@ -63,7 +71,7 @@ UPDATE_DEPENDFILE = NO .endif # handle being called [bsd.]progs.mk -.include <${.PARSEFILE:S,progs,prog,}> +.include <bsd.prog.mk> .ifndef PROG # tell progs.mk we might want to install things @@ -76,11 +84,11 @@ x.$p= PROG_CXX=$p .endif $p ${p}_p: .PHONY .MAKE - (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} PROG=$p ${x.$p}) + (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} PROG=$p ${x.$p}) .for t in ${PROGS_TARGETS:O:u} $p.$t: .PHONY .MAKE - (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} PROG=$p ${x.$p} ${@:E}) + (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} PROG=$p ${x.$p} ${@:E}) .endfor .endfor Modified: projects/random_number_generator/sys/arm/samsung/exynos/exynos5_machdep.c ============================================================================== --- projects/random_number_generator/sys/arm/samsung/exynos/exynos5_machdep.c Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/sys/arm/samsung/exynos/exynos5_machdep.c Wed Nov 13 19:40:34 2013 (r258104) @@ -30,27 +30,25 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE +#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <vm/vm.h> -#include <vm/pmap.h> +#include <machine/armreg.h> #include <machine/bus.h> #include <machine/devmap.h> #include <machine/machdep.h> #include <dev/fdt/fdt_common.h> -#define DEVMAP_BOOTSTRAP_MAP_START 0xF0000000 - vm_offset_t initarm_lastaddr(void) { - return (DEVMAP_BOOTSTRAP_MAP_START); + return (arm_devmap_lastaddr()); } void @@ -62,35 +60,22 @@ initarm_early_init(void) void initarm_gpio_init(void) { + } void initarm_late_init(void) { + } -#define FDT_DEVMAP_MAX (1 + 2 + 1 + 1) /* FIXME */ -static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = { - { 0, 0, 0, 0, 0, } -}; - -/* - * Construct pmap_devmap[] with DT-derived config data. - */ int initarm_devmap_init(void) { - int i; - i = 0; - fdt_devmap[i].pd_va = 0xf2C00000; - fdt_devmap[i].pd_pa = 0x12C00000; - fdt_devmap[i].pd_size = 0x100000; - fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE; - fdt_devmap[i].pd_cache = PTE_NOCACHE; - i++; + /* UART */ + arm_devmap_add_entry(0x12C00000, 0x100000); - arm_devmap_register_table(&fdt_devmap[0]); return (0); } Modified: projects/random_number_generator/sys/arm/samsung/exynos/files.exynos5 ============================================================================== --- projects/random_number_generator/sys/arm/samsung/exynos/files.exynos5 Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/sys/arm/samsung/exynos/files.exynos5 Wed Nov 13 19:40:34 2013 (r258104) @@ -10,12 +10,12 @@ arm/arm/cpufunc_asm_arm11.S standard arm/arm/cpufunc_asm_armv7.S standard arm/arm/irq_dispatch.S standard +arm/arm/bus_space-v6.c standard arm/arm/gic.c standard arm/arm/generic_timer.c standard arm/samsung/exynos/arch_timer.c standard arm/samsung/exynos/exynos5_mp.c optional smp -arm/samsung/exynos/bus_space.c standard arm/samsung/exynos/common.c standard arm/samsung/exynos/exynos5_machdep.c standard arm/samsung/exynos/uart.c optional uart Modified: projects/random_number_generator/sys/dev/iwn/if_iwn.c ============================================================================== --- projects/random_number_generator/sys/dev/iwn/if_iwn.c Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/sys/dev/iwn/if_iwn.c Wed Nov 13 19:40:34 2013 (r258104) @@ -607,6 +607,10 @@ iwn_attach(device_t dev) * This is a total hack to work around that until some * per-device method is implemented to return the * actual stream support. + * + * XXX Note: the 5350 is a 3x3 device; so we shouldn't + * cap this! But, anything that touches rates in the + * driver needs to be audited first before 3x3 is enabled. */ if (ic->ic_rxstream > 2) ic->ic_rxstream = 2; Modified: projects/random_number_generator/sys/fs/pseudofs/pseudofs_vnops.c ============================================================================== --- projects/random_number_generator/sys/fs/pseudofs/pseudofs_vnops.c Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/sys/fs/pseudofs/pseudofs_vnops.c Wed Nov 13 19:40:34 2013 (r258104) @@ -654,11 +654,13 @@ pfs_read(struct vop_read_args *va) goto ret; } + resid = uio->uio_resid; + offset = uio->uio_offset; + buflen = offset + resid; + /* beaucoup sanity checks so we don't ask for bogus allocation */ - if (uio->uio_offset < 0 || uio->uio_resid < 0 || - (offset = uio->uio_offset) != uio->uio_offset || - (resid = uio->uio_resid) != uio->uio_resid || - (buflen = offset + resid) < offset || buflen >= INT_MAX) { + if (resid < 0 || buflen < offset || buflen < resid || + buflen >= INT_MAX) { error = EINVAL; goto ret; } Modified: projects/random_number_generator/usr.sbin/etcupdate/etcupdate.sh ============================================================================== --- projects/random_number_generator/usr.sbin/etcupdate/etcupdate.sh Wed Nov 13 18:35:06 2013 (r258103) +++ projects/random_number_generator/usr.sbin/etcupdate/etcupdate.sh Wed Nov 13 19:40:34 2013 (r258104) @@ -1698,7 +1698,7 @@ case $command in fi ;; build|diff|status) - if [ -n "$dryrun" -o -n "$rerun" -o -n "$tarball" -o + if [ -n "$dryrun" -o -n "$rerun" -o -n "$tarball" -o \ -n "$preworld" ]; then usage fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311131940.rADJeYdK066960>