Page MenuHomeFreeBSD
Files F136988995

D10420.id27575.diff
No OneTemporary
Actions

D10420.id27575.diff
View Options

Index: share/man/man5/src.conf.5
===================================================================
--- share/man/man5/src.conf.5
+++ share/man/man5/src.conf.5
@@ -465,6 +465,13 @@
.It
.Va WITHOUT_TESTS_SUPPORT
.El
+.It Va WITH_CXX
+Set to build
+.Xr c++ 1
+and related libraries.
+.Pp
+This is a default setting on
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
.It Va WITHOUT_DEBUG_FILES
Set to avoid building or installing standalone debug files for each
executable binary and shared library.
@@ -740,6 +747,14 @@
.Pp
This is a default setting on
riscv/riscv64 and riscv/riscv64sf.
+.It Va WITH_GROFF
+Set to build
+.Xr groff 1
+and
+.Xr vgrind 1 .
+.Pp
+This is a default setting on
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
.It Va WITHOUT_GSSAPI
Set to not build libgssapi.
.It Va WITHOUT_HAST
@@ -1222,10 +1237,17 @@
.Xr ppp 8
and related programs.
.It Va WITHOUT_PROFILE
-Set to avoid compiling profiled libraries.
+Set to not build profiled libraries for use with
+.Xr gprof 8 .
.Pp
This is a default setting on
riscv/riscv64 and riscv/riscv64sf.
+.It Va WITH_PROFILE
+Set to build profiled libraries for use with
+.Xr gprof 8 .
+.Pp
+This is a default setting on
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
.It Va WITHOUT_QUOTAS
Set to not build
.Xr quota 1
@@ -1269,6 +1291,10 @@
Set to not build
.Xr routed 8
utility.
+.It Va WITH_RPCBIND_WARMSTART_SUPPORT
+Set to build
+.Xr rpcbind 8
+with warmstart support.
.It Va WITHOUT_SENDMAIL
Set to not build
.Xr sendmail 8
Index: sys/dev/qlxgbe/ql_hw.c
===================================================================
--- sys/dev/qlxgbe/ql_hw.c
+++ sys/dev/qlxgbe/ql_hw.c
@@ -183,9 +183,9 @@
if (ret == 1) {
ha = (qla_host_t *)arg1;
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
qla_stop_pegs(ha);
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
}
return err;
Index: sys/dev/qlxgbe/ql_ioctl.c
===================================================================
--- sys/dev/qlxgbe/ql_ioctl.c
+++ sys/dev/qlxgbe/ql_ioctl.c
@@ -233,10 +233,10 @@
break;
}
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
if (!ha->hw.mdump_done)
ha->qla_initiate_recovery = 1;
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
#define QLNX_DUMP_WAIT_SECS 30
@@ -254,9 +254,9 @@
break;
}
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
ha->hw.mdump_done = 0;
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
if ((rval = copyout(ha->hw.mdump_template,
fw_dump->minidump, ha->hw.mdump_template_size))) {
Index: sys/dev/qlxgbe/ql_os.h
===================================================================
--- sys/dev/qlxgbe/ql_os.h
+++ sys/dev/qlxgbe/ql_os.h
@@ -148,12 +148,9 @@
/*
* Locks
*/
-#define QLA_LOCK(ha, str, no_delay) mtx_lock(&ha->hw_lock)
-#define QLA_UNLOCK(ha, str) mtx_unlock(&ha->hw_lock)
+#define QLA_LOCK(ha) mtx_lock(&ha->hw_lock)
+#define QLA_UNLOCK(ha) mtx_unlock(&ha->hw_lock)
-#define QLA_TX_LOCK(ha) mtx_lock(&ha->tx_lock);
-#define QLA_TX_UNLOCK(ha) mtx_unlock(&ha->tx_lock);
-
/*
* structure encapsulating a DMA buffer
*/
Index: sys/dev/qlxgbe/ql_os.c
===================================================================
--- sys/dev/qlxgbe/ql_os.c
+++ sys/dev/qlxgbe/ql_os.c
@@ -519,9 +519,9 @@
ifp = ha->ifp;
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
qla_stop(ha);
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
qla_release(ha);
@@ -890,9 +890,9 @@
QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
qla_init_locked(ha);
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
QL_DPRINT2(ha, (ha->pci_dev, "%s: exit\n", __func__));
}
@@ -924,13 +924,9 @@
if_maddr_runlock(ifp);
- //if (QLA_LOCK(ha, __func__, 1) == 0) {
- // ret = ql_hw_set_multi(ha, mta, mcnt, add_multi);
- // QLA_UNLOCK(ha, __func__);
- //}
- QLA_LOCK(ha, __func__, 1);
+ QLA_LOCK(ha);
ret = ql_hw_set_multi(ha, mta, mcnt, add_multi);
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
return (ret);
}
@@ -953,9 +949,9 @@
if (ifa->ifa_addr->sa_family == AF_INET) {
ifp->if_flags |= IFF_UP;
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
qla_init_locked(ha);
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
}
QL_DPRINT4(ha, (ha->pci_dev,
"%s: SIOCSIFADDR (0x%lx) ipv4 [0x%08x]\n",
@@ -975,10 +971,12 @@
if (ifr->ifr_mtu > QLA_MAX_MTU) {
ret = EINVAL;
} else {
- (void) QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
+
ifp->if_mtu = ifr->ifr_mtu;
ha->max_frame_size =
ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+
if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) {
ret = ql_set_max_mtu(ha, ha->max_frame_size,
ha->hw.rcv_cntxt_id);
@@ -990,7 +988,7 @@
ha->std_replenish = QL_STD_REPLENISH_THRES;
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
if (ret)
ret = EINVAL;
@@ -1002,7 +1000,7 @@
QL_DPRINT4(ha, (ha->pci_dev, "%s: SIOCSIFFLAGS (0x%lx)\n",
__func__, cmd));
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
if (ifp->if_flags & IFF_UP) {
if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) {
@@ -1026,7 +1024,7 @@
ha->if_flags = ifp->if_flags;
}
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
break;
case SIOCADDMULTI:
@@ -1917,7 +1915,7 @@
struct ifnet *ifp = ha->ifp;
int i = 0;
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
if (ha->flags.qla_interface_up) {
@@ -1943,7 +1941,7 @@
}
}
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
if ((ha->pci_func & 0x1) == 0) {
@@ -1957,18 +1955,22 @@
ha->msg_from_peer = 0;
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
+
ql_minidump(ha);
- QLA_UNLOCK(ha, __func__);
+
+ QLA_UNLOCK(ha);
(void) ql_init_hw(ha);
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
+
if (ha->flags.qla_interface_up) {
- qla_free_xmt_bufs(ha);
- qla_free_rcv_bufs(ha);
+ qla_free_xmt_bufs(ha);
+ qla_free_rcv_bufs(ha);
}
- QLA_UNLOCK(ha, __func__);
+
+ QLA_UNLOCK(ha);
qla_send_msg_to_peer(ha, QL_PEER_MSG_ACK);
@@ -1988,39 +1990,43 @@
(void) ql_init_hw(ha);
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
+
if (ha->flags.qla_interface_up) {
- qla_free_xmt_bufs(ha);
- qla_free_rcv_bufs(ha);
- }
- QLA_UNLOCK(ha, __func__);
+ qla_free_xmt_bufs(ha);
+ qla_free_rcv_bufs(ha);
+ }
+
+ QLA_UNLOCK(ha);
}
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
if (ha->flags.qla_interface_up) {
- if (qla_alloc_xmt_bufs(ha) != 0) {
- QLA_UNLOCK(ha, __func__);
- return;
- }
- qla_confirm_9kb_enable(ha);
- if (qla_alloc_rcv_bufs(ha) != 0) {
- QLA_UNLOCK(ha, __func__);
- return;
- }
+ if (qla_alloc_xmt_bufs(ha) != 0) {
+ QLA_UNLOCK(ha);
+ return;
+ }
+ qla_confirm_9kb_enable(ha);
- ha->flags.stop_rcv = 0;
- if (ql_init_hw_if(ha) == 0) {
- ifp = ha->ifp;
- ifp->if_drv_flags |= IFF_DRV_RUNNING;
- ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
- ha->flags.qla_watchdog_pause = 0;
- }
+ if (qla_alloc_rcv_bufs(ha) != 0) {
+ QLA_UNLOCK(ha);
+ return;
+ }
+
+ ha->flags.stop_rcv = 0;
+
+ if (ql_init_hw_if(ha) == 0) {
+ ifp = ha->ifp;
+ ifp->if_drv_flags |= IFF_DRV_RUNNING;
+ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+ ha->flags.qla_watchdog_pause = 0;
+ }
} else
ha->flags.qla_watchdog_pause = 0;
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
}
static void
@@ -2028,8 +2034,8 @@
{
qla_host_t *ha = context;
- (void)QLA_LOCK(ha, __func__, 0);
+ QLA_LOCK(ha);
qla_hw_async_event(ha);
- QLA_UNLOCK(ha, __func__);
+ QLA_UNLOCK(ha);
}
Index: sys/dev/syscons/scvgarndr.c
===================================================================
--- sys/dev/syscons/scvgarndr.c
+++ sys/dev/syscons/scvgarndr.c
@@ -173,7 +173,8 @@
0x0c00, 0x0c00, 0x0600, 0x0600, 0x0000, 0x0000, 0x0000, 0x0000, },
9, 13,
};
-
+#endif
+#if defined(SC_PIXEL_MODE)
static const struct mousedata mouse10x16 = { {
0xc000, 0xa000, 0x9000, 0x8800, 0x8400, 0x8200, 0x8100, 0x8080,
0x8040, 0x83c0, 0x9200, 0xa900, 0xc900, 0x0480, 0x0480, 0x0300, }, {
Index: sys/dev/vt/vt_core.c
===================================================================
--- sys/dev/vt/vt_core.c
+++ sys/dev/vt/vt_core.c
@@ -1149,6 +1149,34 @@
}
#endif
+static void
+vt_set_border(struct vt_window *vw, term_color_t c)
+{
+ struct vt_device *vd = vw->vw_device;
+ term_rect_t *vda = &vw->vw_draw_area;
+ int x, y;
+
+ /* Top bar. */
+ for (y = 0; y < vda->tr_begin.tp_row; y++)
+ for (x = 0; x < vd->vd_width; x++)
+ vd->vd_driver->vd_setpixel(vd, x, y, c);
+
+ for (y = vda->tr_begin.tp_row; y <= vda->tr_end.tp_row; y++) {
+ /* Left bar. */
+ for (x = 0; x < vda->tr_begin.tp_col; x++)
+ vd->vd_driver->vd_setpixel(vd, x, y, c);
+
+ /* Right bar. */
+ for (x = vda->tr_end.tp_col + 1; x < vd->vd_width; x++)
+ vd->vd_driver->vd_setpixel(vd, x, y, c);
+ }
+
+ /* Bottom bar. */
+ for (y = vda->tr_end.tp_row + 1; y < vd->vd_height; y++)
+ for (x = 0; x < vd->vd_width; x++)
+ vd->vd_driver->vd_setpixel(vd, x, y, c);
+}
+
static int
vt_flush(struct vt_device *vd)
{
@@ -1214,6 +1242,7 @@
if (vd->vd_flags & VDF_INVALID) {
vd->vd_flags &= ~VDF_INVALID;
+ vt_set_border(vw, TC_BLACK);
vt_termrect(vd, vf, &tarea);
if (vt_draw_logo_cpus)
vtterm_draw_cpu_logos(vd);
@@ -1529,45 +1558,6 @@
}
static int
-vt_set_border(struct vt_window *vw, term_color_t c)
-{
- struct vt_device *vd = vw->vw_device;
-
- if (vd->vd_driver->vd_drawrect == NULL)
- return (ENOTSUP);
-
- /* Top bar. */
- if (vw->vw_draw_area.tr_begin.tp_row > 0)
- vd->vd_driver->vd_drawrect(vd,
- 0, 0,
- vd->vd_width - 1, vw->vw_draw_area.tr_begin.tp_row - 1,
- 1, c);
-
- /* Left bar. */
- if (vw->vw_draw_area.tr_begin.tp_col > 0)
- vd->vd_driver->vd_drawrect(vd,
- 0, 0,
- vw->vw_draw_area.tr_begin.tp_col - 1, vd->vd_height - 1,
- 1, c);
-
- /* Right bar. */
- if (vw->vw_draw_area.tr_end.tp_col < vd->vd_width)
- vd->vd_driver->vd_drawrect(vd,
- vw->vw_draw_area.tr_end.tp_col - 1, 0,
- vd->vd_width - 1, vd->vd_height - 1,
- 1, c);
-
- /* Bottom bar. */
- if (vw->vw_draw_area.tr_end.tp_row < vd->vd_height)
- vd->vd_driver->vd_drawrect(vd,
- 0, vw->vw_draw_area.tr_end.tp_row - 1,
- vd->vd_width - 1, vd->vd_height - 1,
- 1, c);
-
- return (0);
-}
-
-static int
vt_change_font(struct vt_window *vw, struct vt_font *vf)
{
struct vt_device *vd = vw->vw_device;
@@ -1632,7 +1622,6 @@
/* Force a full redraw the next timer tick. */
if (vd->vd_curwindow == vw) {
- vt_set_border(vw, TC_BLACK);
vd->vd_flags |= VDF_INVALID;
vt_resume_flush_timer(vw->vw_device, 0);
}
Index: sys/dev/vt/vt_cpulogos.c
===================================================================
--- sys/dev/vt/vt_cpulogos.c
+++ sys/dev/vt/vt_cpulogos.c
@@ -153,7 +153,6 @@
struct winsize wsz;
term_pos_t size;
unsigned int i;
- int row;
if (!vt_draw_logo_cpus)
return;
@@ -171,7 +170,7 @@
vt_draw_logo_cpus = 0;
VT_UNLOCK(vd);
- for (i = row = 0; i < VT_MAXWINDOWS; i++) {
+ for (i = 0; i < VT_MAXWINDOWS; i++) {
vw = vd->vd_windows[i];
if (vw == NULL)
continue;
@@ -194,16 +193,11 @@
vt_compute_drawable_area(vw);
if (vd->vd_curwindow == vw) {
- row = vw->vw_draw_area.tr_begin.tp_row;
vd->vd_flags |= VDF_INVALID;
vt_resume_flush_timer(vd, 0);
}
VT_UNLOCK(vd);
}
-
- if (row > 0 && vd->vd_driver->vd_drawrect != NULL)
- vd->vd_driver->vd_drawrect(vd, 0, 0, vd->vd_width, row - 1,
- 1, TC_BLACK);
}
static void
Index: sys/netinet/tcp_lro.c
===================================================================
--- sys/netinet/tcp_lro.c
+++ sys/netinet/tcp_lro.c
@@ -115,7 +115,6 @@
lc->lro_bad_csum = 0;
lc->lro_queued = 0;
lc->lro_flushed = 0;
- lc->lro_cnt = 0;
lc->lro_mbuf_count = 0;
lc->lro_mbuf_max = lro_mbufs;
lc->lro_cnt = lro_entries;
@@ -145,6 +144,7 @@
/* check for out of memory */
if (lc->lro_mbuf_data == NULL) {
+ free(lc->lro_hash, M_LRO);
memset(lc, 0, sizeof(*lc));
return (ENOMEM);
}
@@ -175,17 +175,15 @@
}
/* free hash table */
- if (lc->lro_hash != NULL) {
- free(lc->lro_hash, M_LRO);
- lc->lro_hash = NULL;
- }
+ free(lc->lro_hash, M_LRO);
+ lc->lro_hash = NULL;
lc->lro_hashsz = 0;
/* free mbuf array, if any */
for (x = 0; x != lc->lro_mbuf_count; x++)
m_freem(lc->lro_mbuf_data[x].mb);
lc->lro_mbuf_count = 0;
-
+
/* free allocated memory, if any */
free(lc->lro_mbuf_data, M_LRO);
lc->lro_mbuf_data = NULL;
Index: sys/sys/param.h
===================================================================
--- sys/sys/param.h
+++ sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1200028 /* Master, propagated to newvers */
+#define __FreeBSD_version 1200029 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Index: tools/build/options/WITHOUT_PROFILE
===================================================================
--- tools/build/options/WITHOUT_PROFILE
+++ tools/build/options/WITHOUT_PROFILE
@@ -1,2 +1,3 @@
.\" $FreeBSD$
-Set to avoid compiling profiled libraries.
+Set to not build profiled libraries for use with
+.Xr gprof 8 .
Index: tools/build/options/WITH_GROFF
===================================================================
--- /dev/null
+++ tools/build/options/WITH_GROFF
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to build
+.Xr groff 1
+and
+.Xr vgrind 1 .
Index: tools/build/options/WITH_PROFILE
===================================================================
--- /dev/null
+++ tools/build/options/WITH_PROFILE
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to build profiled libraries for use with
+.Xr gprof 8 .
Index: usr.bin/grep/grep.c
===================================================================
--- usr.bin/grep/grep.c
+++ usr.bin/grep/grep.c
@@ -704,8 +704,13 @@
case GREP_BASIC:
break;
case GREP_FIXED:
- /* XXX: header mess, REG_LITERAL not defined in gnu/regex.h */
- cflags |= 0020;
+#ifdef REG_NOSPEC
+ cflags |= REG_NOSPEC;
+#elif DEFINED(REG_LITERAL)
+ cflags |= REG_LITERAL;
+#else
+ err(2, "literal expressions not supported at compile-time");
+#endif
break;
case GREP_EXTENDED:
cflags |= REG_EXTENDED;

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 21, 10:30 PM (10 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25815199
Default Alt Text
D10420.id27575.diff (14 KB)

Event Timeline