diff --git a/src/conf.h b/src/conf.h index 65ccee02..92ecf5bf 100644 --- a/src/conf.h +++ b/src/conf.h @@ -303,8 +303,8 @@ #undef __attribute_packed #if (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE) -# if (0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386)) -# define __attribute_packed +# if (ACC_ARCH_I386) && (ACC_CC_INTELC && (__INTEL_COMPILER < 800)) +# elif (0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386)) # else # define __attribute_packed __attribute__((__packed__,__aligned__(1))) # endif diff --git a/src/miniacc.h b/src/miniacc.h index 55c3180d..e9f1bfbe 100644 --- a/src/miniacc.h +++ b/src/miniacc.h @@ -38,7 +38,7 @@ #ifndef __ACC_H_INCLUDED #define __ACC_H_INCLUDED 1 -#define ACC_VERSION 20070112L +#define ACC_VERSION 20070113L #if defined(__CYGWIN32__) && !defined(__CYGWIN__) # define __CYGWIN__ __CYGWIN32__ #endif @@ -1302,7 +1302,7 @@ extern "C" { #elif !defined(ACC_ABI_BIG_ENDIAN) && !defined(ACC_ABI_LITTLE_ENDIAN) #if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP) # define ACC_ABI_BIG_ENDIAN 1 -#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430) +#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430) # define ACC_ABI_LITTLE_ENDIAN 1 #elif (ACC_ARCH_M68K || ACC_ARCH_S390) # define ACC_ABI_BIG_ENDIAN 1 diff --git a/src/util.cpp b/src/util.cpp index 3cb9b8a1..99f1c61b 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -582,11 +582,6 @@ extern "C" { int dup(int fd) { UNUSED(fd); return -1; } #endif -// FIXME - quick hack for wrt54gl -#if 1 && (ACC_ARCH_MIPS) && (ACC_OS_POSIX_LINUX) && (ACC_LIBC_UCLIBC) -clock_t clock(void) { return 0; } -#endif - #if defined(__DJGPP__) int _is_executable(const char *, int, const char *) {