diff options
Diffstat (limited to 'uts')
| -rw-r--r-- | uts/debian/changelog | 3 | ||||
| -rw-r--r-- | uts/debian/control | 3 | ||||
| -rw-r--r-- | uts/debian/patches/series | 1 | ||||
| -rw-r--r-- | uts/debian/patches/uts-gcc48-warnings.patch | 63 |
4 files changed, 69 insertions, 1 deletions
diff --git a/uts/debian/changelog b/uts/debian/changelog index cde2798..5e179ea 100644 --- a/uts/debian/changelog +++ b/uts/debian/changelog @@ -11,6 +11,9 @@ uts (4.3+3) UNRELEASED; urgency=medium - Install usr/src/uts/common/io/*.h to usr/include/illumos/io - Install usr/src/uts/common/inet/sctp/*.h to usr/include/illumos/inet/sctp - Install usr/src/uts/common/sys/cmt.h to usr/include/sys + * Build with gcc 4.8: + - Added uts-gcc48-warnings.patch + - Build depends gcc (>= 4:4.8.2) -- Igor Pashev <pashev.igor@gmail.com> Sat, 12 Apr 2014 16:21:39 +0400 diff --git a/uts/debian/control b/uts/debian/control index 0a29ccd..beac786 100644 --- a/uts/debian/control +++ b/uts/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper, dh-illumos, illumos-source-4.3, + gcc (>= 4:4.8.2), quilt, sunmake, sgs-yacc, @@ -13,7 +14,7 @@ Build-Depends: # Only headers, see # usr/src/uts/common/io/tpm/tpm.c libtspi-dev, -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Homepage: http://illumos.org/ Package: illumos-kernel diff --git a/uts/debian/patches/series b/uts/debian/patches/series index 3ee9426..9542875 100644 --- a/uts/debian/patches/series +++ b/uts/debian/patches/series @@ -60,3 +60,4 @@ illumos-4653.patch illumos-4679-intel-erratum-BT81.patch illumos-4682.patch sys_ioctl_h-bsd-comp.patch +uts-gcc48-warnings.patch diff --git a/uts/debian/patches/uts-gcc48-warnings.patch b/uts/debian/patches/uts-gcc48-warnings.patch new file mode 100644 index 0000000..97f52a4 --- /dev/null +++ b/uts/debian/patches/uts-gcc48-warnings.patch @@ -0,0 +1,63 @@ +Description: Fix some gcc 4.8 warnings: + There is UB, so disable aggressive loop optimizations. + Disable some nosy warnings. + Make sure local vars are initialized. +Index: uts/usr/src/uts/Makefile.uts +=================================================================== +--- uts.orig/usr/src/uts/Makefile.uts 2014-04-23 22:33:30.990872931 +0400 ++++ uts/usr/src/uts/Makefile.uts 2014-04-24 17:15:21.832067305 +0400 +@@ -225,6 +225,8 @@ + CERRWARN += -_gcc=-Wno-unknown-pragmas + CERRWARN += -_gcc=-Wno-unused-parameter + CERRWARN += -_gcc=-Wno-missing-field-initializers ++CERRWARN += -_gcc=-Wno-format-security ++CERRWARN += -_gcc=-Wno-unused-but-set-parameter + + # DEBUG v. -nd make for frequent unused variables, empty conditions, etc. in + # -nd builds +@@ -245,6 +247,7 @@ + CFLAGS_uts += $(EXTRA_CFLAGS) + CFLAGS_uts += $(CSOURCEDEBUGFLAGS) + CFLAGS_uts += $(CUSERFLAGS) ++CFLAGS_uts += -_gcc=-fno-aggressive-loop-optimizations + + # + # Declare that $(OBJECTS) and $(LINTS) can be compiled in parallel. +Index: uts/usr/src/uts/common/io/fibre-channel/ulp/fcip.c +=================================================================== +--- uts.orig/usr/src/uts/common/io/fibre-channel/ulp/fcip.c 2014-04-24 17:10:07.631149096 +0400 ++++ uts/usr/src/uts/common/io/fibre-channel/ulp/fcip.c 2014-04-24 22:31:53.979112348 +0400 +@@ -4691,6 +4691,10 @@ + tnf_string, msg, "enter")); + mutex_enter(&fptr->fcip_mutex); + ++ fptr->fcip_ub_nbufs = fcip_ub_nbufs; ++ /* Fix gcc 4.8 warning: tok_buf_size maybe uninitialized. */ ++ tok_buf_size = sizeof (*fptr->fcip_ub_tokens) * fcip_ub_nbufs; ++ + /* + * setup mac address for this port. Don't be too worried if + * the WWN is zero, there is probably nothing attached to +@@ -4717,8 +4721,6 @@ + /* + * Allocate unsolicited buffers + */ +- fptr->fcip_ub_nbufs = fcip_ub_nbufs; +- tok_buf_size = sizeof (*fptr->fcip_ub_tokens) * fcip_ub_nbufs; + + FCIP_TNF_PROBE_2((fcip_init_port, "fcip io", /* CSTYLED */, + tnf_string, msg, "debug", +Index: uts/usr/src/uts/common/io/hotplug/pcihp/pcihp.c +=================================================================== +--- uts.orig/usr/src/uts/common/io/hotplug/pcihp/pcihp.c 2014-03-01 16:18:30.000000000 +0400 ++++ uts/usr/src/uts/common/io/hotplug/pcihp/pcihp.c 2014-04-24 23:21:46.494253046 +0400 +@@ -3205,7 +3205,8 @@ + int kmflag) + { + struct pcihp_slotinfo *slotinfop; +- int pci_dev, rc, event_serviced = 0; ++ int pci_dev, event_serviced = 0; ++ int rc = 0; + + /* + * Handle ENUM# condition for the "favorite" slot first. |