diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/aic7xxx/aicasm/aicasm.c | 7 | ||||
| -rw-r--r-- | sys/dev/cx/machdep.h | 2 | ||||
| -rw-r--r-- | sys/dev/ichsmb/ichsmb.c | 2 | ||||
| -rw-r--r-- | sys/dev/iir/iir.h | 2 | ||||
| -rw-r--r-- | sys/dev/isp/ispvar.h | 2 | ||||
| -rw-r--r-- | sys/dev/mcd/mcdreg.h | 8 | ||||
| -rw-r--r-- | sys/dev/mpt/mpilib/mpi_type.h | 2 | ||||
| -rw-r--r-- | sys/dev/scd/scdreg.h | 4 |
8 files changed, 16 insertions, 13 deletions
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c index cdf84e9..0c780f9 100644 --- a/sys/dev/aic7xxx/aicasm/aicasm.c +++ b/sys/dev/aic7xxx/aicasm/aicasm.c @@ -143,7 +143,7 @@ main(int argc, char *argv[]) yydebug = 0; mmdebug = 0; #endif - while ((ch = getopt(argc, argv, "d:i:l:n:o:p:r:I:")) != -1) { + while ((ch = getopt(argc, argv, "d:i:l:n:o:p:r:I:X")) != -1) { switch(ch) { case 'd': #if DEBUG @@ -244,6 +244,9 @@ main(int argc, char *argv[]) } break; } + case 'X': + /* icc version of -nostdinc */ + break; case '?': default: usage(); @@ -309,7 +312,7 @@ usage() { (void)fprintf(stderr, -"usage: %-16s [-nostdinc] [-I-] [-I directory] [-o output_file]\n" +"usage: %-16s [-nostdinc|-X] [-I-] [-I directory] [-o output_file]\n" " [-r register_output_file [-p register_diag_file -i includefile]]\n" " [-l program_list_file]\n" " input_file\n", appname); diff --git a/sys/dev/cx/machdep.h b/sys/dev/cx/machdep.h index b88e900..2346925 100644 --- a/sys/dev/cx/machdep.h +++ b/sys/dev/cx/machdep.h @@ -84,7 +84,7 @@ #endif #ifndef inline -# if __GNUC__ >= 2 +# if __GNUC__ >= 2 || defined(__INTEL_COMPILER) # define inline __inline__ # else # define inline /**/ diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c index d92e23e..0d8dd59 100644 --- a/sys/dev/ichsmb/ichsmb.c +++ b/sys/dev/ichsmb/ichsmb.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); * Enable debugging by defining ICHSMB_DEBUG to a non-zero value. */ #define ICHSMB_DEBUG 0 -#if ICHSMB_DEBUG != 0 && defined(__GNUC__) +#if ICHSMB_DEBUG != 0 && (defined(__GNUC__) || defined(__INTEL_COMPILER)) #define DBG(fmt, args...) \ do { log(LOG_DEBUG, "%s: " fmt, __func__ , ## args); } while (0) #else diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h index 5ce705d..38c29bf 100644 --- a/sys/dev/iir/iir.h +++ b/sys/dev/iir/iir.h @@ -697,7 +697,7 @@ void iir_free(struct gdt_softc *); void iir_attach(struct gdt_softc *); void iir_intr(void *arg); -#ifdef __GNUC__ +#if defined( __GNUC__) || defined(__INTEL_COMPILER) /* These all require correctly aligned buffers */ static __inline__ void gdt_enc16(u_int8_t *, u_int16_t); static __inline__ void gdt_enc32(u_int8_t *, u_int32_t); diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h index f44c24a..6cd11a7 100644 --- a/sys/dev/isp/ispvar.h +++ b/sys/dev/isp/ispvar.h @@ -753,7 +753,7 @@ int isp_async(struct ispsoftc *, ispasync_t, void *); /* * Platform Dependent Error and Debug Printout */ -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) void isp_prt(struct ispsoftc *, int level, const char *, ...) __attribute__((__format__(__printf__,3,4))); #else diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h index 6d542af..cc8a3ab 100644 --- a/sys/dev/mcd/mcdreg.h +++ b/sys/dev/mcd/mcdreg.h @@ -47,8 +47,8 @@ #ifndef MCD_H #define MCD_H -#ifdef __GNUC__ -#if __GNUC__ >= 2 +#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#if __GNUC__ >= 2 || defined(__INTEL_COMPILER) #pragma pack(1) #endif #endif @@ -222,8 +222,8 @@ struct mcd_rawsector { u_char ecc_bits[280]; }; -#ifdef __GNUC__ -#if __GNUC__ >= 2 +#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#if __GNUC__ >= 2 || defined(__INTEL_COMPILER) #pragma pack(4) #endif #endif diff --git a/sys/dev/mpt/mpilib/mpi_type.h b/sys/dev/mpt/mpilib/mpi_type.h index 040cf96..becf1a0 100644 --- a/sys/dev/mpt/mpilib/mpi_type.h +++ b/sys/dev/mpt/mpilib/mpi_type.h @@ -68,7 +68,7 @@ typedef unsigned char U8; typedef signed short S16; typedef unsigned short U16; -#if defined(unix) || defined(__arm) || defined(ALPHA) || defined(__GNUC__) +#if defined(unix) || defined(__arm) || defined(ALPHA) || defined(__GNUC__) || defined(__INTEL_COMPILER) typedef signed int S32; typedef unsigned int U32; diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h index bbfeefd..38e2293 100644 --- a/sys/dev/scd/scdreg.h +++ b/sys/dev/scd/scdreg.h @@ -32,8 +32,8 @@ #ifndef SCD_H #define SCD_H -#ifdef __GNUC__ -#if __GNUC__ >= 2 +#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#if __GNUC__ >= 2 || defined(__INTEL_COMPILER) #pragma pack(1) #endif #endif |
