svn commit: r268031 - stable/9/share/man/man4

2014-06-30 Thread Marius Strobl
Author: marius
Date: Mon Jun 30 09:38:09 2014
New Revision: 268031
URL: http://svnweb.freebsd.org/changeset/base/268031

Log:
  MFC: r267967, r267968
  
  - SC_NO_SYSMOUSE isn't currently supported by vt(4), so nuke it from vt.4.
  - vt_vga(4) is a driver rather than a function so reference it accordingly.
  - Uncomment HISTORY section given that vt(4) will first appear in 9.3.
  
  Reviewed by:  emaste (modulo last part)
  Sponsored by: Bally Wulff Games & Entertainment GmbH

Modified:
  stable/9/share/man/man4/vt.4
Directory Properties:
  stable/9/share/man/man4/   (props changed)

Modified: stable/9/share/man/man4/vt.4
==
--- stable/9/share/man/man4/vt.4Mon Jun 30 05:33:52 2014
(r268030)
+++ stable/9/share/man/man4/vt.4Mon Jun 30 09:38:09 2014
(r268031)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 9, 2014
+.Dd June 27, 2014
 .Dt "VIRTUAL TERMINALS" 4
 .Os
 .Sh NAME
@@ -37,7 +37,6 @@
 .Cd "options VT_FB_DEFAULT_WIDTH=X"
 .Cd "options VT_FB_DEFAULT_HEIGHT=Y"
 .Cd "options SC_NO_CUTPASTE"
-.Cd "options SC_NO_SYSMOUSE"
 .Cd "device vt"
 .Pp
 In
@@ -139,7 +138,6 @@ version.
 .It Dv VT_TWOBUTTON_MOUSE Ta Dv SC_TWOBUTTON_MOUSE
 .It Dv VT_MAXWINDOWS Ta Dv MAXCONS
 .It none Ta Dv SC_NO_CUTPASTE
-.It none Ta Dv SC_NO_SYSMOUSE
 .El
 .Sh START-UP OPERATION WITH X86 BIOS SYSTEMS
 The computer BIOS starts in text mode, and
@@ -153,13 +151,13 @@ is set, the system remains in text mode.
 Otherwise,
 .Nm
 switches to 640x480x16 VGA mode using
-.Fn vt_vga .
+.Xr vt_vga 4 .
 If a KMS
 .Pq Kernel Mode Switching
 video driver is available, the display is switched to high resolution
 and the KMS driver takes over.
 When a KMS driver is not available,
-.Fn vt_vga
+.Xr vt_vga 4
 remains active.
 .Sh LOADER TUNABLES
 These settings can be entered at the
@@ -201,12 +199,11 @@ terminal initialization information
 .Xr kbdmux 8 ,
 .Xr kldload 8 ,
 .Xr moused 8
-.\" WB: to be uncommented when an actual release contains vt(4)
-.\" .Sh HISTORY
-.\" The
-.\" Nm
-.\" driver first appeared in
-.\" .Fx 9.3 .
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 9.3 .
 .Sh AUTHORS
 .An -nosplit
 The
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"


svn commit: r268041 - stable/9/lib/libc/stdtime

2014-06-30 Thread Pedro F. Giffuni
Author: pfg
Date: Mon Jun 30 14:12:32 2014
New Revision: 268041
URL: http://svnweb.freebsd.org/changeset/base/268041

Log:
  MFC   r267544:
  
  Update license to strptime(3) implementation.
  
  Our strptime(3) implementation was the base for the illumos
  implementation and after contacting the author, Kevin Rudy
  stated the code is under a 2-Clause BSD License [1]
  
  After reviewing our local changes to the file in question,
  the FreeBSD Foundation has agreed that their contributions
  to this file are not required to carry clause 3 or 4 so
  the file can be relicensed as in Illumos [2].
  
  References:
  
  [1] https://www.illumos.org/issues/357
  [2] Illumos Revision: 13222:02526851ba75
  
  Approved: core (jhb)
  Approved: FreeBSD Foundation (emaste)

Modified:
  stable/9/lib/libc/stdtime/strptime.c
Directory Properties:
  stable/9/lib/libc/   (props changed)
  stable/9/lib/libc/stdtime/   (props changed)

Modified: stable/9/lib/libc/stdtime/strptime.c
==
--- stable/9/lib/libc/stdtime/strptime.cMon Jun 30 12:50:09 2014
(r268040)
+++ stable/9/lib/libc/stdtime/strptime.cMon Jun 30 14:12:32 2014
(r268041)
@@ -1,25 +1,4 @@
-/*
- * Powerdog Industries kindly requests feedback from anyone modifying
- * this function:
- *
- * Date: Thu, 05 Jun 1997 23:17:17 -0400  
- * From: Kevin Ruddy 
- * To: James FitzGibbon 
- * Subject: Re: Use of your strptime(3) code (fwd)
- * 
- * The reason for the "no mod" clause was so that modifications would
- * come back and we could integrate them and reissue so that a wider 
- * audience could use it (thereby spreading the wealth).  This has   
- * made it possible to get strptime to work on many operating systems.
- * I'm not sure why that's "plain unacceptable" to the FreeBSD team.
- * 
- * Anyway, you can change it to "with or without modification" as
- * you see fit.  Enjoy.  
- * 
- * Kevin Ruddy
- * Powerdog Industries, Inc.
- */
-/*
+/*-
  * Copyright (c) 1994 Powerdog Industries.  All rights reserved.
  *
  * Copyright (c) 2011 The FreeBSD Foundation
@@ -36,12 +15,6 @@
  *notice, this list of conditions and the following disclaimer
  *in the documentation and/or other materials provided with the
  *distribution.
- * 3. All advertising materials mentioning features or use of this
- *software must display the following acknowledgement:
- *  This product includes software developed by Powerdog Industries.
- * 4. The name of Powerdog Industries may not be used to endorse or
- *promote products derived from this software without specific prior
- *written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -54,6 +27,10 @@
  * 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.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * official policies, either expressed or implied, of Powerdog Industries.
  */
 
 #include 
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"


svn commit: r268042 - stable/9/lib/libc/stdtime

2014-06-30 Thread Pedro F. Giffuni
Author: pfg
Date: Mon Jun 30 14:15:16 2014
New Revision: 268042
URL: http://svnweb.freebsd.org/changeset/base/268042

Log:
  MFC   r267601:
  
  stdtime: style(9) fixes.
  
  Obtained from:illumos

Modified:
  stable/9/lib/libc/stdtime/strftime.c
  stable/9/lib/libc/stdtime/strptime.c
  stable/9/lib/libc/stdtime/timelocal.c
Directory Properties:
  stable/9/lib/libc/   (props changed)
  stable/9/lib/libc/stdtime/   (props changed)

Modified: stable/9/lib/libc/stdtime/strftime.c
==
--- stable/9/lib/libc/stdtime/strftime.cMon Jun 30 14:12:32 2014
(r268041)
+++ stable/9/lib/libc/stdtime/strftime.cMon Jun 30 14:15:16 2014
(r268042)
@@ -24,9 +24,9 @@
 #ifndef NOID
 static const char  elsieid[] = "@(#)strftime.3 8.3";
 /*
-** Based on the UCB version with the ID appearing below.
-** This is ANSIish only when "multibyte character == plain character".
-*/
+ * Based on the UCB version with the ID appearing below.
+ * This is ANSIish only when "multibyte character == plain character".
+ */
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -57,32 +57,32 @@ extern char *   tzname[];
 #define YEAR_2000_NAME "CHECK_STRFTIME_FORMATS_FOR_TWO_DIGIT_YEARS"
 #endif /* !defined YEAR_2000_NAME */
 
-#define IN_NONE0
-#define IN_SOME1
-#define IN_THIS2
-#define IN_ALL 3
-
-#define PAD_DEFAULT0
-#define PAD_LESS   1
-#define PAD_SPACE  2
-#define PAD_ZERO   3
+#defineIN_NONE 0
+#defineIN_SOME 1
+#defineIN_THIS 2
+#defineIN_ALL  3
+
+#definePAD_DEFAULT 0
+#definePAD_LESS1
+#definePAD_SPACE   2
+#definePAD_ZERO3
 
 static const char* fmt_padding[][4] = {
/* DEFAULT, LESS,   SPACE,  ZERO */
-#define PAD_FMT_MONTHDAY   0
-#define PAD_FMT_HMS0
-#define PAD_FMT_CENTURY0
-#define PAD_FMT_SHORTYEAR  0
-#define PAD_FMT_MONTH  0
-#define PAD_FMT_WEEKOFYEAR 0
-#define PAD_FMT_DAYOFMONTH 0
+#definePAD_FMT_MONTHDAY0
+#definePAD_FMT_HMS 0
+#definePAD_FMT_CENTURY 0
+#definePAD_FMT_SHORTYEAR   0
+#definePAD_FMT_MONTH   0
+#definePAD_FMT_WEEKOFYEAR  0
+#definePAD_FMT_DAYOFMONTH  0
{ "%02d",   "%d",   "%2d",  "%02d" },
-#define PAD_FMT_SDAYOFMONTH1
-#define PAD_FMT_SHMS   1
+#definePAD_FMT_SDAYOFMONTH 1
+#definePAD_FMT_SHMS1
{ "%2d","%d",   "%2d",  "%02d" },
 #definePAD_FMT_DAYOFYEAR   2
{ "%03d",   "%d",   "%3d",  "%03d" },
-#define PAD_FMT_YEAR   3
+#definePAD_FMT_YEAR3
{ "%04d",   "%d",   "%4d",  "%04d" }
 };
 
@@ -114,7 +114,7 @@ strftime_l(char * __restrict s, size_t m
}
 #endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */
if (p == s + maxsize)
-   return 0;
+   return (0);
*p = '\0';
return p - s;
 }
@@ -176,12 +176,12 @@ label:
continue;
case 'C':
/*
-   ** %C used to do a...
-   **  _fmt("%a %b %e %X %Y", t);
-   ** ...whereas now POSIX 1003.2 calls for
-   ** something completely different.
-   ** (ado, 1993-05-24)
-   */
+* %C used to do a...
+*  _fmt("%a %b %e %X %Y", t);
+* ...whereas now POSIX 1003.2 calls for
+* something completely different.
+* (ado, 1993-05-24)
+*/
pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 0,
pt, ptlim);
continue;
@@ -210,17 +210,17 @@ label:
goto label;
case 'O':
/*
-   ** C99 locale modifiers.
-   ** The sequences
-   **  %Ec %EC %Ex %EX %Ey %EY
-   **  %Od %oe %OH %OI %Om %OM
-   **  %OS %Ou %OU %OV %Ow %OW %Oy
-   ** are supposed to provide alternate
-   ** representations.
-   **
-   ** FreeBSD extension
-   **  %OB
-   */
+* C99 locale modifiers.
+* The

svn commit: r268048 - stable/9/lib/libz

2014-06-30 Thread Xin LI
Author: delphij
Date: Mon Jun 30 16:32:49 2014
New Revision: 268048
URL: http://svnweb.freebsd.org/changeset/base/268048

Log:
  MFC r267378:
  
  Fix path for zlib examples, this have no runtime effect and was
  overlooked when I was doing zlib update.

Modified:
  stable/9/lib/libz/Makefile
Directory Properties:
  stable/9/lib/libz/   (props changed)

Modified: stable/9/lib/libz/Makefile
==
--- stable/9/lib/libz/Makefile  Mon Jun 30 16:31:28 2014(r268047)
+++ stable/9/lib/libz/Makefile  Mon Jun 30 16:32:49 2014(r268048)
@@ -55,6 +55,8 @@ CFLAGS+=  -DSYMBOL_VERSIONING
 
 INCS=  zconf.h zlib.h
 
+.PATH: ${.CURDIR}/test
+
 minigzip:  all minigzip.o
$(CC) -o minigzip minigzip.o -L. -lz
 
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"


svn commit: r268053 - stable/9/lib/libc/net

2014-06-30 Thread Hajimu UMEMOTO
Author: ume
Date: Mon Jun 30 17:03:32 2014
New Revision: 268053
URL: http://svnweb.freebsd.org/changeset/base/268053

Log:
  MFC r267800:
  Exclude IPv4 address from doing longest match.
  It prevented DNS based load balancing.

Modified:
  stable/9/lib/libc/net/getaddrinfo.c
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/net/getaddrinfo.c
==
--- stable/9/lib/libc/net/getaddrinfo.c Mon Jun 30 16:56:12 2014
(r268052)
+++ stable/9/lib/libc/net/getaddrinfo.c Mon Jun 30 17:03:32 2014
(r268053)
@@ -1007,7 +1007,8 @@ comp_dst(const void *arg1, const void *a
 * We compare the match length in a same AF only.
 */
if (dst1->aio_ai->ai_addr->sa_family ==
-   dst2->aio_ai->ai_addr->sa_family) {
+   dst2->aio_ai->ai_addr->sa_family &&
+   dst1->aio_ai->ai_addr->sa_family != AF_INET) {
if (dst1->aio_matchlen > dst2->aio_matchlen) {
return(-1);
}
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"


svn commit: r268054 - stable/9/sys/netinet6

2014-06-30 Thread Hajimu UMEMOTO
Author: ume
Date: Mon Jun 30 17:04:55 2014
New Revision: 268054
URL: http://svnweb.freebsd.org/changeset/base/268054

Log:
  MFC r267801: Make nd6_gctimer tunable.

Modified:
  stable/9/sys/netinet6/nd6.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet6/nd6.c
==
--- stable/9/sys/netinet6/nd6.c Mon Jun 30 17:03:32 2014(r268053)
+++ stable/9/sys/netinet6/nd6.c Mon Jun 30 17:04:55 2014(r268054)
@@ -2281,6 +2281,8 @@ SYSCTL_NODE(_net_inet6_icmp6, ICMPV6CTL_
CTLFLAG_RD, nd6_sysctl_prlist, "");
 SYSCTL_VNET_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MAXQLEN, nd6_maxqueuelen,
CTLFLAG_RW, &VNET_NAME(nd6_maxqueuelen), 1, "");
+SYSCTL_VNET_INT(_net_inet6_icmp6, OID_AUTO, nd6_gctimer,
+   CTLFLAG_RW, &VNET_NAME(nd6_gctimer), (60 * 60 * 24), "");
 
 static int
 nd6_sysctl_drlist(SYSCTL_HANDLER_ARGS)
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"


svn commit: r268062 - stable/9/sys/netgraph/bluetooth/socket

2014-06-30 Thread Mikolaj Golub
Author: trociny
Date: Mon Jun 30 19:47:26 2014
New Revision: 268062
URL: http://svnweb.freebsd.org/changeset/base/268062

Log:
  MFC r267336:
  
  PF_BLUETOOTH protocols: skip initialization of non-virtualized globals
  for non-default VNET instances.
  
  This fixes panic on a vnet initialization when ng_btsocket is loaded.

Modified:
  stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
  stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
  stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
==
--- stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.cMon Jun 
30 19:46:17 2014(r268061)
+++ stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.cMon Jun 
30 19:47:26 2014(r268062)
@@ -51,6 +51,9 @@
 #include 
 #include 
 #include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -728,6 +731,10 @@ ng_btsocket_hci_raw_init(void)
bitstr_t*f = NULL;
int  error = 0;
 
+   /* Skip initialization of globals for non-default instances. */
+   if (!IS_DEFAULT_VNET(curvnet))
+   return;
+
ng_btsocket_hci_raw_node = NULL;
ng_btsocket_hci_raw_debug_level = NG_BTSOCKET_WARN_LEVEL;
ng_btsocket_hci_raw_ioctl_timeout = 5;

Modified: stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
==
--- stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c  Mon Jun 30 
19:46:17 2014(r268061)
+++ stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c  Mon Jun 30 
19:47:26 2014(r268062)
@@ -1813,6 +1813,10 @@ ng_btsocket_l2cap_init(void)
 {
int error = 0;
 
+   /* Skip initialization of globals for non-default instances. */
+   if (!IS_DEFAULT_VNET(curvnet))
+   return;
+
ng_btsocket_l2cap_node = NULL;
ng_btsocket_l2cap_debug_level = NG_BTSOCKET_WARN_LEVEL;
 

Modified: stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
==
--- stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c  Mon Jun 
30 19:46:17 2014(r268061)
+++ stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c  Mon Jun 
30 19:47:26 2014(r268062)
@@ -50,6 +50,9 @@
 #include 
 #include 
 #include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -513,6 +516,10 @@ ng_btsocket_l2cap_raw_init(void)
 {
int error = 0;
 
+   /* Skip initialization of globals for non-default instances. */
+   if (!IS_DEFAULT_VNET(curvnet))
+   return;
+
ng_btsocket_l2cap_raw_node = NULL;
ng_btsocket_l2cap_raw_debug_level = NG_BTSOCKET_WARN_LEVEL;
ng_btsocket_l2cap_raw_ioctl_timeout = 5;

Modified: stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
==
--- stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Mon Jun 30 
19:46:17 2014(r268061)
+++ stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Mon Jun 30 
19:47:26 2014(r268062)
@@ -328,6 +328,11 @@ ng_btsocket_rfcomm_check_fcs(u_int8_t *d
 void
 ng_btsocket_rfcomm_init(void)
 {
+
+   /* Skip initialization of globals for non-default instances. */
+   if (!IS_DEFAULT_VNET(curvnet))
+   return;
+
ng_btsocket_rfcomm_debug_level = NG_BTSOCKET_WARN_LEVEL;
ng_btsocket_rfcomm_timo = 60;
 

Modified: stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
==
--- stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_sco.cMon Jun 30 
19:46:17 2014(r268061)
+++ stable/9/sys/netgraph/bluetooth/socket/ng_btsocket_sco.cMon Jun 30 
19:47:26 2014(r268062)
@@ -1107,6 +1107,10 @@ ng_btsocket_sco_init(void)
 {
int error = 0;
 
+   /* Skip initialization of globals for non-default instances. */
+   if (!IS_DEFAULT_VNET(curvnet))
+   return;
+
ng_btsocket_sco_node = NULL;
ng_btsocket_sco_debug_level = NG_BTSOCKET_WARN_LEVEL;
 
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"


svn commit: r268065 - in stable: 10/contrib/llvm/lib/Target/PowerPC 10/contrib/llvm/patches 9/contrib/llvm/lib/Target/PowerPC 9/contrib/llvm/patches

2014-06-30 Thread Dimitry Andric
Author: dim
Date: Mon Jun 30 20:26:30 2014
New Revision: 268065
URL: http://svnweb.freebsd.org/changeset/base/268065

Log:
  MFC r267981:
  
  Pull in r211627 from upstream llvm trunk (by Bill Schmidt):
  
[PPC64] Fix PR20071 (fctiduz generated for targets lacking that
instruction)
  
PR20071 identifies a problem in PowerPC's fast-isel implementation
for floating-point conversion to integer.  The fctiduz instruction
was added in Power ISA 2.06 (i.e., Power7 and later).  However, this
instruction is being generated regardless of which 64-bit PowerPC
target is selected.
  
The intent is for fast-isel to punt to DAG selection when this
instruction is not available.  This patch implements that change.
For testing purposes, the existing fast-isel-conversion.ll test adds
a RUN line for -mcpu=970 and tests for the expected code generation.
Additionally, the existing test fast-isel-conversion-p5.ll was found
to be incorrectly expecting the unavailable instruction to be
generated.  I've removed these test variants since we have adequate
coverage in fast-isel-conversion.ll.
  
  This is needed to compile clang with debug+asserts on older powerpc64
  and ppc970 targets.
  
  Requested by: jhibbits
  
  MFC r267982:
  
  Add the llvm patch for r267981.
  
  MFC r268003:
  
  Fix breakage after r267981.
  
  Pointy hat to:dim

Added:
  stable/9/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff
 - copied, changed from r267982, 
head/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff
Modified:
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)

Changes in other areas also in this revision:
Added:
  stable/10/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff
 - copied, changed from r267982, 
head/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff
Modified:
  stable/10/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp
==
--- stable/9/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cppMon Jun 30 
20:24:00 2014(r268064)
+++ stable/9/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cppMon Jun 30 
20:26:30 2014(r268065)
@@ -1026,6 +1026,10 @@ bool PPCFastISel::SelectFPToI(const Inst
   if (DstVT != MVT::i32 && DstVT != MVT::i64)
 return false;
 
+  // If we don't have FCTIDUZ and we need it, punt to SelectionDAG.
+  if (DstVT == MVT::i64 && !IsSigned && !PPCSubTarget.hasFPCVT())
+return false;
+
   Value *Src = I->getOperand(0);
   Type *SrcTy = Src->getType();
   if (!isTypeLegal(SrcTy, SrcVT))

Copied and modified: 
stable/9/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff 
(from r267982, 
head/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff)
==
--- head/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff   
Fri Jun 27 20:45:17 2014(r267982, copy source)
+++ 
stable/9/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff   
Mon Jun 30 20:26:30 2014(r268065)
@@ -32,7 +32,7 @@ Index: lib/Target/PowerPC/PPCFastISel.cp
  return false;
  
 +  // If we don't have FCTIDUZ and we need it, punt to SelectionDAG.
-+  if (DstVT == MVT::i64 && !IsSigned && !PPCSubTarget->hasFPCVT())
++  if (DstVT == MVT::i64 && !IsSigned && !PPCSubTarget.hasFPCVT())
 +return false;
 +
Value *Src = I->getOperand(0);
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"