author | Niveditha Rau <Niveditha.Rau@Oracle.COM> |
Fri, 08 Jul 2016 15:51:02 +0000 | |
changeset 6395 | 173e672843a0 |
parent 5455 | 7d4ee55b5053 |
permissions | -rw-r--r-- |
5455
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
1 |
Source: Internal |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
2 |
|
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
3 |
Info: This patch makes the changes necessary to support wanboot. |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
4 |
Mostly it removes floating point support. |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
5 |
|
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
6 |
Status: This patch is Solaris specific. This will not be sent upstream. |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
7 |
|
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
8 |
--- gnutls-3.4.6/gl/printf-args.c 2015-01-19 09:38:09.000000000 -0800 |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
9 |
+++ gnutls-3.4.6/gl/printf-args.c 2015-12-10 17:46:30.949444885 -0800 |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
10 |
@@ -73,12 +73,14 @@ |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
11 |
ap->a.a_ulonglongint = va_arg (args, unsigned long long int); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
12 |
break; |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
13 |
#endif |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
14 |
+#ifndef _BOOT |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
15 |
case TYPE_DOUBLE: |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
16 |
ap->a.a_double = va_arg (args, double); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
17 |
break; |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
18 |
case TYPE_LONGDOUBLE: |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
19 |
ap->a.a_longdouble = va_arg (args, long double); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
20 |
break; |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
21 |
+#endif /* !_BOOT */ |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
22 |
case TYPE_CHAR: |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
23 |
ap->a.a_char = va_arg (args, int); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
24 |
break; |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
25 |
--- gnutls-3.4.6/src/gl/timespec.h 2015-01-19 09:38:09.000000000 -0800 |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
26 |
+++ gnutls-3.4.6/src/gl/timespec.h 2015-12-10 17:47:59.802282095 -0800 |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
27 |
@@ -97,12 +97,14 @@ |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
28 |
struct timespec dtotimespec (double) |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
29 |
_GL_ATTRIBUTE_CONST; |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
30 |
|
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
31 |
+#ifndef _BOOT |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
32 |
/* Return an approximation to A, of type 'double'. */ |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
33 |
_GL_TIMESPEC_INLINE double |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
34 |
timespectod (struct timespec a) |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
35 |
{ |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
36 |
return a.tv_sec + a.tv_nsec / 1e9; |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
37 |
} |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
38 |
+#endif /* !_BOOT */ |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
39 |
|
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
40 |
void gettime (struct timespec *); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
41 |
int settime (struct timespec const *); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
42 |
--- gnutls-3.4.6/src/gl/printf-args.c 2015-01-19 09:38:09.000000000 -0800 |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
43 |
+++ gnutls-3.4.6/src/gl/printf-args.c 2015-12-10 17:51:12.619526033 -0800 |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
44 |
@@ -73,12 +73,14 @@ |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
45 |
ap->a.a_ulonglongint = va_arg (args, unsigned long long int); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
46 |
break; |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
47 |
#endif |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
48 |
+#ifndef _BOOT |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
49 |
case TYPE_DOUBLE: |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
50 |
ap->a.a_double = va_arg (args, double); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
51 |
break; |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
52 |
case TYPE_LONGDOUBLE: |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
53 |
ap->a.a_longdouble = va_arg (args, long double); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
54 |
break; |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
55 |
+#endif /* !_BOOT */ |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
56 |
case TYPE_CHAR: |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
57 |
ap->a.a_char = va_arg (args, int); |
7d4ee55b5053
PSARC 2015/566 WANBoot GRUB2 Userland libraries
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
58 |
break; |