svn commit: r219048 - in head: share/man/man4 sys/dev/usb/controller usr.sbin/usbconfig
Author: hselasky Date: Sat Feb 26 09:28:52 2011 New Revision: 219048 URL: http://svn.freebsd.org/changeset/base/219048 Log: - Correct USB 3.0 wire-speed to 5.0Gbps MFC after:3 days Approved by: thompsa (mentor) Modified: head/share/man/man4/xhci.4 head/sys/dev/usb/controller/usb_controller.c head/usr.sbin/usbconfig/dump.c Modified: head/share/man/man4/xhci.4 == --- head/share/man/man4/xhci.4 Sat Feb 26 04:02:54 2011(r219047) +++ head/share/man/man4/xhci.4 Sat Feb 26 09:28:52 2011(r219048) @@ -48,7 +48,7 @@ The .Tn XHCI controller supports .Tn USB -connection speeds up to 4.8Gbps when using a USB 3.0 compliant device. +connection speeds up to 5.0Gbps when using a USB 3.0 compliant device. .Sh SEE ALSO .Xr ehci 4 , .Xr ohci 4 , Modified: head/sys/dev/usb/controller/usb_controller.c == --- head/sys/dev/usb/controller/usb_controller.cSat Feb 26 04:02:54 2011(r219047) +++ head/sys/dev/usb/controller/usb_controller.cSat Feb 26 09:28:52 2011(r219048) @@ -365,7 +365,7 @@ usb_bus_attach(struct usb_proc_msg *pm) case USB_REV_3_0: speed = USB_SPEED_SUPER; - device_printf(bus-bdev, 4.8Gbps Super Speed USB v3.0\n); + device_printf(bus-bdev, 5.0Gbps Super Speed USB v3.0\n); break; default: Modified: head/usr.sbin/usbconfig/dump.c == --- head/usr.sbin/usbconfig/dump.c Sat Feb 26 04:02:54 2011 (r219047) +++ head/usr.sbin/usbconfig/dump.c Sat Feb 26 09:28:52 2011 (r219048) @@ -65,11 +65,11 @@ dump_speed(uint8_t value) case LIBUSB20_SPEED_VARIABLE: return (VARIABLE (52-480Mbps)); case LIBUSB20_SPEED_SUPER: - return (SUPER (4.8Gbps)); + return (SUPER (5.0Gbps)); default: break; } - return (unknown); + return (UNKNOWN ()); } const char * ___ 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: r219055 - head/share/doc/psd/23.rpc
Author: brucec Date: Sat Feb 26 12:50:28 2011 New Revision: 219055 URL: http://svn.freebsd.org/changeset/base/219055 Log: Fix typo - is is should have been changed to it is in r218965. Modified: head/share/doc/psd/23.rpc/rpc.prog.ms Modified: head/share/doc/psd/23.rpc/rpc.prog.ms == --- head/share/doc/psd/23.rpc/rpc.prog.ms Sat Feb 26 12:07:16 2011 (r219054) +++ head/share/doc/psd/23.rpc/rpc.prog.ms Sat Feb 26 12:50:28 2011 (r219055) @@ -71,7 +71,7 @@ manual page. .I The Highest Layer: .IX RPC The Highest Layer The highest layer is totally transparent to the operating system, -machine and network upon which is run. It's probably best to +machine and network upon which it is run. It's probably best to think of this level as a way of .I using RPC, rather than as ___ 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: r219056 - in head/sys: cam/ata cam/scsi dev/ata geom
Author: nwhitehorn
Date: Sat Feb 26 14:58:54 2011
New Revision: 219056
URL: http://svn.freebsd.org/changeset/base/219056
Log:
Add the disk ident and a human-meaningful description (here, the disk model
string) to the geom_disk config XML so that they are easily accessible from
userland.
MFC after:1 week
Modified:
head/sys/cam/ata/ata_da.c
head/sys/cam/scsi/scsi_cd.c
head/sys/dev/ata/ata-disk.c
head/sys/geom/geom_disk.c
head/sys/geom/geom_disk.h
Modified: head/sys/cam/ata/ata_da.c
==
--- head/sys/cam/ata/ata_da.c Sat Feb 26 12:50:28 2011(r219055)
+++ head/sys/cam/ata/ata_da.c Sat Feb 26 14:58:54 2011(r219056)
@@ -746,6 +746,8 @@ adaregister(struct cam_periph *periph, v
softc-disk-d_flags |= DISKFLAG_CANDELETE;
strlcpy(softc-disk-d_ident, cgd-serial_num,
MIN(sizeof(softc-disk-d_ident), cgd-serial_num_len + 1));
+ strlcpy(softc-disk-d_descr, cgd-ident_data.model,
+ MIN(sizeof(softc-disk-d_descr), sizeof(cgd-ident_data.model)));
softc-disk-d_hba_vendor = cpi.hba_vendor;
softc-disk-d_hba_device = cpi.hba_device;
softc-disk-d_hba_subvendor = cpi.hba_subvendor;
Modified: head/sys/cam/scsi/scsi_cd.c
==
--- head/sys/cam/scsi/scsi_cd.c Sat Feb 26 12:50:28 2011(r219055)
+++ head/sys/cam/scsi/scsi_cd.c Sat Feb 26 14:58:54 2011(r219056)
@@ -724,6 +724,12 @@ cdregister(struct cam_periph *periph, vo
softc-disk-d_strategy = cdstrategy;
softc-disk-d_ioctl = cdioctl;
softc-disk-d_name = cd;
+ cam_strvis(softc-disk-d_descr, cgd-inq_data.vendor,
+ sizeof(cgd-inq_data.vendor), sizeof(softc-disk-d_descr));
+ strlcat(softc-disk-d_descr, , sizeof(softc-disk-d_descr));
+ cam_strvis(softc-disk-d_descr[strlen(softc-disk-d_descr)],
+ cgd-inq_data.product, sizeof(cgd-inq_data.product),
+ sizeof(softc-disk-d_descr) - strlen(softc-disk-d_descr));
softc-disk-d_unit = periph-unit_number;
softc-disk-d_drv1 = periph;
if (cpi.maxio == 0)
Modified: head/sys/dev/ata/ata-disk.c
==
--- head/sys/dev/ata/ata-disk.c Sat Feb 26 12:50:28 2011(r219055)
+++ head/sys/dev/ata/ata-disk.c Sat Feb 26 14:58:54 2011(r219056)
@@ -145,6 +145,8 @@ ad_attach(device_t dev)
adp-disk-d_flags |= DISKFLAG_CANDELETE;
strlcpy(adp-disk-d_ident, atadev-param.serial,
sizeof(adp-disk-d_ident));
+strlcpy(adp-disk-d_descr, atadev-param.model,
+ sizeof(adp-disk-d_descr));
parent = device_get_parent(ch-dev);
if (parent != NULL device_get_parent(parent) != NULL
(device_get_devclass(parent) ==
Modified: head/sys/geom/geom_disk.c
==
--- head/sys/geom/geom_disk.c Sat Feb 26 12:50:28 2011(r219055)
+++ head/sys/geom/geom_disk.c Sat Feb 26 14:58:54 2011(r219056)
@@ -371,6 +371,8 @@ g_disk_dumpconf(struct sbuf *sb, const c
indent, dp-d_fwheads);
sbuf_printf(sb, %sfwsectors%u/fwsectors\n,
indent, dp-d_fwsectors);
+ sbuf_printf(sb, %sident%s/ident\n, indent, dp-d_ident);
+ sbuf_printf(sb, %sdescr%s/descr\n, indent, dp-d_descr);
}
}
Modified: head/sys/geom/geom_disk.h
==
--- head/sys/geom/geom_disk.h Sat Feb 26 12:50:28 2011(r219055)
+++ head/sys/geom/geom_disk.h Sat Feb 26 14:58:54 2011(r219056)
@@ -85,6 +85,7 @@ struct disk {
u_int d_stripeoffset;
u_int d_stripesize;
chard_ident[DISK_IDENT_SIZE];
+ chard_descr[DISK_IDENT_SIZE];
uint16_td_hba_vendor;
uint16_td_hba_device;
uint16_td_hba_subvendor;
___
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: r219057 - head/sys/netinet
Author: rrs
Date: Sat Feb 26 15:23:46 2011
New Revision: 219057
URL: http://svn.freebsd.org/changeset/base/219057
Log:
Improvements to CC modules:
1) Add four new points that allow you to get more information
to cc algo's
2) Fix the case where user changes module on a existing TCB, in
such a case, the initialization module needs to be called on all nets.
3) Move htcp_cc structure to a union that other modules can use.
4) Add 5th point for get/set socket options for cc_module specific options
MFC after:2 months
Modified:
head/sys/netinet/sctp.h
head/sys/netinet/sctp_cc_functions.c
head/sys/netinet/sctp_dtrace_declare.h
head/sys/netinet/sctp_dtrace_define.h
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_structs.h
head/sys/netinet/sctp_sysctl.c
head/sys/netinet/sctp_sysctl.h
head/sys/netinet/sctp_timer.c
head/sys/netinet/sctp_uio.h
head/sys/netinet/sctp_usrreq.c
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctp.h
==
--- head/sys/netinet/sctp.h Sat Feb 26 14:58:54 2011(r219056)
+++ head/sys/netinet/sctp.h Sat Feb 26 15:23:46 2011(r219057)
@@ -161,9 +161,10 @@ struct sctp_paramhdr {
/* JRS - Pluggable Congestion Control Socket option */
#define SCTP_PLUGGABLE_CC 0x1202
/* RS - Pluggable Stream Scheduling Socket option */
-#define SCTP_PLUGGABLE_SS 0x1203
-#define SCTP_SS_VALUE 0x1204
-
+#define SCTP_PLUGGABLE_SS 0x1203
+#define SCTP_SS_VALUE 0x1204
+#define SCTP_CC_OPTION 0x1205 /* Options for CC
+* modules */
/* read only */
#define SCTP_GET_SNDBUF_USE0x1101
#define SCTP_GET_STAT_LOG 0x1103
Modified: head/sys/netinet/sctp_cc_functions.c
==
--- head/sys/netinet/sctp_cc_functions.cSat Feb 26 14:58:54 2011
(r219056)
+++ head/sys/netinet/sctp_cc_functions.cSat Feb 26 15:23:46 2011
(r219057)
@@ -1135,10 +1135,10 @@ htcp_reset(struct htcp *ca)
static uint32_t
htcp_cwnd_undo(struct sctp_tcb *stcb, struct sctp_nets *net)
{
- net-htcp_ca.last_cong = net-htcp_ca.undo_last_cong;
- net-htcp_ca.maxRTT = net-htcp_ca.undo_maxRTT;
- net-htcp_ca.old_maxB = net-htcp_ca.undo_old_maxB;
- return max(net-cwnd, ((net-ssthresh / net-mtu 7) /
net-htcp_ca.beta) * net-mtu);
+ net-cc_mod.htcp_ca.last_cong = net-cc_mod.htcp_ca.undo_last_cong;
+ net-cc_mod.htcp_ca.maxRTT = net-cc_mod.htcp_ca.undo_maxRTT;
+ net-cc_mod.htcp_ca.old_maxB = net-cc_mod.htcp_ca.undo_old_maxB;
+ return max(net-cwnd, ((net-ssthresh / net-mtu 7) /
net-cc_mod.htcp_ca.beta) * net-mtu);
}
#endif
@@ -1149,15 +1149,15 @@ measure_rtt(struct sctp_tcb *stcb, struc
uint32_t srtt = net-lastsa SCTP_RTT_SHIFT;
/* keep track of minimum RTT seen so far, minRTT is zero at first */
- if (net-htcp_ca.minRTT srtt || !net-htcp_ca.minRTT)
- net-htcp_ca.minRTT = srtt;
+ if (net-cc_mod.htcp_ca.minRTT srtt || !net-cc_mod.htcp_ca.minRTT)
+ net-cc_mod.htcp_ca.minRTT = srtt;
/* max RTT */
- if (net-fast_retran_ip == 0 net-ssthresh 0x
htcp_ccount(net-htcp_ca) 3) {
- if (net-htcp_ca.maxRTT net-htcp_ca.minRTT)
- net-htcp_ca.maxRTT = net-htcp_ca.minRTT;
- if (net-htcp_ca.maxRTT srtt srtt = net-htcp_ca.maxRTT +
MSEC_TO_TICKS(20))
- net-htcp_ca.maxRTT = srtt;
+ if (net-fast_retran_ip == 0 net-ssthresh 0x
htcp_ccount(net-cc_mod.htcp_ca) 3) {
+ if (net-cc_mod.htcp_ca.maxRTT net-cc_mod.htcp_ca.minRTT)
+ net-cc_mod.htcp_ca.maxRTT = net-cc_mod.htcp_ca.minRTT;
+ if (net-cc_mod.htcp_ca.maxRTT srtt srtt =
net-cc_mod.htcp_ca.maxRTT + MSEC_TO_TICKS(20))
+ net-cc_mod.htcp_ca.maxRTT = srtt;
}
}
@@ -1167,7 +1167,7 @@ measure_achieved_throughput(struct sctp_
uint32_t now = sctp_get_tick_count();
if (net-fast_retran_ip == 0)
- net-htcp_ca.bytes_acked = net-net_ack;
+ net-cc_mod.htcp_ca.bytes_acked = net-net_ack;
if (!use_bandwidth_switch)
return;
@@ -1175,29 +1175,29 @@ measure_achieved_throughput(struct sctp_
/* achieved throughput calculations */
/* JRS - not 100% sure of this statement */
if (net-fast_retran_ip == 1) {
- net-htcp_ca.bytecount = 0;
- net-htcp_ca.lasttime = now;
+ net-cc_mod.htcp_ca.bytecount = 0;
+ net-cc_mod.htcp_ca.lasttime = now;
svn commit: r219058 - head/usr.sbin/bsdinstall/partedit
Author: nwhitehorn
Date: Sat Feb 26 15:44:03 2011
New Revision: 219058
URL: http://svn.freebsd.org/changeset/base/219058
Log:
Show disk model numbers in partition wizard screen. Also, since da(4) disks
are probably more likely to be USB or Firewire these days than SCSI, just
call them and anyone unknown Disk instead of SCSI disk.
Modified:
head/usr.sbin/bsdinstall/partedit/part_wizard.c
Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c
==
--- head/usr.sbin/bsdinstall/partedit/part_wizard.c Sat Feb 26 15:23:46
2011(r219057)
+++ head/usr.sbin/bsdinstall/partedit/part_wizard.c Sat Feb 26 15:44:03
2011(r219058)
@@ -89,7 +89,7 @@ boot_disk(struct gmesh *mesh)
struct ggeom *gp;
struct gprovider *pp;
DIALOG_LISTITEM *disks = NULL;
- const char *type;
+ const char *type, *desc;
char diskdesc[512];
char *chosen;
int i, err, selected, n = 0;
@@ -104,15 +104,20 @@ boot_disk(struct gmesh *mesh)
continue;
LIST_FOREACH(pp, gp-lg_provider, lg_provider) {
- type = NULL;
- LIST_FOREACH(gc, pp-lg_config, lg_config)
+ desc = type = NULL;
+ LIST_FOREACH(gc, pp-lg_config, lg_config) {
if (strcmp(gc-lg_name, type) == 0)
type = gc-lg_val;
+ if (strcmp(gc-lg_name, descr) == 0)
+ desc = gc-lg_val;
+ }
- /* Skip swap-backed md devices */
+ /* Skip swap-backed md and WORM devices */
if (strcmp(classp-lg_name, MD) == 0
type != NULL strcmp(type, swap) == 0)
continue;
+ if (strncmp(pp-lg_name, cd, 2) == 0)
+ continue;
disks = realloc(disks, (++n)*sizeof(disks[0]));
disks[n-1].name = pp-lg_name;
@@ -120,15 +125,15 @@ boot_disk(struct gmesh *mesh)
B, HN_AUTOSCALE, HN_DECIMAL);
if (strncmp(pp-lg_name, ad, 2) == 0)
strcat(diskdesc, ATA Hard Disk);
- else if (strncmp(pp-lg_name, da, 2) == 0)
- strcat(diskdesc, SCSI Hard Disk);
else if (strncmp(pp-lg_name, md, 2) == 0)
strcat(diskdesc, Memory Disk);
- else if (strncmp(pp-lg_name, cd, 2) == 0) {
- n--;
- continue;
- } else
- strcat(diskdesc, Hard Disk);
+ else
+ strcat(diskdesc, Disk);
+
+ if (desc != NULL)
+ snprintf(diskdesc, sizeof(diskdesc),
+ %s %s, diskdesc, desc);
+
disks[n-1].text = strdup(diskdesc);
disks[n-1].help = NULL;
disks[n-1].state = 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: r219059 - head/sys/modules/usb
Author: glebius
Date: Sat Feb 26 17:22:11 2011
New Revision: 219059
URL: http://svn.freebsd.org/changeset/base/219059
Log:
Connect uep.ko to build
PR: kern/155044
Submitted by: Carl k0802647 telus.net
MFC after:1 week
Modified:
head/sys/modules/usb/Makefile
Modified: head/sys/modules/usb/Makefile
==
--- head/sys/modules/usb/Makefile Sat Feb 26 15:44:03 2011
(r219058)
+++ head/sys/modules/usb/Makefile Sat Feb 26 17:22:11 2011
(r219059)
@@ -28,7 +28,7 @@
SUBDIR = usb
SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci}
SUBDIR += rum run uath upgt ural zyd ${_urtw}
-SUBDIR += atp uhid ukbd ums udbp ufm
+SUBDIR += atp uhid ukbd ums udbp ufm uep
SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt
\
umct umodem umoscom uplcom uslcom uvisor uvscom
SUBDIR += uether aue axe cdce cue kue mos rue udav uhso ipheth
___
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: r219060 - head/sys/dev/fxp
Author: marius
Date: Sat Feb 26 17:28:09 2011
New Revision: 219060
URL: http://svn.freebsd.org/changeset/base/219060
Log:
- Allocate the DMA memory shared between the host and the controller as
coherent.
- Update a comment to no longer reference Alpha.
Modified:
head/sys/dev/fxp/if_fxp.c
Modified: head/sys/dev/fxp/if_fxp.c
==
--- head/sys/dev/fxp/if_fxp.c Sat Feb 26 17:22:11 2011(r219059)
+++ head/sys/dev/fxp/if_fxp.c Sat Feb 26 17:28:09 2011(r219060)
@@ -87,7 +87,7 @@ MODULE_DEPEND(fxp, miibus, 1, 1, 1);
#include miibus_if.h
/*
- * NOTE! On the Alpha, we have an alignment constraint. The
+ * NOTE! On !x86 we typically have an alignment constraint. The
* card DMAs the packet immediately following the RFA. However,
* the first thing in the packet is a 14-byte Ethernet header.
* This means that the packet is misaligned. To compensate,
@@ -675,7 +675,7 @@ fxp_attach(device_t dev)
}
error = bus_dmamem_alloc(sc-fxp_stag, (void **)sc-fxp_stats,
- BUS_DMA_NOWAIT | BUS_DMA_ZERO, sc-fxp_smap);
+ BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_ZERO, sc-fxp_smap);
if (error) {
device_printf(dev, could not allocate stats DMA memory\n);
goto fail;
@@ -697,7 +697,7 @@ fxp_attach(device_t dev)
}
error = bus_dmamem_alloc(sc-cbl_tag, (void **)sc-fxp_desc.cbl_list,
- BUS_DMA_NOWAIT | BUS_DMA_ZERO, sc-cbl_map);
+ BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_ZERO, sc-cbl_map);
if (error) {
device_printf(dev, could not allocate TxCB DMA memory\n);
goto fail;
@@ -722,7 +722,7 @@ fxp_attach(device_t dev)
}
error = bus_dmamem_alloc(sc-mcs_tag, (void **)sc-mcsp,
- BUS_DMA_NOWAIT | BUS_DMA_ZERO, sc-mcs_map);
+ BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_ZERO, sc-mcs_map);
if (error) {
device_printf(dev,
could not allocate multicast setup DMA memory\n);
___
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: r219061 - head/bin/csh
Author: ume
Date: Sat Feb 26 18:54:54 2011
New Revision: 219061
URL: http://svn.freebsd.org/changeset/base/219061
Log:
When WITH_ICONV is set, use our in-tree iconv.
Added:
head/bin/csh/iconv_stub.h
- copied unchanged from r219060, head/bin/csh/iconv.h
Deleted:
head/bin/csh/iconv.h
Modified:
head/bin/csh/Makefile
Modified: head/bin/csh/Makefile
==
--- head/bin/csh/Makefile Sat Feb 26 17:28:09 2011(r219060)
+++ head/bin/csh/Makefile Sat Feb 26 18:54:54 2011(r219061)
@@ -76,18 +76,26 @@ NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-
CFLAGS+= -DNO_NLS_CATALOGS
.else
CFLAGS+= -DHAVE_ICONV
+.if ${MK_ICONV} != no
+NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8
+NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8
+NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8
+NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8
+NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8
+NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8
+NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8
+NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8
+NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8
+NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8
+.else
+# Above links can be installed from ports/shells/tcsh_nls
+
+GENHDRS+= iconv.h
SRCS+= iconv_stub.c
-# Following links can be installed from ports/shells/tcsh_nls:
-# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8
-# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8
-# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8
-# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8
-# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8
-# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8
-# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8
-# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8
-# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8
-# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8
+
+iconv.h: ${.CURDIR}/iconv_stub.h
+ cp ${.CURDIR}/iconv_stub.h ${.TARGET}
+.endif
.endif
NLSNAME= tcsh
@@ -105,7 +113,8 @@ build-tools: gethost
gethost: gethost.c sh.err.h tc.const.h sh.h
@rm -f ${.TARGET}
- ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${TCSHDIR}/gethost.c
+ ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
+ ${TCSHDIR}/gethost.c
tc.defs.c: gethost ${.CURDIR}/host.defs
@rm -f ${.TARGET}
@@ -133,7 +142,8 @@ tc.const.h: tc.const.c sh.char.h config.
@echo '/* Do not edit this file, make creates it. */' ${.TARGET}
@echo '#ifndef _h_tc_const' ${.TARGET}
@echo '#define _h_tc_const' ${.TARGET}
- ${CC} -E ${CFLAGS} ${.ALLSRC} -D_h_tc_const | grep 'Char STR' | \
+ ${CC} -E ${CFLAGS:C/-DHAVE_ICONV//} ${.ALLSRC} -D_h_tc_const | \
+ grep 'Char STR' | \
sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
sort ${.TARGET}
@echo '#endif /* _h_tc_const */' ${.TARGET}
Copied: head/bin/csh/iconv_stub.h (from r219060, head/bin/csh/iconv.h)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/bin/csh/iconv_stub.h Sat Feb 26 18:54:54 2011(r219061, copy
of r219060, head/bin/csh/iconv.h)
@@ -0,0 +1,44 @@
+/*-
+ * Copyright (c) 2006 Hajimu UMEMOTO u...@freebsd.org
+ * 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 EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 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 BUSINESS 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _ICONV_H_
+#define _ICONV_H_
+
+typedef void *iconv_t;
+typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *);
+typedef int dl_iconv_close_t(iconv_t);
+
+extern iconv_t
svn commit: r219071 - head/sys/netinet
Author: dim Date: Sat Feb 26 22:45:40 2011 New Revision: 219071 URL: http://svn.freebsd.org/changeset/base/219071 Log: Fix breakage in sys/netinet/sctp_sysctl.c, introduced by r219057. If SCTP_HAS_RTTC is not defined, this file fails to compile. Insert the necessary #ifdefs to make it work. Pointy hat to:rrs Modified: head/sys/netinet/sctp_sysctl.c Modified: head/sys/netinet/sctp_sysctl.c == --- head/sys/netinet/sctp_sysctl.c Sat Feb 26 22:09:57 2011 (r219070) +++ head/sys/netinet/sctp_sysctl.c Sat Feb 26 22:45:40 2011 (r219071) @@ -115,9 +115,11 @@ sctp_init_sysctls() SCTP_BASE_SYSCTL(sctp_vtag_time_wait) = SCTPCTL_TIME_WAIT_DEFAULT; SCTP_BASE_SYSCTL(sctp_buffer_splitting) = SCTPCTL_BUFFER_SPLITTING_DEFAULT; SCTP_BASE_SYSCTL(sctp_initial_cwnd) = SCTPCTL_INITIAL_CWND_DEFAULT; +#ifdef SCTP_HAS_RTTCC SCTP_BASE_SYSCTL(sctp_rttvar_bw) = SCTPCTL_RTTVAR_BW_DEFAULT; SCTP_BASE_SYSCTL(sctp_rttvar_rtt) = SCTPCTL_RTTVAR_RTT_DEFAULT; SCTP_BASE_SYSCTL(sctp_rttvar_eqret) = SCTPCTL_RTTVAR_EQRET_DEFAULT; +#endif #if defined(SCTP_LOCAL_TRACE_BUF) memset(SCTP_BASE_SYSCTL(sctp_log), 0, sizeof(struct sctp_log)); #endif @@ -636,9 +638,11 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS) RANGECHK(SCTP_BASE_SYSCTL(sctp_vtag_time_wait), SCTPCTL_TIME_WAIT_MIN, SCTPCTL_TIME_WAIT_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_buffer_splitting), SCTPCTL_BUFFER_SPLITTING_MIN, SCTPCTL_BUFFER_SPLITTING_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_initial_cwnd), SCTPCTL_INITIAL_CWND_MIN, SCTPCTL_INITIAL_CWND_MAX); +#ifdef SCTP_HAS_RTTCC RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_bw), SCTPCTL_RTTVAR_BW_MIN, SCTPCTL_RTTVAR_BW_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_rtt), SCTPCTL_RTTVAR_RTT_MIN, SCTPCTL_RTTVAR_RTT_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_eqret), SCTPCTL_RTTVAR_EQRET_MIN, SCTPCTL_RTTVAR_EQRET_MAX); +#endif RANGECHK(SCTP_BASE_SYSCTL(sctp_mobility_base), SCTPCTL_MOBILITY_BASE_MIN, SCTPCTL_MOBILITY_BASE_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_mobility_fasthandoff), SCTPCTL_MOBILITY_FASTHANDOFF_MIN, SCTPCTL_MOBILITY_FASTHANDOFF_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_udp_tunneling_for_client_enable), SCTPCTL_UDP_TUNNELING_FOR_CLIENT_ENABLE_MIN, SCTPCTL_UDP_TUNNELING_FOR_CLIENT_ENABLE_MAX); @@ -1106,6 +1110,7 @@ SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUT SCTP_BASE_SYSCTL(sctp_initial_cwnd), 0, sysctl_sctp_check, IU, SCTPCTL_INITIAL_CWND_DESC); +#ifdef SCTP_HAS_RTTCC SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_bw, CTLTYPE_UINT | CTLFLAG_RW, SCTP_BASE_SYSCTL(sctp_rttvar_bw), 0, sysctl_sctp_check, IU, SCTPCTL_RTTVAR_BW_DESC); @@ -1117,6 +1122,7 @@ SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUT SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_eqret, CTLTYPE_UINT | CTLFLAG_RW, SCTP_BASE_SYSCTL(sctp_rttvar_eqret), 0, sysctl_sctp_check, IU, SCTPCTL_RTTVAR_EQRET_DESC); +#endif #ifdef SCTP_DEBUG SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, debug, CTLTYPE_UINT | CTLFLAG_RW, ___ 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: r219072 - head/contrib/llvm/tools/clang/lib/Driver
Author: dim Date: Sat Feb 26 23:05:47 2011 New Revision: 219072 URL: http://svn.freebsd.org/changeset/base/219072 Log: Remove misapplied space. Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp == --- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat Feb 26 22:45:40 2011(r219071) +++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat Feb 26 23:05:47 2011(r219072) @@ -3206,7 +3206,7 @@ void freebsd::Link::ConstructJob(Compila } Args.AddAllArgs(CmdArgs, options::OPT_L); - + const ToolChain::path_list Paths = getToolChain().getFilePaths(); for (ToolChain::path_list::const_iterator i = Paths.begin(), e = Paths.end(); i != e; ++i) ___ 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: r219073 - head/contrib/llvm/tools/clang/lib/Driver
Author: dim
Date: Sat Feb 26 23:07:43 2011
New Revision: 219073
URL: http://svn.freebsd.org/changeset/base/219073
Log:
Remove getDriver().Dir + /../libexec and /usr/libexec from clang's
program paths. Unlike gcc, clang has no executables in libexec.
Modified:
head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
Modified: head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
==
--- head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Sat Feb 26
23:05:47 2011(r219072)
+++ head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Sat Feb 26
23:07:43 2011(r219073)
@@ -1108,8 +1108,6 @@ FreeBSD::FreeBSD(const HostInfo Host, c
llvm::Triple::x86_64)
Lib32 = true;
- getProgramPaths().push_back(getDriver().Dir + /../libexec);
- getProgramPaths().push_back(/usr/libexec);
if (Lib32) {
getFilePaths().push_back(CLANG_PREFIX /usr/lib32);
} else {
___
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: r219074 - head/lib/clang/include/llvm/Config
Author: dim Date: Sat Feb 26 23:12:36 2011 New Revision: 219074 URL: http://svn.freebsd.org/changeset/base/219074 Log: Update llvm's config.h files to match more closely what is generated by a regular autoconf-based build. More cosmetic than functional changes. Modified: head/lib/clang/include/llvm/Config/config.h head/lib/clang/include/llvm/Config/llvm-config.h Modified: head/lib/clang/include/llvm/Config/config.h == --- head/lib/clang/include/llvm/Config/config.h Sat Feb 26 23:07:43 2011 (r219073) +++ head/lib/clang/include/llvm/Config/config.h Sat Feb 26 23:12:36 2011 (r219074) @@ -27,13 +27,13 @@ #define ENABLE_CBE_PRINTF_A 1 /* Define if position independent code is enabled */ -#define ENABLE_PIC 1 +#define ENABLE_PIC 0 /* Define if threads enabled */ -/* #undef ENABLE_THREADS */ +#define ENABLE_THREADS 0 /* Define if timestamp information (e.g., __DATE___) is allowed */ -/* #undef ENABLE_TIMESTAMPS */ +#define ENABLE_TIMESTAMPS 0 /* Define to 1 if you have the `argz_append' function. */ /* #undef HAVE_ARGZ_APPEND */ @@ -74,9 +74,16 @@ /* Define to 1 if you have the CrashReporterClient.h header file. */ /* #undef HAVE_CRASHREPORTERCLIENT_H */ +/* Define if __crashreporter_info__ exists. */ +#define HAVE_CRASHREPORTER_INFO 0 + /* Define to 1 if you have the ctype.h header file. */ #define HAVE_CTYPE_H 1 +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + /* Define to 1 if you have the dirent.h header file, and it defines `DIR'. */ #define HAVE_DIRENT_H 1 @@ -202,7 +209,7 @@ /* #undef HAVE_LIBPSAPI */ /* Define to 1 if you have the `pthread' library (-lpthread). */ -#define HAVE_LIBPTHREAD 1 +/* #undef HAVE_LIBPTHREAD */ /* Define to 1 if you have the `udis86' library (-ludis86). */ /* #undef HAVE_LIBUDIS86 */ @@ -383,9 +390,6 @@ /* Define to 1 if you have the `strerror_r' function. */ #define HAVE_STRERROR_R 1 -/* Define to 1 if you have the `strerror_s' function. */ -/* #undef HAVE_STRERROR_S */ - /* Define to 1 if you have the strings.h header file. */ #define HAVE_STRINGS_H 1 @@ -439,6 +443,9 @@ /* Define to 1 if you have the sys/types.h header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the sys/uio.h header file. */ +#define HAVE_SYS_UIO_H 1 + /* Define to 1 if you have sys/wait.h that is POSIX.1 compatible. */ #define HAVE_SYS_WAIT_H 1 @@ -466,14 +473,98 @@ /* Define to 1 if you have the windows.h header file. */ /* #undef HAVE_WINDOWS_H */ +/* Define to 1 if you have the `writev' function. */ +#define HAVE_WRITEV 1 + /* Define if the xdot.py program is available */ /* #undef HAVE_XDOT_PY */ +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + /* Define to 1 if you have the `__dso_handle' function. */ #define HAVE___DSO_HANDLE 1 +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVECHKSTK */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Installation directory for binary executables */ +/* #undef LLVM_BINDIR */ + +/* Time at which LLVM was configured */ +/* #undef LLVM_CONFIGTIME */ + +/* Installation directory for data files */ +/* #undef LLVM_DATADIR */ + +/* Installation directory for documentation */ +/* #undef LLVM_DOCSDIR */ + +/* Installation directory for config files */ +/* #undef LLVM_ETCDIR */ + +/* Host triple we were built on */ +/* #undef LLVM_HOSTTRIPLE */ + +/* Installation directory for include files */ +/* #undef LLVM_INCLUDEDIR */ + +/* Installation directory for .info files */ +/* #undef LLVM_INFODIR */ + +/* Installation directory for libraries */ +/* #undef LLVM_LIBDIR */ + +/* Installation directory for man pages */ +/* #undef LLVM_MANDIR */ + /* Build multithreading support into LLVM */ -/* #undef LLVM_MULTITHREADED */ +#define LLVM_MULTITHREADED 0 /* LLVM architecture name for the native architecture, if available */ #define LLVM_NATIVE_ARCH X86 @@ -521,7 +612,7 @@ /* #undef LLVM_PATH_XDOT_PY */ /* Installation prefix directory */ -#define LLVM_PREFIX /usr
svn commit: r219075 - head/sys/cam/scsi
Author: nwhitehorn Date: Sat Feb 26 23:30:32 2011 New Revision: 219075 URL: http://svn.freebsd.org/changeset/base/219075 Log: Missed a file in r219056: add disk description for da(4). Modified: head/sys/cam/scsi/scsi_da.c Modified: head/sys/cam/scsi/scsi_da.c == --- head/sys/cam/scsi/scsi_da.c Sat Feb 26 23:12:36 2011(r219074) +++ head/sys/cam/scsi/scsi_da.c Sat Feb 26 23:30:32 2011(r219075) @@ -1310,6 +1310,12 @@ daregister(struct cam_periph *periph, vo softc-disk-d_flags |= DISKFLAG_CANFLUSHCACHE; strlcpy(softc-disk-d_ident, cgd-serial_num, MIN(sizeof(softc-disk-d_ident), cgd-serial_num_len + 1)); + cam_strvis(softc-disk-d_descr, cgd-inq_data.vendor, + sizeof(cgd-inq_data.vendor), sizeof(softc-disk-d_descr)); + strlcat(softc-disk-d_descr, , sizeof(softc-disk-d_descr)); + cam_strvis(softc-disk-d_descr[strlen(softc-disk-d_descr)], + cgd-inq_data.product, sizeof(cgd-inq_data.product), + sizeof(softc-disk-d_descr) - strlen(softc-disk-d_descr)); softc-disk-d_hba_vendor = cpi.hba_vendor; softc-disk-d_hba_device = cpi.hba_device; softc-disk-d_hba_subvendor = cpi.hba_subvendor; ___ 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: r219076 - in head: contrib/llvm/lib/Support lib/clang/include/llvm/Config
Author: dim
Date: Sun Feb 27 00:02:48 2011
New Revision: 219076
URL: http://svn.freebsd.org/changeset/base/219076
Log:
Instead of defining LLVM_MULTITHREADED as 0 or 1, define or undefine it,
and test appropriately. Otherwise it might erroneously pick up some
pthread primitives, and fail to link.
Modified:
head/contrib/llvm/lib/Support/Atomic.cpp
head/lib/clang/include/llvm/Config/config.h
head/lib/clang/include/llvm/Config/llvm-config.h
Modified: head/contrib/llvm/lib/Support/Atomic.cpp
==
--- head/contrib/llvm/lib/Support/Atomic.cppSat Feb 26 23:30:32 2011
(r219075)
+++ head/contrib/llvm/lib/Support/Atomic.cppSun Feb 27 00:02:48 2011
(r219076)
@@ -22,7 +22,7 @@ using namespace llvm;
#endif
void sys::MemoryFence() {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
return;
#else
# if defined(__GNUC__)
@@ -38,7 +38,7 @@ void sys::MemoryFence() {
sys::cas_flag sys::CompareAndSwap(volatile sys::cas_flag* ptr,
sys::cas_flag new_value,
sys::cas_flag old_value) {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
sys::cas_flag result = *ptr;
if (result == old_value)
*ptr = new_value;
@@ -53,7 +53,7 @@ sys::cas_flag sys::CompareAndSwap(volati
}
sys::cas_flag sys::AtomicIncrement(volatile sys::cas_flag* ptr) {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
++(*ptr);
return *ptr;
#elif defined(__GNUC__)
@@ -66,7 +66,7 @@ sys::cas_flag sys::AtomicIncrement(volat
}
sys::cas_flag sys::AtomicDecrement(volatile sys::cas_flag* ptr) {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
--(*ptr);
return *ptr;
#elif defined(__GNUC__)
@@ -79,7 +79,7 @@ sys::cas_flag sys::AtomicDecrement(volat
}
sys::cas_flag sys::AtomicAdd(volatile sys::cas_flag* ptr, sys::cas_flag val) {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
*ptr += val;
return *ptr;
#elif defined(__GNUC__)
Modified: head/lib/clang/include/llvm/Config/config.h
==
--- head/lib/clang/include/llvm/Config/config.h Sat Feb 26 23:30:32 2011
(r219075)
+++ head/lib/clang/include/llvm/Config/config.h Sun Feb 27 00:02:48 2011
(r219076)
@@ -564,7 +564,7 @@
/* #undef LLVM_MANDIR */
/* Build multithreading support into LLVM */
-#define LLVM_MULTITHREADED 0
+/* #undef LLVM_MULTITHREADED */
/* LLVM architecture name for the native architecture, if available */
#define LLVM_NATIVE_ARCH X86
Modified: head/lib/clang/include/llvm/Config/llvm-config.h
==
--- head/lib/clang/include/llvm/Config/llvm-config.hSat Feb 26 23:30:32
2011(r219075)
+++ head/lib/clang/include/llvm/Config/llvm-config.hSun Feb 27 00:02:48
2011(r219076)
@@ -49,7 +49,7 @@
/* #undef LLVM_MANDIR */
/* Build multithreading support into LLVM */
-#define LLVM_MULTITHREADED 0
+/* #undef LLVM_MULTITHREADED */
/* LLVM architecture name for the native architecture, if available */
#define LLVM_NATIVE_ARCH X86
___
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: r219078 - in head/usr.bin/clang: clang tblgen
Author: dim Date: Sun Feb 27 01:45:36 2011 New Revision: 219078 URL: http://svn.freebsd.org/changeset/base/219078 Log: Regenerate clang and tblgen manpages; the clang manpage has some minor updates. Modified: head/usr.bin/clang/clang/clang.1 head/usr.bin/clang/tblgen/tblgen.1 Modified: head/usr.bin/clang/clang/clang.1 == --- head/usr.bin/clang/clang/clang.1Sun Feb 27 01:32:10 2011 (r219077) +++ head/usr.bin/clang/clang/clang.1Sun Feb 27 01:45:36 2011 (r219078) @@ -1,5 +1,5 @@ .\ $FreeBSD$ -.\ Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\ Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14) .\ .\ Standard preamble: .\ @@ -125,7 +125,7 @@ .\ .\ .IX Title CLANG 1 -.TH CLANG 1 2010-09-27 Clang 2.8 Clang Tools Documentation +.TH CLANG 1 2010-10-25 clang 2.9 Clang Tools Documentation .\ For nroff, turn off justification. Always turn off hyphenation; it makes .\ way too many mistakes in technical documents. .if n .ad l @@ -197,7 +197,7 @@ stages. In addition to compilation of c \\fBClang Static Analyzer\fR .PP The Clang Static Analyzer is a tool that scans source code to try to find bugs -though code analysis. This tool uses many parts of Clang and is built into the +through code analysis. This tool uses many parts of Clang and is built into the same driver. .SH OPTIONS .IX Header OPTIONS @@ -264,6 +264,9 @@ Enable support for Pascal-style strings .IP \fB\-fms\-extensions\fR 4 .IX Item -fms-extensions Enable support for Microsoft extensions. +.IP \fB\-fmsc\-version=\fR 4 +.IX Item -fmsc-version= +Set _MSC_VER. Defaults to 1300 on Windows. Not set otherwise. .IP \fB\-fborland\-extensions\fR 4 .IX Item -fborland-extensions Enable support for Borland extensions. Modified: head/usr.bin/clang/tblgen/tblgen.1 == --- head/usr.bin/clang/tblgen/tblgen.1 Sun Feb 27 01:32:10 2011 (r219077) +++ head/usr.bin/clang/tblgen/tblgen.1 Sun Feb 27 01:45:36 2011 (r219078) @@ -1,5 +1,5 @@ .\ $FreeBSD$ -.\ Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\ Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14) .\ .\ Standard preamble: .\ @@ -125,7 +125,7 @@ .\ .\ .IX Title TBLGEN 1 -.TH TBLGEN 1 2010-06-19 LLVM 2.8 LLVM Command Guide +.TH TBLGEN 1 2010-06-19 LLVM 2.9 LLVM Command Guide .\ For nroff, turn off justification. Always turn off hyphenation; it makes .\ way too many mistakes in technical documents. .if n .ad l ___ 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: r219079 - in head/sys/boot/i386: gptboot gptzfsboot zfsboot
Author: dim
Date: Sun Feb 27 02:06:09 2011
New Revision: 219079
URL: http://svn.freebsd.org/changeset/base/219079
Log:
Clang's integrated assembler can now handle sys/boot/i386/boot2/sio.S.
It used to choke on the notation inb (%dx),%al for inb %dx,%al; GNU
as accepts both forms. Which notation is more 'correct' is an open
question. :)
Modified:
head/sys/boot/i386/gptboot/Makefile
head/sys/boot/i386/gptzfsboot/Makefile
head/sys/boot/i386/zfsboot/Makefile
Modified: head/sys/boot/i386/gptboot/Makefile
==
--- head/sys/boot/i386/gptboot/Makefile Sun Feb 27 01:45:36 2011
(r219078)
+++ head/sys/boot/i386/gptboot/Makefile Sun Feb 27 02:06:09 2011
(r219079)
@@ -44,8 +44,6 @@ CFLAGS= -DBOOTPROG=\gptboot\ \
.if ${CC:T:Mclang} == clang
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS+= ${.IMPSRC:T:Mgptldr.S:C/^.+$/-no-integrated-as/}
-# XXX: clang integrated-as doesn't grok some 16-bit instructions yet
-CFLAGS+= ${.IMPSRC:T:Msio.S:C/^.+$/-no-integrated-as/}
.endif
LDFLAGS=-static -N --gc-sections
Modified: head/sys/boot/i386/gptzfsboot/Makefile
==
--- head/sys/boot/i386/gptzfsboot/Makefile Sun Feb 27 01:45:36 2011
(r219078)
+++ head/sys/boot/i386/gptzfsboot/Makefile Sun Feb 27 02:06:09 2011
(r219079)
@@ -41,8 +41,6 @@ CFLAGS= -DBOOTPROG=\gptzfsboot\ \
.if ${CC:T:Mclang} == clang
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS+= ${.IMPSRC:T:Mgptldr.S:C/^.+$/-no-integrated-as/}
-# XXX: clang integrated-as doesn't grok some 16-bit instructions yet
-CFLAGS+= ${.IMPSRC:T:Msio.S:C/^.+$/-no-integrated-as/}
.endif
LDFLAGS=-static -N --gc-sections
Modified: head/sys/boot/i386/zfsboot/Makefile
==
--- head/sys/boot/i386/zfsboot/Makefile Sun Feb 27 01:45:36 2011
(r219078)
+++ head/sys/boot/i386/zfsboot/Makefile Sun Feb 27 02:06:09 2011
(r219079)
@@ -41,8 +41,6 @@ CFLAGS= -DBOOTPROG=\zfsboot\ \
-Winline --param max-inline-insns-single=100
.if ${CC:T:Mclang} == clang
-# XXX: clang integrated-as doesn't grok some 16-bit instructions yet
-CFLAGS+= ${.IMPSRC:T:Msio.S:C/^.+$/-no-integrated-as/}
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS+= ${.IMPSRC:T:Mzfsldr.S:C/^.+$/-no-integrated-as/}
.endif
___
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: r219079 - in head/sys/boot/i386: gptboot gptzfsboot zfsboot
On Sun, 27 Feb 2011, Dimitry Andric wrote: Log: Clang's integrated assembler can now handle sys/boot/i386/boot2/sio.S. It used to choke on the notation inb (%dx),%al for inb %dx,%al; GNU as accepts both forms. Which notation is more 'correct' is an open question. :) Nah, the former is just a syntax error since %dx is not dereferenced :-). It is a syntax error at the design level that parentheses are used for indirection. In better assembler syntaxes like Intel/Microsoft's one for x86 and Motorola's one for 6809, brackets are used for indirections so parentheses are not context-dependent. Then extra parentheses around expressions can have no effect. But dx isn't an expression, so (dx) should still be a syntax error. I think it is in I/M syntax but I can't test that easily. It is a syntax error in my x86/6809 assembler. My assembler doesn't check, but emits a diagnostic for this :-). (My assembler wants brackets for indirection, but it has an option to to implement some bugs including use of parentheses for indirection.) Bruce ___ 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
