Index: branches/Jief/i386/libsaio/spd.c =================================================================== --- branches/Jief/i386/libsaio/spd.c (revision 2272) +++ branches/Jief/i386/libsaio/spd.c (revision 2273) @@ -296,7 +296,7 @@ switch (slot->spd[SPD_MEMORY_TYPE]) { case SPD_MEMORY_TYPE_SDRAM_DDR2: - slot->ModuleSize = ((1 << (slot->spd[SPD_NUM_ROWS] & 0x0f) + (slot->spd[SPD_NUM_COLUMNS] & 0x0f) - 17) * + slot->ModuleSize = ((1 << ((slot->spd[SPD_NUM_ROWS] & 0x0f) + (slot->spd[SPD_NUM_COLUMNS] & 0x0f) - 17)) * ((slot->spd[SPD_NUM_DIMM_BANKS] & 0x7) + 1) * slot->spd[SPD_NUM_BANKS_PER_SDRAM]); break; Index: branches/Jief/i386/libsaio/cpu.h =================================================================== --- branches/Jief/i386/libsaio/cpu.h (revision 2272) +++ branches/Jief/i386/libsaio/cpu.h (revision 2273) @@ -159,7 +159,7 @@ ++count; __asm__ volatile( "inb $0x61,%0" - : "=q"(nmi_sc_val) /*:*/ /* no input */ /*:*/ /* no clobber */); + : "=a"(nmi_sc_val) /*:*/ /* no input */ /*:*/ /* no clobber */); } while( (nmi_sc_val & 0x20) == 0); return count; } Index: branches/Jief/i386/libsaio/msdos.c =================================================================== --- branches/Jief/i386/libsaio/msdos.c (revision 2272) +++ branches/Jief/i386/libsaio/msdos.c (revision 2273) @@ -721,7 +721,7 @@ *flags = kFileTypeFlat; // Calculate a fake timestamp using modification date and time values. - *time = (dirp->deMDate & 0x7FFF) << 16 + dirp->deMTime; + *time = ((dirp->deMDate & 0x7FFF) << 16) + dirp->deMTime; if (infoValid) *infoValid = 1; Index: branches/Jief/i386/boot2/modules.c =================================================================== --- branches/Jief/i386/boot2/modules.c (revision 2272) +++ branches/Jief/i386/boot2/modules.c (revision 2273) @@ -944,7 +944,7 @@ } -inline void bind_location(UInt32* location, char* value, UInt32 addend, int type) +static inline void bind_location(UInt32* location, char* value, UInt32 addend, int type) { // do actual update char* newValue = value + addend; @@ -1158,4 +1158,4 @@ start_function(); } -#endif \ No newline at end of file +#endif Index: branches/Jief/i386/boot2/modules.h =================================================================== --- branches/Jief/i386/boot2/modules.h (revision 2272) +++ branches/Jief/i386/boot2/modules.h (revision 2273) @@ -95,9 +95,9 @@ long long(*symbol_handler)(char*, long long, char), char is64); void rebase_macho(void* base, char* rebase_stream, UInt32 size); -inline void rebase_location(UInt32* location, char* base, int type); +static inline void rebase_location(UInt32* location, char* base, int type); void bind_macho(void* base, UInt8* bind_stream, UInt32 size); -inline void bind_location(UInt32* location, char* value, UInt32 addend, int type); +static inline void bind_location(UInt32* location, char* value, UInt32 addend, int type); @@ -119,4 +119,4 @@ /********************************************************************************/ void dyld_stub_binder(); -#endif /* __BOOT_MODULES_H */ \ No newline at end of file +#endif /* __BOOT_MODULES_H */