components/ntp/patches/20-nozs.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Wed, 10 Feb 2016 11:54:12 -0800
changeset 5434 9f55c805ce9d
parent 5221 e63c8f63ac44
permissions -rw-r--r--
PSARC/2013/188 Clang/LLVM 15777690 clang/llvm compiler infrastructure in Solaris 21851513 severe memory corruption in the LLVM command-line parsing module 22031298 toxic bugs in LLVM ilist/plist end up eliminating entire MachineBasicBlocks 22065707 LLVM SPARC assembler generator emits wrong ELF Section flags 22346218 LLVM's assembler printer on SPARC needs a lot of work 21870061 partial template specializations in CommandLine.h are buggy 21874261 the Google Test Harness doesn't know how to count threads in Solaris 21697459 memory corruption in LLVM IR Code Generator 21341968 llc on SPARC should not need to be passed -march=sparc or -march=sparcv9 21870103 TableGen makes incorrect assumptions about anonymous namespace instantiation 21870087 naming convention for the InputFile key is inconsistent across LLVM utilities 21870099 128 bytes for a filesystem path is definitely not enough 21870067 lli makes incorrect assumptions about anonymous namespace instantiation order 21870065 llc makes incorrect assumptions about anonymous namespace instantiation order 21870283 llvm::sys::Process::GetArgumentVector should overload for std::vector 21874221 clang C++ does not properly initialize the C++ Standard Library's iostreams
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5221
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     1
The zs serial port driver has been removed from Solaris. The zs specific code
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     2
in the parsolaris.c and parsestreams.c file now fails to compile. This patch
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     3
simply replaces the "ifdef sun" sections of code with a fictious define to
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     4
prevent the zs code from being compiled. The removal of all driver specific
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     5
code has been reported to the community as bug 2988
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     6
(http://bugs.ntp.org/show_bug.cgi?id=2988) This patch may be removed when NTP
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     7
is upgraded to a version that has that bug resolved.
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     8
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     9
--- libparse/parsesolaris.c
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    10
+++ libparse/parsesolaris.c
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    11
@@ -804,7 +804,7 @@ init_linemon(
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    12
 
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    13
 		pprintf(DD_INSTALL, "init_linemon: driver is \"%s\"\n", dname);
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    14
 
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    15
-#ifdef sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    16
+#ifdef no_zs_sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    17
 		if (dname && !strcmp(dname, "zs"))
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    18
 		{
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    19
 			return init_zs_linemon(dq, q);
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    20
@@ -833,7 +833,7 @@ close_linemon(
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    21
 	{
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    22
 		register char *dname = q->q_qinfo->qi_minfo->mi_idname;
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    23
 
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    24
-#ifdef sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    25
+#ifdef no_zs_sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    26
 		if (dname && !strcmp(dname, "zs"))
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    27
 		{
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    28
 			close_zs_linemon(q, my_q);
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    29
@@ -845,7 +845,7 @@ close_linemon(
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    30
 	pprintf(DD_INSTALL, "close_linemon: cannot find driver name\n");
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    31
 }
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    32
 
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    33
-#ifdef sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    34
+#ifdef no_zs_sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    35
 #include <sys/tty.h>
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    36
 #include <sys/zsdev.h>
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    37
 #include <sys/ser_async.h>
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    38
--- libparse/parsestreams.c
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    39
+++ libparse/parsestreams.c
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    40
@@ -954,7 +954,7 @@ init_linemon(
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    41
 
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    42
 		parseprintf(DD_INSTALL, ("init_linemon: driver is \"%s\"\n", dname));
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    43
 
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    44
-#ifdef sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    45
+#ifdef no_zs_sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    46
 		if (dname && !Strcmp(dname, "zs"))
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    47
 		{
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    48
 			return init_zs_linemon(dq, q);
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    49
@@ -983,7 +983,7 @@ close_linemon(
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    50
 	{
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    51
 		register char *dname = q->q_qinfo->qi_minfo->mi_idname;
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    52
 
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    53
-#ifdef sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    54
+#ifdef no_zs_sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    55
 		if (dname && !Strcmp(dname, "zs"))
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    56
 		{
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    57
 			close_zs_linemon(q, my_q);
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    58
@@ -995,7 +995,7 @@ close_linemon(
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    59
 	parseprintf(DD_INSTALL, ("close_linemon: cannot find driver name\n"));
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    60
 }
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    61
 
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    62
-#ifdef sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    63
+#ifdef no_zs_sun
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    64
 
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    65
 #include <sundev/zsreg.h>
e63c8f63ac44 22310617 ntp doesn't build on s12-88 on sparc
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    66
 #include <sundev/zscom.h>