diff options
| -rw-r--r-- | usr/src/cmd/make/Makefile.com | 1 | ||||
| -rw-r--r-- | usr/src/cmd/make/include/mksh/defs.h | 1 | ||||
| -rw-r--r-- | usr/src/cmd/sort/common/initialize.c | 18 | ||||
| -rw-r--r-- | usr/src/test/util-tests/cmd/utiltest.ksh | 2 | ||||
| -rw-r--r-- | usr/src/tools/make/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c | 18 |
6 files changed, 29 insertions, 13 deletions
diff --git a/usr/src/cmd/make/Makefile.com b/usr/src/cmd/make/Makefile.com index dcc587439e..fc76730f2a 100644 --- a/usr/src/cmd/make/Makefile.com +++ b/usr/src/cmd/make/Makefile.com @@ -14,6 +14,7 @@ MAKE_INCLUDE= $(SRC)/cmd/make/include CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(MAKE_INCLUDE) $(MAKE_DEFS) +CCFLAGS += -_gcc4=-std=gnu++0x # So that it's set even for the libraries we build TEXT_DOMAIN = SUNW_OST_OSCMD diff --git a/usr/src/cmd/make/include/mksh/defs.h b/usr/src/cmd/make/include/mksh/defs.h index 9ad58c4e61..0cf3d837c8 100644 --- a/usr/src/cmd/make/include/mksh/defs.h +++ b/usr/src/cmd/make/include/mksh/defs.h @@ -804,6 +804,7 @@ public: // constructors iterator() : node(0) {} iterator(entry *node_) : node(node_) {} + iterator(const iterator&) = default; // dereference operator Name operator->() const { return node->name; } diff --git a/usr/src/cmd/sort/common/initialize.c b/usr/src/cmd/sort/common/initialize.c index 376fac5b04..bb0089ac72 100644 --- a/usr/src/cmd/sort/common/initialize.c +++ b/usr/src/cmd/sort/common/initialize.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "initialize.h" #ifndef TEXT_DOMAIN @@ -109,6 +107,18 @@ initialize_pre(sort_t *S) set_signal_jmp(); } +static int +strcoll_cmp(void *s1, void *s2, flag_t f __unused) +{ + return (strcoll(s1, s2)); +} + +static int +wcscoll_cmp(void *s1, void *s2, flag_t f __unused) +{ + return (wcscoll(s1, s2)); +} + void initialize_post(sort_t *S) { @@ -124,7 +134,7 @@ initialize_post(sort_t *S) field_initialize(S); if (S->m_single_byte_locale) { - S->m_compare_fn = (cmp_fcn_t)strcoll; + S->m_compare_fn = strcoll_cmp; S->m_coll_convert = field_convert; F = S->m_fields_head; @@ -153,7 +163,7 @@ initialize_post(sort_t *S) F = F->f_next; } } else { - S->m_compare_fn = (cmp_fcn_t)wcscoll; + S->m_compare_fn = wcscoll_cmp; S->m_coll_convert = field_convert_wide; F = S->m_fields_head; diff --git a/usr/src/test/util-tests/cmd/utiltest.ksh b/usr/src/test/util-tests/cmd/utiltest.ksh index 231415fba8..e701aeb854 100644 --- a/usr/src/test/util-tests/cmd/utiltest.ksh +++ b/usr/src/test/util-tests/cmd/utiltest.ksh @@ -17,6 +17,8 @@ # Copyright 2014 Garrett D'Amore <garrett@damore.org> # +export PATH="${PATH}:/opt/onbld/bin/$(uname -p)" +export LC_ALL="C" export MY_TESTS="/opt/util-tests" runner="/opt/test-runner/bin/run" diff --git a/usr/src/tools/make/Makefile.com b/usr/src/tools/make/Makefile.com index 97c32780bf..34074bb00a 100644 --- a/usr/src/tools/make/Makefile.com +++ b/usr/src/tools/make/Makefile.com @@ -17,5 +17,5 @@ CC = $(NATIVECC) CCC = $(NATIVECCC) CFLAGS = $(NATIVE_CFLAGS) CFLAGS += $(CCVERBOSE) -CCFLAGS = $(NATIVE_CCFLAGS) +CCFLAGS = $(NATIVE_CCFLAGS) -_gcc4=-std=gnu++0x CPPFLAGS = -I$(MAKE_INCLUDE) $(MAKE_DEFS) diff --git a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c index a786bbb051..e458c61168 100644 --- a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c +++ b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c @@ -14898,10 +14898,12 @@ mptsas_update_hashtab(struct mptsas *mpt) rval = mptsas_get_target_device_info(mpt, page_address, &dev_handle, &ptgt); if ((rval == DEV_INFO_FAIL_PAGE0) || - (rval == DEV_INFO_FAIL_ALLOC) || - (rval == DEV_INFO_FAIL_GUID)) { + (rval == DEV_INFO_FAIL_ALLOC)) { break; } + if (rval == DEV_INFO_FAIL_GUID) { + continue; + } mpt->m_dev_handle = dev_handle; } @@ -16601,12 +16603,12 @@ mptsas_phy_to_tgt(mptsas_t *mpt, mptsas_phymask_t phymask, uint8_t phy) rval = mptsas_get_target_device_info(mpt, page_address, &cur_handle, &ptgt); if ((rval == DEV_INFO_FAIL_PAGE0) || - (rval == DEV_INFO_FAIL_ALLOC) || - (rval == DEV_INFO_FAIL_GUID)) { + (rval == DEV_INFO_FAIL_ALLOC)) { break; } if ((rval == DEV_INFO_WRONG_DEVICE_TYPE) || - (rval == DEV_INFO_PHYS_DISK)) { + (rval == DEV_INFO_PHYS_DISK) || + (rval == DEV_INFO_FAIL_GUID)) { continue; } mpt->m_dev_handle = cur_handle; @@ -16671,13 +16673,13 @@ mptsas_wwid_to_ptgt(mptsas_t *mpt, mptsas_phymask_t phymask, uint64_t wwid) rval = mptsas_get_target_device_info(mpt, page_address, &cur_handle, &tmp_tgt); if ((rval == DEV_INFO_FAIL_PAGE0) || - (rval == DEV_INFO_FAIL_ALLOC) || - (rval == DEV_INFO_FAIL_GUID)) { + (rval == DEV_INFO_FAIL_ALLOC)) { tmp_tgt = NULL; break; } if ((rval == DEV_INFO_WRONG_DEVICE_TYPE) || - (rval == DEV_INFO_PHYS_DISK)) { + (rval == DEV_INFO_PHYS_DISK) || + (rval == DEV_INFO_FAIL_GUID)) { continue; } mpt->m_dev_handle = cur_handle; |