Date: Sat, 4 Oct 2014 16:00:35 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272529 - in projects/random_number_generator: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/include/elf sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/netpfil/i... Message-ID: <201410041600.s94G0ZqB024830@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Sat Oct 4 16:00:34 2014 New Revision: 272529 URL: https://svnweb.freebsd.org/changeset/base/272529 Log: MFC - tracking commit. Merging r272515 through r272527. Modified: projects/random_number_generator/contrib/binutils/bfd/elf32-arm.c projects/random_number_generator/contrib/binutils/gas/config/tc-arm.c projects/random_number_generator/contrib/binutils/include/elf/arm.h projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/random_number_generator/sys/netpfil/ipfw/ip_fw_sockopt.c projects/random_number_generator/sys/sys/filedesc.h Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/contrib/binutils/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/random_number_generator/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- projects/random_number_generator/contrib/binutils/bfd/elf32-arm.c Sat Oct 4 15:59:15 2014 (r272528) +++ projects/random_number_generator/contrib/binutils/bfd/elf32-arm.c Sat Oct 4 16:00:34 2014 (r272529) @@ -6965,7 +6965,8 @@ elf32_arm_merge_eabi_attributes (bfd *ib for (; in_list; in_list = in_list->next) { - if ((in_list->tag & 128) < 64) + if ((in_list->tag & 128) < 64 + && in_list->tag != Tag_Virtualization_use) { _bfd_error_handler (_("Warning: %B: Unknown EABI object attribute %d"), Modified: projects/random_number_generator/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- projects/random_number_generator/contrib/binutils/gas/config/tc-arm.c Sat Oct 4 15:59:15 2014 (r272528) +++ projects/random_number_generator/contrib/binutils/gas/config/tc-arm.c Sat Oct 4 16:00:34 2014 (r272529) @@ -19395,6 +19395,12 @@ arm_fix_adjustable (fixS * fixP) || fixP->fx_r_type == BFD_RELOC_ARM_LDR_PC_G0) return 0; + if (fixP->fx_r_type == BFD_RELOC_ARM_MOVW + || fixP->fx_r_type == BFD_RELOC_ARM_MOVT + || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVW + || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVT) + return 0; + return 1; } #endif /* defined (OBJ_ELF) || defined (OBJ_COFF) */ Modified: projects/random_number_generator/contrib/binutils/include/elf/arm.h ============================================================================== --- projects/random_number_generator/contrib/binutils/include/elf/arm.h Sat Oct 4 15:59:15 2014 (r272528) +++ projects/random_number_generator/contrib/binutils/include/elf/arm.h Sat Oct 4 16:00:34 2014 (r272529) @@ -271,6 +271,8 @@ enum Tag_ABI_optimization_goals, Tag_ABI_FP_optimization_goals, /* 32 is generic. */ + + Tag_Virtualization_use = 68, }; #endif Modified: projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Oct 4 15:59:15 2014 (r272528) +++ projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Oct 4 16:00:34 2014 (r272529) @@ -2584,6 +2584,7 @@ arc_reclaim_needed(void) extern kmem_cache_t *zio_buf_cache[]; extern kmem_cache_t *zio_data_buf_cache[]; +extern kmem_cache_t *range_seg_cache; static void __noinline arc_kmem_reap_now(arc_reclaim_strategy_t strat) @@ -2591,7 +2592,6 @@ arc_kmem_reap_now(arc_reclaim_strategy_t size_t i; kmem_cache_t *prev_cache = NULL; kmem_cache_t *prev_data_cache = NULL; - extern kmem_cache_t *range_seg_cache; DTRACE_PROBE(arc__kmem_reap_start); #ifdef _KERNEL Modified: projects/random_number_generator/sys/netpfil/ipfw/ip_fw_sockopt.c ============================================================================== --- projects/random_number_generator/sys/netpfil/ipfw/ip_fw_sockopt.c Sat Oct 4 15:59:15 2014 (r272528) +++ projects/random_number_generator/sys/netpfil/ipfw/ip_fw_sockopt.c Sat Oct 4 16:00:34 2014 (r272529) @@ -940,7 +940,7 @@ ipfw_getrules(struct ip_fw_chain *chain, int ipfw_ctl(struct sockopt *sopt) { -#define RULE_MAXSIZE (256*sizeof(u_int32_t)) +#define RULE_MAXSIZE (512*sizeof(u_int32_t)) int error; size_t size, len, valsize; struct ip_fw *buf, *rule; Modified: projects/random_number_generator/sys/sys/filedesc.h ============================================================================== --- projects/random_number_generator/sys/sys/filedesc.h Sat Oct 4 15:59:15 2014 (r272528) +++ projects/random_number_generator/sys/sys/filedesc.h Sat Oct 4 16:00:34 2014 (r272529) @@ -33,7 +33,9 @@ #ifndef _SYS_FILEDESC_H_ #define _SYS_FILEDESC_H_ +#ifdef _KERNEL #include "opt_capsicum.h" +#endif #include <sys/caprights.h> #include <sys/queue.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410041600.s94G0ZqB024830>