[illumos-gate merge]

commit 7f11fd00fc23e2af7ae21cc8837a2b86380dcfa7
    6648 illumos build should be explicit about C standards
commit eae164eb03cbb004dcf9154f36352e62f693eb6c
    6645 sgsmsg relies on undefined behaviour of loop-scoped variables
commit a7317ceb814150d472383df8b987d7e3282ea15b
    6639 uhci_qh walker contains whacky boolean logic
commit 1665390b481087ca2aaff06a502c62b3ee91d530
    6638 ::pfiles walks out of bounds on array of vnode types
commit d456640d8a14f0ba35a7ec232f0ce9ebd34541cb
    6647 MANSECTS should not require a trailing comma
commit 0803e914d3511e82e0b1cc0c888af873a4aaa7d1
    6603 zfeature_register() should verify ZFEATURE_FLAG_PER_DATASET implies SPA_FEATURE_EXTENSIBLE_DATASET
commit 22b6687e7850d421c61bf433a388b7db306aca00
    6586 Whitespace inconsistencies in the spa feature dependency arrays in zfeature_common.c
commit 892586e8a147c02d7f4053cc405229a13e796928
    6585 sha512, skein, and edonr have an unenforced dependency on extensible dataset
commit 971640e6aa954c91b0706543741aa4570299f4d7
    6541 Pool feature-flag check defeated if "verify" is included in the dedup property value
commit bd94aa560898627952fba8f09dda95c4492e7d9e
    6644 MBOOT_SCAN_SIZE in usr/src/cmd/boot/common/mboot_extra.h is wrong

2 files changed, 12 insertions, 7 deletions

diff --git a/usr/src/grub/grub-0.97/Makefile.solaris.defs b/usr/src/grub/grub-0.97/Makefile.solaris.defs
index 9a9455ea76..e66071b064 100644
--- a/usr/src/grub/grub-0.97/Makefile.solaris.defs
+++ b/usr/src/grub/grub-0.97/Makefile.solaris.defs
@@ -42,7 +42,7 @@ OPTION_DOCS	= $(POUND_SIGN)
 OPTION_FS	= $(POUND_SIGN)
 
 
-BASE_CFLAGS	= -B$(GCC_ROOT)/bin/ -g $(CPPFLAGS) $(OPTFLAGS)
+BASE_CFLAGS	= -B$(GCC_ROOT)/bin/ -g $(CPPFLAGS) $(OPTFLAGS) -std=gnu89
 BASE_CCASFLAGS	= -B$(GCC_ROOT)/bin/ -g $(CPPFLAGS) $(OPTFLAGS)
 BASE_LDFLAGS	=
 
diff --git a/usr/src/grub/grub-0.97/netboot/io.h b/usr/src/grub/grub-0.97/netboot/io.h
index a6e4880e3f..7593419e32 100644
--- a/usr/src/grub/grub-0.97/netboot/io.h
+++ b/usr/src/grub/grub-0.97/netboot/io.h
@@ -1,7 +1,8 @@
+#include <sys/ccompile.h>
+
 #ifndef	IO_H
 #define IO_H
 
-
 /* Amount of relocation etherboot is experiencing */
 extern unsigned long virt_offset;
 
@@ -107,7 +108,7 @@ static inline void iounmap(void *virt_addr __unused)
  * Some non intel clones support out of order store. wmb() ceases to be a
  * nop for these.
  */
- 
+
 #define mb() 	__asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory")
 #define rmb()	mb()
 #define wmb()	mb();
@@ -119,7 +120,8 @@ static inline void iounmap(void *virt_addr __unused)
 
 #define __OUT1(s,x) \
 extern void __out##s(unsigned x value, unsigned short port); \
-extern inline void __out##s(unsigned x value, unsigned short port) {
+extern __GNU_INLINE \
+void __out##s(unsigned x value, unsigned short port) {
 
 #define __OUT2(s,s1,s2) \
 __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
@@ -132,7 +134,8 @@ __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
 
 #define __IN1(s,x) \
 extern unsigned x __in##s(unsigned short port); \
-extern inline unsigned x __in##s(unsigned short port) { unsigned x _v;
+extern __GNU_INLINE \
+unsigned x __in##s(unsigned short port) { unsigned x _v;
 
 #define __IN2(s,s1,s2) \
 __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
@@ -145,13 +148,15 @@ __IN1(s##c_p,x) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; r
 
 #define __INS(s) \
 extern void ins##s(unsigned short port, void * addr, unsigned long count); \
-extern inline void ins##s(unsigned short port, void * addr, unsigned long count) \
+extern __GNU_INLINE \
+void ins##s(unsigned short port, void * addr, unsigned long count)	\
 { __asm__ __volatile__ ("cld ; rep ; ins" #s \
 : "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
 
 #define __OUTS(s) \
 extern void outs##s(unsigned short port, const void * addr, unsigned long  count); \
-extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
+extern __GNU_INLINE \
+void outs##s(unsigned short port, const void * addr, unsigned long count) \
 { __asm__ __volatile__ ("cld ; rep ; outs" #s \
 : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }