Re: svn commit: r263885 - in head/sys/dev/vt: . hw/vga
On Sun, Mar 30, 2014 at 12:35:23AM +0200, Aleksandr Rybalko wrote: > vt(4) have to use bitblt like method which is able to do masked write, > since mouse cursor have to left visible characters under itself. > But masked bitblt quite expensive due to read from framebuffer to apply > mask or due to VGA graphics mode problem (described here [1], lot of > small read and writes which can't be well optimized). > > Characters can be drown with simple (not masked) method, so vd_bitbltchr > used most frequently. > Mouse cursor only one (at least vt(4) can care about one :) ). And > currently mouse support only single consumer for masked method. I've always wondered why FreeBSD *ever* had this ugly "look-we-can-make-it- like-in-wind0ze" mouse pointer on the console. I've been always building kernel with SC_ALT_MOUSE_IMAGE; I'm really hoping (if this nonsense has to stay) there will be an option to completely disable it and all related code paths when vt(4) eventually replaces syscons(4). ./danfe ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r263933 - head/sys/arm/conf
Author: br Date: Sun Mar 30 14:25:14 2014 New Revision: 263933 URL: http://svnweb.freebsd.org/changeset/base/263933 Log: - Merge SoC-common parts - Enable iicbus device Added: head/sys/arm/conf/EXYNOS5250 (contents, props changed) Modified: head/sys/arm/conf/ARNDALE head/sys/arm/conf/CHROMEBOOK Modified: head/sys/arm/conf/ARNDALE == --- head/sys/arm/conf/ARNDALE Sun Mar 30 09:47:49 2014(r263932) +++ head/sys/arm/conf/ARNDALE Sun Mar 30 14:25:14 2014(r263933) @@ -17,122 +17,9 @@ # # $FreeBSD$ +include"EXYNOS5250" ident ARNDALE -include"../samsung/exynos/std.exynos5" - -makeoptionsMODULES_OVERRIDE="" -makeoptionsWITHOUT_MODULES="ahc" - -makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols -makeoptionsWERROR="-Werror" - -optionsHZ=100 -optionsSCHED_4BSD # 4BSD scheduler -optionsINET# InterNETworking -optionsINET6 # IPv6 communications protocols -optionsGEOM_PART_BSD # BSD partition scheme -optionsGEOM_PART_MBR # MBR partition scheme -optionsTMPFS # Efficient memory filesystem -optionsFFS # Berkeley Fast Filesystem -optionsSOFTUPDATES -optionsUFS_ACL # Support for access control lists -optionsUFS_DIRHASH # Improve performance on big directories -optionsMSDOSFS # MSDOS Filesystem -optionsCD9660 # ISO 9660 Filesystem -optionsPROCFS # Process filesystem (requires PSEUDOFS) -optionsPSEUDOFS# Pseudo-filesystem framework -optionsCOMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -optionsSCSI_DELAY=5000 # Delay (in ms) before probing SCSI -optionsKTRACE -optionsSYSVSHM # SYSV-style shared memory -optionsSYSVMSG # SYSV-style message queues -optionsSYSVSEM # SYSV-style semaphores -options_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions -optionsKBD_INSTALL_CDEV -optionsPREEMPTION -optionsFREEBSD_BOOT_LOADER -optionsVFP # vfp/neon - -# Debugging -makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols -optionsBREAK_TO_DEBUGGER -#options VERBOSE_SYSINIT # Enable verbose sysinit messages -optionsKDB -optionsDDB # Enable the kernel debugger -#options INVARIANTS # Enable calls of extra sanity checking -#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS # Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN# Don't run witness on spinlocks for speed -#options DIAGNOSTIC - -# NFS support -optionsNFSCL # Network Filesystem Client -optionsNFSLOCKD# Network Lock Manager -optionsNFS_ROOT# NFS usable as /, requires NFSCLIENT - -# Uncomment this for NFS root -#options NFS_ROOT# NFS usable as /, requires NFSCL -#options BOOTP_NFSROOT -#options BOOTP_COMPAT -#options BOOTP -#options BOOTP_NFSV3 -#options BOOTP_WIRED_TO=cpsw0 - -device mmc # mmc/sd bus -device mmcsd # mmc/sd flash cards -device sdhci # generic sdhci - -optionsROOTDEVNAME=\"ufs:/dev/da0\" - -#options SMP - -# Pseudo devices - -device loop -device random -device pty -device md -device gpio - -# USB support -optionsUSB_HOST_ALIGN=64 # Align usb buffers to cache line size. -device usb -optionsUSB_DEBUG -#options USB_REQ_DEBUG -#options USB_VERBOSE -#devicemusb -device ehci -#deviceohci - -device umass -device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) -device pass - -# SATA -#deviceata -#deviceatadisk -#devicemvs - -# Serial ports -device uart - -# I2C (TWSI) -#deviceiic -#deviceiicbus - -# Ethernet -device ether -device mii -device smsc -device smscphy - -# USB ethernet support, requires miibus -device miibus -device axe # ASIX Electronics USB Ethernet -device bpf # Berkeley packet filter - #FDT optionsFDT optio
svn commit: r263934 - head/sys/arm/samsung/exynos
Author: br
Date: Sun Mar 30 14:42:53 2014
New Revision: 263934
URL: http://svnweb.freebsd.org/changeset/base/263934
Log:
Directly call kmem_alloc_contig to allocate framebuffer memory
and pass VM_MEMATTR_UNCACHEABLE (no-cache, no-buffer).
This fixes screen refreshing problem when data is updated too slowly.
Discussed with: ian
Modified:
head/sys/arm/samsung/exynos/exynos5_fimd.c
Modified: head/sys/arm/samsung/exynos/exynos5_fimd.c
==
--- head/sys/arm/samsung/exynos/exynos5_fimd.c Sun Mar 30 14:25:14 2014
(r263933)
+++ head/sys/arm/samsung/exynos/exynos5_fimd.c Sun Mar 30 14:42:53 2014
(r263934)
@@ -47,6 +47,10 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
+#include
+#include
+
#include
#include
#include
@@ -351,8 +355,8 @@ fimd_attach(device_t dev)
sc->sc_info.fb_stride = sc->sc_info.fb_width * 2;
sc->sc_info.fb_bpp = sc->sc_info.fb_depth = 16;
sc->sc_info.fb_size = sc->sc_info.fb_height * sc->sc_info.fb_stride;
- sc->sc_info.fb_vbase = (intptr_t)contigmalloc(sc->sc_info.fb_size,
- M_DEVBUF, M_ZERO, 0, ~0, PAGE_SIZE, 0);
+ sc->sc_info.fb_vbase = (intptr_t)kmem_alloc_contig(kernel_arena,
+ sc->sc_info.fb_size, M_ZERO, 0, ~0, PAGE_SIZE, 0,
VM_MEMATTR_UNCACHEABLE);
sc->sc_info.fb_pbase = (intptr_t)vtophys(sc->sc_info.fb_vbase);
#if 0
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r263935 - head/sys/arm/conf
Author: br Date: Sun Mar 30 14:57:00 2014 New Revision: 263935 URL: http://svnweb.freebsd.org/changeset/base/263935 Log: Add lowercase postfix, so SoC-common file will be ignored by tinderbox. Added: head/sys/arm/conf/EXYNOS5250.common - copied unchanged from r263933, head/sys/arm/conf/EXYNOS5250 Deleted: head/sys/arm/conf/EXYNOS5250 Modified: head/sys/arm/conf/ARNDALE head/sys/arm/conf/CHROMEBOOK Modified: head/sys/arm/conf/ARNDALE == --- head/sys/arm/conf/ARNDALE Sun Mar 30 14:42:53 2014(r263934) +++ head/sys/arm/conf/ARNDALE Sun Mar 30 14:57:00 2014(r263935) @@ -17,7 +17,7 @@ # # $FreeBSD$ -include"EXYNOS5250" +include"EXYNOS5250.common" ident ARNDALE #FDT Modified: head/sys/arm/conf/CHROMEBOOK == --- head/sys/arm/conf/CHROMEBOOKSun Mar 30 14:42:53 2014 (r263934) +++ head/sys/arm/conf/CHROMEBOOKSun Mar 30 14:57:00 2014 (r263935) @@ -17,7 +17,7 @@ # # $FreeBSD$ -include"EXYNOS5250" +include"EXYNOS5250.common" ident CHROMEBOOK # Framebuffer Copied: head/sys/arm/conf/EXYNOS5250.common (from r263933, head/sys/arm/conf/EXYNOS5250) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/conf/EXYNOS5250.common Sun Mar 30 14:57:00 2014 (r263935, copy of r263933, head/sys/arm/conf/EXYNOS5250) @@ -0,0 +1,132 @@ +# Kernel configuration for Samsung Exynos 5250 boards. +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +include"../samsung/exynos/std.exynos5" + +makeoptionsMODULES_OVERRIDE="" +makeoptionsWITHOUT_MODULES="ahc" + +makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols +makeoptionsWERROR="-Werror" + +optionsHZ=100 +optionsSCHED_4BSD # 4BSD scheduler +optionsINET# InterNETworking +optionsINET6 # IPv6 communications protocols +optionsGEOM_PART_BSD # BSD partition scheme +optionsGEOM_PART_MBR # MBR partition scheme +optionsTMPFS # Efficient memory filesystem +optionsFFS # Berkeley Fast Filesystem +optionsSOFTUPDATES +optionsUFS_ACL # Support for access control lists +optionsUFS_DIRHASH # Improve performance on big directories +optionsMSDOSFS # MSDOS Filesystem +optionsCD9660 # ISO 9660 Filesystem +optionsPROCFS # Process filesystem (requires PSEUDOFS) +optionsPSEUDOFS# Pseudo-filesystem framework +optionsCOMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +optionsSCSI_DELAY=5000 # Delay (in ms) before probing SCSI +optionsKTRACE +optionsSYSVSHM # SYSV-style shared memory +optionsSYSVMSG # SYSV-style message queues +optionsSYSVSEM # SYSV-style semaphores +options_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions +optionsKBD_INSTALL_CDEV +optionsPREEMPTION +optionsFREEBSD_BOOT_LOADER +optionsVFP # vfp/neon + +# Debugging +makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols +optionsBREAK_TO_DEBUGGER +#options VERBOSE_SYSINIT # Enable verbose sysinit messages +optionsKDB +optionsDDB # Enable the kernel debugger +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN# Don't run witness on spinlocks for speed +#options DIAGNOSTIC + +# NFS support +optionsNFSCL # Network Filesystem Client +opt
svn commit: r263936 - in head/sys: arm/conf arm/samsung/exynos boot/fdt/dts/arm
Author: br
Date: Sun Mar 30 15:22:36 2014
New Revision: 263936
URL: http://svnweb.freebsd.org/changeset/base/263936
Log:
Add support for keyboard used in Samsung Chromebook (ARM machine)
Support covers device drivers for:
- Interrupt Combiner
- gpio/pad, External Interrupts Controller (pad)
- I2C Interface
- Chrome Embedded Controller
- Chrome Keyboard
Also:
- Use new gpio dev class in EHCI driver
- Expand device tree information
Added:
head/sys/arm/conf/CHROMEBOOK.hints (contents, props changed)
head/sys/arm/samsung/exynos/chrome_ec.c (contents, props changed)
head/sys/arm/samsung/exynos/chrome_ec.h (contents, props changed)
head/sys/arm/samsung/exynos/chrome_kb.c (contents, props changed)
head/sys/arm/samsung/exynos/chrome_kb.h (contents, props changed)
head/sys/arm/samsung/exynos/exynos5_combiner.c (contents, props changed)
head/sys/arm/samsung/exynos/exynos5_combiner.h (contents, props changed)
head/sys/arm/samsung/exynos/exynos5_i2c.c (contents, props changed)
head/sys/arm/samsung/exynos/exynos5_pad.c (contents, props changed)
head/sys/arm/samsung/exynos/exynos5_pad.h (contents, props changed)
Modified:
head/sys/arm/conf/CHROMEBOOK
head/sys/arm/samsung/exynos/exynos5_ehci.c
head/sys/arm/samsung/exynos/files.exynos5
head/sys/boot/fdt/dts/arm/exynos5250-arndale.dts
head/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts
head/sys/boot/fdt/dts/arm/exynos5250.dtsi
Modified: head/sys/arm/conf/CHROMEBOOK
==
--- head/sys/arm/conf/CHROMEBOOKSun Mar 30 14:57:00 2014
(r263935)
+++ head/sys/arm/conf/CHROMEBOOKSun Mar 30 15:22:36 2014
(r263936)
@@ -20,6 +20,11 @@
include"EXYNOS5250.common"
ident CHROMEBOOK
+hints "CHROMEBOOK.hints"
+
+device chrome_ec # Chrome Embedded Controller
+device chrome_kb # Chrome Keyboard
+
# Framebuffer
device vt
device kbdmux
Added: head/sys/arm/conf/CHROMEBOOK.hints
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/conf/CHROMEBOOK.hints Sun Mar 30 15:22:36 2014
(r263936)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+# Chrome Embedded Controller
+hint.chrome_ec.0.at="iicbus0"
+hint.chrome_ec.0.addr=0x1e
Added: head/sys/arm/samsung/exynos/chrome_ec.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/samsung/exynos/chrome_ec.c Sun Mar 30 15:22:36 2014
(r263936)
@@ -0,0 +1,253 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPREC OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNEC FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINEC INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Samsung Chromebook Embedded Controller
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+
+#include "iicbus_if.h"
+#include "gpio_if.h"
+
+#include
+
+/* TODO: export to DTS */
+#define OUR_GPIO 177
+#define EC_GPIO168
+
+struct ec_softc {
+ device_tdev;
+};
+
+struct ec_softc *ec_sc;
+
+/*
+ * bus_claim, bus_release
+ * both functions used for bus arbitration
+ * in multi-master mode
+ */
+
+static int
+bus_claim(struct ec_softc *sc)
+{
+ device_t gpio_dev;
+ int status;
+
+ gpio_dev = devclass_get_device(devclass_find("gpio"), 0);
+if (gpio_dev == NULL) {
+ de
svn commit: r263937 - head/etc/pkg
Author: bdrewery
Date: Sun Mar 30 15:24:17 2014
New Revision: 263937
URL: http://svnweb.freebsd.org/changeset/base/263937
Log:
Give hint on how to disable the default repository.
Discussed with: bapt
MFC after:instantly (preparing EN)
Modified:
head/etc/pkg/FreeBSD.conf
Modified: head/etc/pkg/FreeBSD.conf
==
--- head/etc/pkg/FreeBSD.conf Sun Mar 30 15:22:36 2014(r263936)
+++ head/etc/pkg/FreeBSD.conf Sun Mar 30 15:24:17 2014(r263937)
@@ -1,4 +1,12 @@
# $FreeBSD$
+#
+# To disable this repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
+#
+# mkdir -p /usr/local/etc/pkg/repos
+# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#
+
FreeBSD: {
url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest";,
mirror_type: "srv",
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r263940 - head/usr.bin/units
Author: eadler
Date: Sun Mar 30 16:04:47 2014
New Revision: 263940
URL: http://svnweb.freebsd.org/changeset/base/263940
Log:
add capsicum to units(1)
Modified:
head/usr.bin/units/units.c
Modified: head/usr.bin/units/units.c
==
--- head/usr.bin/units/units.c Sun Mar 30 15:30:33 2014(r263939)
+++ head/usr.bin/units/units.c Sun Mar 30 16:04:47 2014(r263940)
@@ -22,11 +22,14 @@ static const char rcsid[] =
#include
#include
+#include
#include
#include
#include
#include
+#include
+
#include "pathnames.h"
#define VERSION "1.0"
@@ -112,6 +115,7 @@ readunits(const char *userfile)
FILE *unitfile;
char line[512], *lineptr;
int len, linenum, i;
+ cap_rights_t unitfilerights;
unitcount = 0;
linenum = 0;
@@ -143,6 +147,12 @@ readunits(const char *userfile)
errx(1, "can't find units file '%s'",
UNITSFILE);
}
}
+ if (cap_enter() < 0 && errno != ENOSYS)
+ err(1, "unable to enter capability mode");
+ cap_rights_init(&unitfilerights, CAP_READ, CAP_FSTAT);
+ if (cap_rights_limit(fileno(unitfile), &unitfilerights) < 0
+ && errno != ENOSYS)
+ err(1, "cap_rights_limit() failed");
while (!feof(unitfile)) {
if (!fgets(line, sizeof(line), unitfile))
break;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r263885 - in head/sys/dev/vt: . hw/vga
On Sun, 30 Mar 2014 07:04:44 + Alexey Dokuchaev wrote: > On Sun, Mar 30, 2014 at 12:35:23AM +0200, Aleksandr Rybalko wrote: > > vt(4) have to use bitblt like method which is able to do masked > > write, since mouse cursor have to left visible characters under > > itself. But masked bitblt quite expensive due to read from > > framebuffer to apply mask or due to VGA graphics mode problem > > (described here [1], lot of small read and writes which can't be > > well optimized). > > > > Characters can be drown with simple (not masked) method, so > > vd_bitbltchr used most frequently. > > Mouse cursor only one (at least vt(4) can care about one :) ). And > > currently mouse support only single consumer for masked method. > > I've always wondered why FreeBSD *ever* had this ugly > "look-we-can-make-it- like-in-wind0ze" mouse pointer on the console. > I've been always building kernel with SC_ALT_MOUSE_IMAGE; I'm really > hoping (if this nonsense has to stay) there will be an option to > completely disable it and all related code paths when vt(4) > eventually replaces syscons(4). > > ./danfe its name SC_NO_CUTPASTE for both syscons(4) and vt(4). -- Aleksandr Rybalko ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r263948 - head/contrib/byacc
Author: bapt
Date: Sun Mar 30 21:56:13 2014
New Revision: 263948
URL: http://svnweb.freebsd.org/changeset/base/263948
Log:
Convert an unused banner from skeleton.c into a comment.
It is added to every generated files and fix build at certain warning level
with clang 3.4
Submitted by: Thomas Dickey (byacc upstream)
Spotted by: glebius
Modified:
head/contrib/byacc/skeleton.c
Directory Properties:
head/contrib/byacc/ (props changed)
Modified: head/contrib/byacc/skeleton.c
==
--- head/contrib/byacc/skeleton.c Sun Mar 30 21:48:49 2014
(r263947)
+++ head/contrib/byacc/skeleton.c Sun Mar 30 21:56:13 2014
(r263948)
@@ -16,9 +16,9 @@
const char *const banner[] =
{
-"#ifndef lint",
-"static const char yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley)
02/21/93\";",
-"#endif",
+"/* original parser id follows */",
+"/* yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\" */",
+"/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */",
"",
"#define YYBYACC 1",
CONCAT1("#define YYMAJOR ", YYMAJOR),
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r263951 - in head: . share/mk
Author: imp
Date: Sun Mar 30 22:24:53 2014
New Revision: 263951
URL: http://svnweb.freebsd.org/changeset/base/263951
Log:
Kill NO_TESTS and use MK_TESTS=no when we want to skip them.
Modified:
head/Makefile.inc1
head/share/mk/bsd.own.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Mar 30 22:24:45 2014(r263950)
+++ head/Makefile.inc1 Sun Mar 30 22:24:53 2014(r263951)
@@ -249,7 +249,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
SSP_CFLAGS= \
MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -259,12 +259,12 @@ TMAKE=MAKEOBJDIRPREFIX=${OBJTREE} \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
-DNO_LINT \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- MK_GDB=no -DNO_TESTS
+ MK_GDB=no MK_TESTS=no
# kernel-tools stage
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -420,7 +420,7 @@ LIB32WMAKEFLAGS+= \
-DNO_CPU_CFLAGS \
-DNO_CTF \
-DNO_LINT \
- -DNO_TESTS
+ MK_TESTS=no
LIB32WMAKE=${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
MK_MAN=no MK_INFO=no MK_HTML=no
@@ -575,7 +575,7 @@ _libraries:
@echo "--"
${_+_}cd ${.CURDIR}; \
${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
- -DNO_PROFILE -DNO_TESTS libraries
+ -DNO_PROFILE MK_TESTS=no libraries
_depend:
@echo
@echo "--"
@@ -1509,7 +1509,7 @@ _prebuild_libs+= gnu/lib/libstdc++ gnu/l
.if defined(WITH_ATF) || ${MK_TESTS} != "no"
.if !defined(WITH_ATF)
# Ensure that the ATF libraries will be built during make libraries, even
-# though they will have -DNO_TESTS
+# though they will have WITHOUT_TESTS
MAKE+= -DWITH_ATF
.endif
_lib_atf= lib/atf
@@ -1624,11 +1624,11 @@ ${_lib}__PL: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
- ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
+ ${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \
DIRPRFX=${_lib}/ all && \
- ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+ ${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \
DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1638,10 +1638,10 @@ ${_lib}__L: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \
- ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all && \
+ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1651,11 +1651,11 @@ ${_lib}__L: .PHONY .MAKE
lib/libpam__L: .PHONY .MAKE
${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
cd ${.CURDIR}/lib/libpam && \
- ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \
- ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \
- ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ obj && \
+ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend && \
+ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
-D_NO_LIBPAM_SO_YET all && \
- ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
-D_NO_LIBPAM_SO_YET install
_prereq_libs: ${_prereq_libs:S/$/__PL/}
@@ -1883,7 +1883,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
NOFUN=-DNO
svn commit: r263949 - head
Author: imp
Date: Sun Mar 30 22:24:37 2014
New Revision: 263949
URL: http://svnweb.freebsd.org/changeset/base/263949
Log:
When building g++, we need to build libsupc earlier to avoid a race
with libproc. Not sure why people didn't see this before now, but I
get it often for higher (20-30) -j builds, but never for -j1 builds.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Mar 30 21:56:13 2014(r263948)
+++ head/Makefile.inc1 Sun Mar 30 22:24:37 2014(r263949)
@@ -1502,6 +1502,9 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
+.if ${MK_GNUCXX} != no
+_prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
+.endif
.if defined(WITH_ATF) || ${MK_TESTS} != "no"
.if !defined(WITH_ATF)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r263952 - head
Author: imp
Date: Sun Mar 30 22:25:01 2014
New Revision: 263952
URL: http://svnweb.freebsd.org/changeset/base/263952
Log:
Move stray targets out of the xdev section.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Mar 30 22:24:53 2014(r263951)
+++ head/Makefile.inc1 Sun Mar 30 22:25:01 2014(r263952)
@@ -992,6 +992,8 @@ INSTALLKERNEL= ${_kernel}
.endif
.endfor
+buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
+
#
# buildkernel
#
@@ -1993,5 +1995,3 @@ _xi-links:
xdev xdev-build xdev-install:
@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for
\"${.TARGET}\" target"
.endif
-
-buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r263950 - in head: . share/mk
Author: imp
Date: Sun Mar 30 22:24:45 2014
New Revision: 263950
URL: http://svnweb.freebsd.org/changeset/base/263950
Log:
Allow the build system to safely set MK_FOO to avoid the ambiguity
when both WITH_FOO and WITHOUT_FOO are set. Use this where
possible. Only disallow setting of MK_FOO on the command line. This
was preferable to inventing a new mechanism or fixing the undef bug
(bin/183762) which precludes users from turning off anything we turn
off for parts of the build with WITHOUT_FOO prior to this.
Modified:
head/Makefile.inc1
head/share/mk/bsd.own.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Mar 30 22:24:37 2014(r263949)
+++ head/Makefile.inc1 Sun Mar 30 22:24:45 2014(r263950)
@@ -247,7 +247,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
- -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+ MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
@@ -264,7 +264,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- -DWITHOUT_GDB -DNO_TESTS
+ MK_GDB=no -DNO_TESTS
# kernel-tools stage
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -277,7 +277,7 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOB
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
- -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+ MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
@@ -423,7 +423,7 @@ LIB32WMAKEFLAGS+= \
-DNO_TESTS
LIB32WMAKE=${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
- -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
+ MK_MAN=no MK_INFO=no MK_HTML=no
LIB32IMAKE=${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
${IMAKE_INSTALL}
.endif
@@ -574,8 +574,8 @@ _libraries:
@echo ">>> stage 4.2: building libraries"
@echo "--"
${_+_}cd ${.CURDIR}; \
- ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
- -DWITHOUT_MAN -DNO_PROFILE -DNO_TESTS libraries
+ ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
+ -DNO_PROFILE -DNO_TESTS libraries
_depend:
@echo
@echo "--"
@@ -1881,9 +1881,9 @@ XDEV_CPUTYPE?=${CPUTYPE}
XDEV_CPUTYPE?=${TARGET_CPUTYPE}
.endif
-NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
- -DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
- -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_TESTS -DNO_WARNS \
+NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
+ MK_MAN=no MK_NLS=no -DNO_PROFILE \
+ MK_KERBEROS=no MK_RESCUE=no -DNO_TESTS -DNO_WARNS \
TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
CPUTYPE=${XDEV_CPUTYPE}
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkSun Mar 30 22:24:37 2014(r263949)
+++ head/share/mk/bsd.own.mkSun Mar 30 22:24:45 2014(r263950)
@@ -229,10 +229,7 @@ COMPRESS_EXT?= .gz
MAN \
PROFILE
.if defined(NO_${var})
-.if defined(WITH_${var})
-.undef WITH_${var}
-.endif
-WITHOUT_${var}=
+MK_${var}:=no
.endif
.endfor
@@ -446,13 +443,16 @@ __DEFAULT_NO_OPTIONS+=FDT
.error WITH_${var} and WITHOUT_${var} can't both be set.
.endif
.if defined(MK_${var})
+.if ${.MAKE.LEVEL} == 0
.error MK_${var} can't be set by a user.
.endif
+.else
.if defined(WITHOUT_${var})
MK_${var}:=no
.else
MK_${var}:=yes
.endif
+.endif
.endfor
.undef __DEFAULT_YES_OPTIONS
@@ -464,13 +464,16 @@ MK_${var}:= yes
.error WITH_${var} and WITHOUT_${var} can't both be set.
.endif
.if defined(MK_${var})
+.if ${.MAKE.LEVEL} == 0
.error MK_${var} can't be set by a user.
.endif
+.else
.if defined(WITH_${var})
MK_${var}:=yes
.else
MK_${var}:=no
.endif
+.endif
.endfor
.undef __DEFAULT_NO_OPTIONS
@@ -620,8 +623,10 @@ MK_${vv:H}:= ${MK_${vv:T}}
.error WITH_${var} and WITHOUT_${var} can't both be set.
.endif
.if defined(MK_${var})
+.if ${.MAKE.LEVEL} == 0
.error MK_${var} can't be set by a user.
.endif
+.else
.if ${COMPILER_FEATURES:Mc++11}
.if defined(WITHOUT_${var})
MK_${var}:=no
@@ -635,6 +640,7 @@ MK_${var}:= yes
MK_${var}:=no
.en
svn commit: r263954 - in head/sys: cam/scsi compat/freebsd32 dev/aacraid dev/acpica dev/advansys dev/aic7xxx sys
Author: imp
Date: Sun Mar 30 23:43:36 2014
New Revision: 263954
URL: http://svnweb.freebsd.org/changeset/base/263954
Log:
Remove instances of variables that were set, but never used. gcc 4.9
warns about these by default.
Modified:
head/sys/cam/scsi/scsi_da.c
head/sys/cam/scsi/scsi_enc_ses.c
head/sys/cam/scsi/scsi_pass.c
head/sys/compat/freebsd32/freebsd32_misc.c
head/sys/dev/aacraid/aacraid_cam.c
head/sys/dev/aacraid/aacraid_pci.c
head/sys/dev/acpica/acpi.c
head/sys/dev/acpica/acpi_resource.c
head/sys/dev/acpica/acpi_smbat.c
head/sys/dev/advansys/advansys.c
head/sys/dev/advansys/advlib.c
head/sys/dev/advansys/adwcam.c
head/sys/dev/aic7xxx/aic79xx.c
head/sys/sys/buf_ring.h
Modified: head/sys/cam/scsi/scsi_da.c
==
--- head/sys/cam/scsi/scsi_da.c Sun Mar 30 23:43:30 2014(r263953)
+++ head/sys/cam/scsi/scsi_da.c Sun Mar 30 23:43:36 2014(r263954)
@@ -3013,13 +3013,11 @@ dadone(struct cam_periph *periph, union
struct disk_params *dp;
uint32_t block_size;
uint64_t maxsector;
- u_int lbppbe; /* LB per physical block exponent. */
u_int lalba;/* Lowest aligned LBA. */
if (state == DA_CCB_PROBE_RC) {
block_size = scsi_4btoul(rdcap->length);
maxsector = scsi_4btoul(rdcap->addr);
- lbppbe = 0;
lalba = 0;
/*
@@ -3040,7 +3038,6 @@ dadone(struct cam_periph *periph, union
} else {
block_size = scsi_4btoul(rcaplong->length);
maxsector = scsi_8btou64(rcaplong->addr);
- lbppbe = rcaplong->prot_lbppbe & SRC16_LBPPBE;
lalba = scsi_2btoul(rcaplong->lalba_lbp);
}
Modified: head/sys/cam/scsi/scsi_enc_ses.c
==
--- head/sys/cam/scsi/scsi_enc_ses.cSun Mar 30 23:43:30 2014
(r263953)
+++ head/sys/cam/scsi/scsi_enc_ses.cSun Mar 30 23:43:36 2014
(r263954)
@@ -1162,7 +1162,6 @@ ses_page_cdb(char *cdb, int bufsiz, SesD
static int
ses_set_timed_completion(enc_softc_t *enc, uint8_t tc_en)
{
- int err;
union ccb *ccb;
struct cam_periph *periph;
struct ses_mgmt_mode_page *mgmt;
@@ -1187,7 +1186,7 @@ ses_set_timed_completion(enc_softc_t *en
* Ignore illegal request errors, as they are quite common and we
* will print something out in that case anyway.
*/
- err = cam_periph_runccb(ccb, enc_error, ENC_CFLAGS,
+ cam_periph_runccb(ccb, enc_error, ENC_CFLAGS,
ENC_FLAGS|SF_QUIET_IR, NULL);
if (ccb->ccb_h.status != CAM_REQ_CMP) {
ENC_VLOG(enc, "Timed Completion Unsupported\n");
@@ -1211,7 +1210,7 @@ ses_set_timed_completion(enc_softc_t *en
/*page_fmt*/FALSE, /*save_pages*/TRUE, mode_buf, mode_buf_len,
SSD_FULL_SIZE, /*timeout*/60 * 1000);
- err = cam_periph_runccb(ccb, enc_error, ENC_CFLAGS, ENC_FLAGS, NULL);
+ cam_periph_runccb(ccb, enc_error, ENC_CFLAGS, ENC_FLAGS, NULL);
if (ccb->ccb_h.status != CAM_REQ_CMP) {
ENC_VLOG(enc, "Timed Completion Set Failed\n");
goto release;
@@ -1881,11 +1880,9 @@ ses_publish_physpaths(enc_softc_t *enc,
{
struct ses_iterator iter;
enc_cache_t *enc_cache;
- ses_cache_t *ses_cache;
enc_element_t *element;
enc_cache = &enc->enc_daemon_cache;
- ses_cache = enc_cache->private;
ses_iter_init(enc, enc_cache, &iter);
while ((element = ses_iter_next(&iter)) != NULL) {
Modified: head/sys/cam/scsi/scsi_pass.c
==
--- head/sys/cam/scsi/scsi_pass.c Sun Mar 30 23:43:30 2014
(r263953)
+++ head/sys/cam/scsi/scsi_pass.c Sun Mar 30 23:43:36 2014
(r263954)
@@ -540,7 +540,6 @@ static int
passdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct
thread *td)
{
struct cam_periph *periph;
- struct pass_softc *softc;
int error;
uint32_t priority;
@@ -549,7 +548,6 @@ passdoioctl(struct cdev *dev, u_long cmd
return(ENXIO);
cam_periph_lock(periph);
- softc = (struct pass_softc *)periph->softc;
error = 0;
Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==
--- head/sys/compat/freebsd32/freebsd32_misc.c Sun Mar 30 23:43:30 2014
(r263953)
+++ head/sys/compat/freebsd32/freebsd32_misc.c Sun Mar 30 23:43:36 2014
svn commit: r263953 - in head: . share/mk
Author: imp
Date: Sun Mar 30 23:43:30 2014
New Revision: 263953
URL: http://svnweb.freebsd.org/changeset/base/263953
Log:
There's no need to guess at the COMPILER_TYPE to pass it down. We
guess wrong for buildkernel when CC=gcc49, say. Eliminate all the
guessing. COMPILER_TYPE propigates properly on its own, if specified,
and we guess it correctly otherwise lower in the build. Also, fix
conditionals for armv6hf when using an external compiler chain. They
were broken before, but unused. Also, prefer checking the compiler
type over CLANG_IS_CC since the latter is only supposed to be used to
determine what symlinks to install (more fixes to follow).
Modified:
head/Makefile.inc1
head/share/mk/bsd.prog.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Mar 30 22:25:01 2014(r263952)
+++ head/Makefile.inc1 Sun Mar 30 23:43:30 2014(r263953)
@@ -240,8 +240,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/i
PATH=${BPATH}:${PATH} \
WORLDTMP=${WORLDTMP} \
VERSION="${VERSION}" \
- MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
- COMPILER_TYPE=${COMPILER_TYPE}
+ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
DESTDIR= \
@@ -270,8 +269,7 @@ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${BPATH}:${PATH} \
WORLDTMP=${WORLDTMP} \
- VERSION="${VERSION}" \
- COMPILER_TYPE=${COMPILER_TYPE}
+ VERSION="${VERSION}"
KTMAKE=TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
DESTDIR= \
@@ -324,17 +322,6 @@ WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${
AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
-.if ${XCC:T:Mgcc} == "gcc"
-WMAKE_COMPILER_TYPE= gcc
-.elif ${XCC:T:Mclang} == "clang"
-WMAKE_COMPILER_TYPE= clang
-.elif ${MK_CLANG_IS_CC} == "no"
-WMAKE_COMPILER_TYPE= gcc
-.else
-WMAKE_COMPILER_TYPE= clang
-.endif
-IMAKE_COMPILER_TYPE= COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
-
.if ${XCC:M/*}
XFLAGS=--sysroot=${WORLDTMP}
.if defined(CROSS_BINUTILS_PREFIX)
@@ -347,21 +334,18 @@ XFLAGS+= -B${CROSS_BINUTILS_PREFIX}
.else
XFLAGS+= -B${WORLDTMP}/usr/bin
.endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang"
-.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
-${MK_ARM_EABI} != "no"
+.if ${TARGET} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_ARCH:M*eb*} == ""
TARGET_ABI=gnueabi
.elif ${TARGET_ARCH} == "armv6hf"
TARGET_ABI=gnueabihf
-.else
-TARGET_ABI=unknown
.endif
+.endif
+TARGET_ABI?= unknown
TARGET_TRIPLE?=${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
XFLAGS+= -target ${TARGET_TRIPLE}
.endif
-.endif
-WMAKEENV+= COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1
DESTDIR=${WORLDTMP}
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
@@ -409,10 +393,8 @@ LIB32WMAKEENV+=MAKEOBJDIRPREFIX=${OBJTR
PATH=${TMPPATH} \
LIBDIR=/usr/lib32 \
SHLIBDIR=/usr/lib32 \
- LIBPRIVATEDIR=/usr/lib32/private \
- COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
-LIB32WMAKEFLAGS+= \
- CC="${XCC} ${LIB32FLAGS}" \
+ LIBPRIVATEDIR=/usr/lib32/private
+LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \
CXX="${XCXX} ${LIB32FLAGS}" \
DESTDIR=${LIB32TMP} \
-DCOMPAT_32BIT \
@@ -430,7 +412,7 @@ LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDES
IMAKEENV= ${CROSSENV:N_LDSCRIPTROOT=*}
IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 \
- ${IMAKE_INSTALL} ${IMAKE_MTREE} ${IMAKE_COMPILER_TYPE}
+ ${IMAKE_INSTALL} ${IMAKE_MTREE}
.if empty(.MAKEFLAGS:M-n)
IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \
LD_LIBRARY_PATH=${INSTALLTMP} \
Modified: head/share/mk/bsd.prog.mk
==
--- head/share/mk/bsd.prog.mk Sun Mar 30 22:25:01 2014(r263952)
+++ head/share/mk/bsd.prog.mk Sun Mar 30 23:43:30 2014(r263953)
@@ -173,7 +173,7 @@ _EXTRADEPEND:
.else
echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
.if defined(PROG_CXX) && !defined(EARLY_BUILD)
-.if ${MK_CLANG_IS_CC} != "no" && empty(CXXFLAGS:M-stdlib=libstdc++)
+.if ${COMPILER_TYPE} == "clang" && empty(CXXFLAGS:M-stdlib=libstdc++)
echo ${PROG}: ${LI
Re: svn commit: r263885 - in head/sys/dev/vt: . hw/vga
On Sun, Mar 30, 2014 at 11:38:24PM +0300, Aleksandr Rybalko wrote: > > I've always wondered why FreeBSD *ever* had this ugly > > "look-we-can-make-it- like-in-wind0ze" mouse pointer on the console. > > I've been always building kernel with SC_ALT_MOUSE_IMAGE; I'm really > > hoping (if this nonsense has to stay) there will be an option to > > completely disable it and all related code paths when vt(4) > > eventually replaces syscons(4). > > its name SC_NO_CUTPASTE for both syscons(4) and vt(4). Hmm, doesn't seem so. I've never had this option in kernel config, and its name suggest it's for disabling cut-n-paste buffer, which is not what I want (and find it very convenient, FWIW). I'm pretty sure that SC_ALT_MOUSE_IMAGE gives me that standard, "inverted" nice text-mode mouse pointer we all used to since early DOS years. ./danfe ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r263957 - in head/sys: dev/age dev/alc dev/ale dev/bce dev/bge dev/fxp dev/jme dev/msk dev/nfe dev/sge pci
Author: yongari
Date: Mon Mar 31 01:54:59 2014
New Revision: 263957
URL: http://svnweb.freebsd.org/changeset/base/263957
Log:
Increase the number of TX DMA segments from 32 to 35. It turned
out 32 is not enough to support a full sized TSO packet.
While I'm here fix a long standing bug introduced in r169632 in
bce(4) where it didn't include L2 header length of TSO packet in
the maximum DMA segment size calculation.
In collaboration with:rmacklem
MFC after:2 weeks
Modified:
head/sys/dev/age/if_agevar.h
head/sys/dev/alc/if_alcvar.h
head/sys/dev/ale/if_alevar.h
head/sys/dev/bce/if_bcereg.h
head/sys/dev/bge/if_bgereg.h
head/sys/dev/fxp/if_fxpreg.h
head/sys/dev/jme/if_jmevar.h
head/sys/dev/msk/if_mskreg.h
head/sys/dev/nfe/if_nfereg.h
head/sys/dev/sge/if_sgereg.h
head/sys/pci/if_rlreg.h
Modified: head/sys/dev/age/if_agevar.h
==
--- head/sys/dev/age/if_agevar.hMon Mar 31 01:04:40 2014
(r263956)
+++ head/sys/dev/age/if_agevar.hMon Mar 31 01:54:59 2014
(r263957)
@@ -42,7 +42,7 @@
#defineAGE_TSO_MAXSEGSIZE 4096
#defineAGE_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineAGE_MAXTXSEGS 32
+#defineAGE_MAXTXSEGS 35
#defineAGE_RX_BUF_ALIGN8
#ifndef __NO_STRICT_ALIGNMENT
#defineAGE_RX_BUF_SIZE (MCLBYTES - AGE_RX_BUF_ALIGN)
Modified: head/sys/dev/alc/if_alcvar.h
==
--- head/sys/dev/alc/if_alcvar.hMon Mar 31 01:04:40 2014
(r263956)
+++ head/sys/dev/alc/if_alcvar.hMon Mar 31 01:54:59 2014
(r263957)
@@ -42,7 +42,7 @@
#defineALC_TSO_MAXSEGSIZE 4096
#defineALC_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineALC_MAXTXSEGS 32
+#defineALC_MAXTXSEGS 35
#defineALC_ADDR_LO(x) ((uint64_t) (x) & 0x)
#defineALC_ADDR_HI(x) ((uint64_t) (x) >> 32)
Modified: head/sys/dev/ale/if_alevar.h
==
--- head/sys/dev/ale/if_alevar.hMon Mar 31 01:04:40 2014
(r263956)
+++ head/sys/dev/ale/if_alevar.hMon Mar 31 01:54:59 2014
(r263957)
@@ -40,7 +40,7 @@
#defineALE_TSO_MAXSEGSIZE 4096
#defineALE_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineALE_MAXTXSEGS 32
+#defineALE_MAXTXSEGS 35
#defineALE_ADDR_LO(x) ((uint64_t) (x) & 0x)
#defineALE_ADDR_HI(x) ((uint64_t) (x) >> 32)
Modified: head/sys/dev/bce/if_bcereg.h
==
--- head/sys/dev/bce/if_bcereg.hMon Mar 31 01:04:40 2014
(r263956)
+++ head/sys/dev/bce/if_bcereg.hMon Mar 31 01:54:59 2014
(r263957)
@@ -6309,8 +6309,8 @@ struct fw_info {
#define BCE_TX_TIMEOUT 5
-#define BCE_MAX_SEGMENTS 32
-#define BCE_TSO_MAX_SIZE 65536
+#define BCE_MAX_SEGMENTS 35
+#define BCE_TSO_MAX_SIZE (65535 + sizeof(struct ether_vlan_header))
#define BCE_TSO_MAX_SEG_SIZE 4096
#define BCE_DMA_ALIGN 8
Modified: head/sys/dev/bge/if_bgereg.h
==
--- head/sys/dev/bge/if_bgereg.hMon Mar 31 01:04:40 2014
(r263956)
+++ head/sys/dev/bge/if_bgereg.hMon Mar 31 01:54:59 2014
(r263957)
@@ -2852,7 +2852,7 @@ struct bge_gib {
*/
#defineBGE_NSEG_JUMBO 4
-#defineBGE_NSEG_NEW32
+#defineBGE_NSEG_NEW35
#defineBGE_TSOSEG_SZ 4096
/* Maximum DMA address for controllers that have 40bit DMA address bug. */
Modified: head/sys/dev/fxp/if_fxpreg.h
==
--- head/sys/dev/fxp/if_fxpreg.hMon Mar 31 01:04:40 2014
(r263956)
+++ head/sys/dev/fxp/if_fxpreg.hMon Mar 31 01:54:59 2014
(r263957)
@@ -250,7 +250,7 @@ struct fxp_cb_ucode {
/*
* Number of DMA segments in a TxCB.
*/
-#define FXP_NTXSEG 32
+#define FXP_NTXSEG 35
struct fxp_tbd {
uint32_t tb_addr;
Modified: head/sys/dev/jme/if_jmevar.h
==
--- head/sys/dev/jme/if_jmevar.hMon Mar 31 01:04:40 2014
(r263956)
+++ head/sys/dev/jme/if_jmevar.hMon Mar 31 01:54:59 2014
(r263957)
@@ -49,7 +49,7 @@
#defineJME_RX_RING_ALIGN 16
#defineJME_TSO_MAXSEGSIZE 4096
#defineJME_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineJME_MAXTXSEGS 32
+#define
Re: svn commit: r263953 - in head: . share/mk
On 31.03.2014 3:43, Warner Losh wrote: > Author: imp > Date: Sun Mar 30 23:43:30 2014 > New Revision: 263953 > URL: http://svnweb.freebsd.org/changeset/base/263953 Somewhere after your mk changes (I think, previous files) typing 'make' in /usr/src/lib produce that: make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "all_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "all_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "all-man_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "all-man_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "checkdpadd_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "checkdpadd_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "clean_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "clean_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "cleandepend_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "cleandepend_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "cleandir_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "cleandir_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "cleanilinks_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "cleanilinks_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "depend_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "depend_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "distribute_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "distribute_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "lint_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "lint_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "maninstall_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "maninstall_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "manlint_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "manlint_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "obj_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "obj_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "objlink_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "objlink_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "realinstall_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "realinstall_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "regress_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "regress_subdir_libnv" defined here make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: duplicate script for target "tags_subdir_libnv" ignored make: "/usr/share/mk/bsd.subdir.mk" line 89: warning: using previous script for "tags_subdir_libnv" defined here -- http://ache.vniz.net/ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r263957 - in head/sys: dev/age dev/alc dev/ale dev/bce dev/bge dev/fxp dev/jme dev/msk dev/nfe dev/sge pci
Pyun YongHyeon wrote this message on Mon, Mar 31, 2014 at 01:54 +: > Author: yongari > Date: Mon Mar 31 01:54:59 2014 > New Revision: 263957 > URL: http://svnweb.freebsd.org/changeset/base/263957 > > Log: > Increase the number of TX DMA segments from 32 to 35. It turned > out 32 is not enough to support a full sized TSO packet. > While I'm here fix a long standing bug introduced in r169632 in > bce(4) where it didn't include L2 header length of TSO packet in > the maximum DMA segment size calculation. I assume all of the hardware supports this increase? Also, is there a reason to only increase up to 35 and not something larger, like 64? Is there a memory or performance penalty? -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r263957 - in head/sys: dev/age dev/alc dev/ale dev/bce dev/bge dev/fxp dev/jme dev/msk dev/nfe dev/sge pci
On Sun, Mar 30, 2014 at 09:00:59PM -0700, John-Mark Gurney wrote: > Pyun YongHyeon wrote this message on Mon, Mar 31, 2014 at 01:54 +: > > Author: yongari > > Date: Mon Mar 31 01:54:59 2014 > > New Revision: 263957 > > URL: http://svnweb.freebsd.org/changeset/base/263957 > > > > Log: > > Increase the number of TX DMA segments from 32 to 35. It turned > > out 32 is not enough to support a full sized TSO packet. > > While I'm here fix a long standing bug introduced in r169632 in > > bce(4) where it didn't include L2 header length of TSO packet in > > the maximum DMA segment size calculation. > > I assume all of the hardware supports this increase? > Yes. Data sheet does not mention about such limitation. txp(4) has a limitation on the number of TX segments but I didn't implement TSO in txp(4). > Also, is there a reason to only increase up to 35 and not something > larger, like 64? Is there a memory or performance penalty? > If 64 does not overflow kernel stack we can also bump the number to 64. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r263957 - in head/sys: dev/age dev/alc dev/ale dev/bce dev/bge dev/fxp dev/jme dev/msk dev/nfe dev/sge pci
On Mon, Mar 31, 2014 at 01:25:35PM +0900, Yonghyeon PYUN wrote: > On Sun, Mar 30, 2014 at 09:00:59PM -0700, John-Mark Gurney wrote: > > Pyun YongHyeon wrote this message on Mon, Mar 31, 2014 at 01:54 +: > > > Author: yongari > > > Date: Mon Mar 31 01:54:59 2014 > > > New Revision: 263957 > > > URL: http://svnweb.freebsd.org/changeset/base/263957 > > > > > > Log: > > > Increase the number of TX DMA segments from 32 to 35. It turned > > > out 32 is not enough to support a full sized TSO packet. > > > While I'm here fix a long standing bug introduced in r169632 in > > > bce(4) where it didn't include L2 header length of TSO packet in > > > the maximum DMA segment size calculation. > > > > I assume all of the hardware supports this increase? > > > > Yes. Data sheet does not mention about such limitation. txp(4) > has a limitation on the number of TX segments but I didn't > implement TSO in txp(4). > > > Also, is there a reason to only increase up to 35 and not something > > larger, like 64? Is there a memory or performance penalty? > > > > If 64 does not overflow kernel stack we can also bump the number to > 64. Hmm, I think I didn't answer on performance penalty. If hardware allows only a single outstanding DMA read operation, having multiple TX buffers would result in lower performance. However it's common to have multiple TX buffers in TSO so I don't think it could change performance number in TSO path. And I think most high end server NICs support multiple outstanding DMA read operation. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
