Index: branches/cparm/TODO =================================================================== --- branches/cparm/TODO (revision 2116) +++ branches/cparm/TODO (revision 2117) @@ -12,7 +12,6 @@ - implement cpu topology - Backport cconfig from the trunk -- update cpu_intel_amd - Implement a Host like in bits to avoid some return issues - update project with corehash Index: branches/cparm/i386/libsaio/fake_efi.h =================================================================== --- branches/cparm/i386/libsaio/fake_efi.h (revision 2116) +++ branches/cparm/i386/libsaio/fake_efi.h (revision 2117) @@ -16,7 +16,7 @@ extern EFI_STATUS setup_acpi (void); -extern EFI_STATUS addConfigurationTable(); +extern EFI_STATUS addConfigurationTable(EFI_GUID const *pGuid, void *table, char const *alias); extern struct SMBEntryPoint *getSmbiosOriginal(); Index: branches/cparm/i386/libsaio/exfat.c =================================================================== --- branches/cparm/i386/libsaio/exfat.c (revision 2116) +++ branches/cparm/i386/libsaio/exfat.c (revision 2117) @@ -35,6 +35,7 @@ #include "libsaio.h" #include "sl.h" +#include "exfat.h" #ifndef DEBUG_EXFAT #define DEBUG_EXFAT 0 Index: branches/cparm/i386/libsaio/hfs.c =================================================================== --- branches/cparm/i386/libsaio/hfs.c (revision 2116) +++ branches/cparm/i386/libsaio/hfs.c (revision 2117) @@ -108,11 +108,6 @@ static long CompareHFSExtentsKeys(void *key, void *testKey); static long CompareHFSPlusExtentsKeys(void *key, void *testKey); -extern long FastRelString(u_int8_t *str1, u_int8_t *str2); -extern long BinaryUnicodeCompare(u_int16_t *uniStr1, u_int32_t len1, - u_int16_t *uniStr2, u_int32_t len2); - - static void SwapFinderInfo(FndrFileInfo *dst, FndrFileInfo *src) { dst->fdType = SWAP_BE32(src->fdType); Index: branches/cparm/i386/libsaio/hfs.h =================================================================== --- branches/cparm/i386/libsaio/hfs.h (revision 2116) +++ branches/cparm/i386/libsaio/hfs.h (revision 2117) @@ -31,3 +31,8 @@ extern long HFSGetUUID(CICell ih, char *uuidStr, long strMaxLen); extern void HFSFree(CICell ih); extern bool HFSProbe (const void *buf); + + +extern int32_t FastRelString(u_int8_t * str1, u_int8_t * str2); +extern int32_t BinaryUnicodeCompare (u_int16_t * str1, u_int32_t length1, + u_int16_t * str2, u_int32_t length2); \ No newline at end of file Index: branches/cparm/i386/libsaio/hfs_compare.c =================================================================== --- branches/cparm/i386/libsaio/hfs_compare.c (revision 2116) +++ branches/cparm/i386/libsaio/hfs_compare.c (revision 2117) @@ -29,6 +29,7 @@ #include "sl.h" #include "hfs_CaseTables.h" +#include "hfs.h" #if ! UNCOMPRESSED Index: branches/cparm/i386/libsaio/Makefile =================================================================== --- branches/cparm/i386/libsaio/Makefile (revision 2116) +++ branches/cparm/i386/libsaio/Makefile (revision 2117) @@ -9,10 +9,10 @@ OPTIM = -Os -Oz DEBUG = -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fno-stack-protector \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fno-stack-protector \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ - -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) -march=pentium4 -msse2 -msoft-float -Qunused-arguments -ffreestanding -DBOOT_CORE -mpreferred-stack-boundary=2 -fno-align-functions -mfpmath=sse + -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) -march=pentium4 -msse2 -msoft-float -Qunused-arguments -ffreestanding -DBOOT_CORE -mpreferred-stack-boundary=2 -fno-align-functions -mfpmath=sse -Werror GFLAGS = DEFINES= CONFIG = hd Index: branches/cparm/i386/libsaio/cpu_intel_amd.c =================================================================== --- branches/cparm/i386/libsaio/cpu_intel_amd.c (revision 2116) +++ branches/cparm/i386/libsaio/cpu_intel_amd.c (revision 2117) @@ -395,7 +395,7 @@ * - CPUFreq = FSBFreq * multi */ -void scan_cpu(PlatformInfo_t *p) +void scan_cpu(void) { uint64_t msr = 0; @@ -616,6 +616,7 @@ case CPUID_MODEL_NEHALEM_EX: case CPUID_MODEL_SANDYBRIDGE: case CPUID_MODEL_JAKETOWN: + case CPUID_MODEL_IVYBRIDGE: { msr = rdmsr64(MSR_CORE_THREAD_COUNT); NoThreads = bitfield((uint32_t)msr, 15, 0); @@ -628,7 +629,7 @@ if (NoCores == 0) { - if (p->CPU.Vendor == CPUID_VENDOR_AMD) + if (Vendor == CPUID_VENDOR_AMD) { if (!cores_per_package) { //legacy method @@ -660,7 +661,7 @@ CPUFreq = measure_aperf_frequency(); } - if ((Vendor == 0x68747541 /* AMD */) && (Family == 0x0f)) + if ((Vendor == CPUID_VENDOR_AMD) && (Family == 0x0f)) { switch(ExtFamily) { Index: branches/cparm/i386/libsaio/ntfs.c =================================================================== --- branches/cparm/i386/libsaio/ntfs.c (revision 2116) +++ branches/cparm/i386/libsaio/ntfs.c (revision 2117) @@ -24,6 +24,7 @@ */ #include "libsaio.h" #include "sl.h" +#include "ntfs.h" /* * dmazar, 14/7/2011 - support for EXFAT volume label reading Index: branches/cparm/i386/libsaio/disk.c =================================================================== --- branches/cparm/i386/libsaio/disk.c (revision 2116) +++ branches/cparm/i386/libsaio/disk.c (revision 2117) @@ -204,6 +204,17 @@ static bool CheckDarwin(BVRef bvr); static bool getOSInstallVersion(const char *dirSpec, char *str, config_file_t *systemVersion); static bool getOSInstallURL(BVRef bvr, const char *dirSpec, config_file_t *config_file); +static BVRef newGPTBVRef( int biosdev, int partno, unsigned int blkoff, + const gpt_ent * part, + FSInit initFunc, FSLoadFile loadFunc, + FSReadFile readFunc, + FSGetDirEntry getdirFunc, + FSGetFileBlock getBlockFunc, + FSGetUUID getUUIDFunc, + BVGetDescription getDescriptionFunc, + BVFree bvFreeFunc, + int probe, int type, unsigned int bvrFlags ); +static bool getVolumeLabelAlias(BVRef bvr, char* str, long strMaxLen); //========================================================================== @@ -717,7 +728,7 @@ EFI_GUID const GPT_BASICDATA2_GUID = { 0xE3C9E316, 0x0B5C, 0x4DB8, { 0x81, 0x7D, 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE } }; -BVRef newGPTBVRef( int biosdev, int partno, unsigned int blkoff, +static BVRef newGPTBVRef( int biosdev, int partno, unsigned int blkoff, const gpt_ent * part, FSInit initFunc, FSLoadFile loadFunc, FSReadFile readFunc, @@ -2124,7 +2135,7 @@ * hd(x,y)|uuid|"label" "alias";hd(m,n)|uuid|"label" etc; ... */ -bool getVolumeLabelAlias(BVRef bvr, char* str, long strMaxLen) +static bool getVolumeLabelAlias(BVRef bvr, char* str, long strMaxLen) { char *aliasList, *entryStart, *entryNext; Index: branches/cparm/i386/libsaio/cache.c =================================================================== --- branches/cparm/i386/libsaio/cache.c (revision 2116) +++ branches/cparm/i386/libsaio/cache.c (revision 2117) @@ -28,6 +28,7 @@ */ #include "sl.h" +#include "libsaio.h" struct CacheEntry { CICell ih; @@ -60,7 +61,7 @@ unsigned long gCacheEvicts; #endif -void CacheReset() +void CacheReset(void) { gCacheIH = NULL; } Index: branches/cparm/i386/libsaio/arc4random-fbsd.c =================================================================== --- branches/cparm/i386/libsaio/arc4random-fbsd.c (revision 2116) +++ branches/cparm/i386/libsaio/arc4random-fbsd.c (revision 2117) @@ -73,6 +73,7 @@ static inline u_int8_t arc4_getbyte(void); static void arc4_stir(void); +__private_extern__ void _arc4_fork_child(void); static struct { struct timeval tv; Index: branches/cparm/i386/libsaio/pci.c =================================================================== --- branches/cparm/i386/libsaio/pci.c (revision 2116) +++ branches/cparm/i386/libsaio/pci.c (revision 2117) @@ -22,8 +22,9 @@ pci_dt_t *root_pci_dev; static char* dev_path; // TODO: Figure out what is going on here... +static void scan_pci_bus(pci_dt_t *start, uint8_t bus); +static void enable_pci_devs(void); - uint8_t pci_config_read8(uint32_t pci_addr, uint8_t reg) { pci_addr |= reg & ~3; @@ -66,7 +67,7 @@ outl(PCI_DATA_REG, data); } -void scan_pci_bus(pci_dt_t *start, uint8_t bus) +static void scan_pci_bus(pci_dt_t *start, uint8_t bus) { pci_dt_t *new; pci_dt_t **current = &start->children; @@ -124,7 +125,7 @@ } } -void enable_pci_devs(void) +static void enable_pci_devs(void) { uint16_t id; uint32_t rcba, *fd; Index: branches/cparm/i386/libsaio/msdos.c =================================================================== --- branches/cparm/i386/libsaio/msdos.c (revision 2116) +++ branches/cparm/i386/libsaio/msdos.c (revision 2117) @@ -773,7 +773,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/cparm/i386/libsaio/fake_efi.c =================================================================== --- branches/cparm/i386/libsaio/fake_efi.c (revision 2116) +++ branches/cparm/i386/libsaio/fake_efi.c (revision 2117) @@ -162,7 +162,7 @@ EFI_UINT64 gNumTables64 = 0; EFI_CONFIGURATION_TABLE_32 gEfiConfigurationTable32[MAX_CONFIGURATION_TABLE_ENTRIES]; EFI_CONFIGURATION_TABLE_64 gEfiConfigurationTable64[MAX_CONFIGURATION_TABLE_ENTRIES]; -extern EFI_STATUS addConfigurationTable(EFI_GUID const *pGuid, void *table, char const *alias) +EFI_STATUS addConfigurationTable(EFI_GUID const *pGuid, void *table, char const *alias) { EFI_UINTN i = 0; Index: branches/cparm/i386/libsaio/saio_internal.h =================================================================== --- branches/cparm/i386/libsaio/saio_internal.h (revision 2116) +++ branches/cparm/i386/libsaio/saio_internal.h (revision 2117) @@ -100,7 +100,7 @@ /* cache.c */ -extern void CacheReset(); +extern void CacheReset(void); extern void CacheInit(CICell ih, long blockSize); extern long CacheRead(CICell ih, char *buffer, long long offset, long length, long cache); Index: branches/cparm/i386/MakeInc.dir =================================================================== --- branches/cparm/i386/MakeInc.dir (revision 2116) +++ branches/cparm/i386/MakeInc.dir (revision 2117) @@ -47,11 +47,11 @@ ifeq ($(HAVE_MD),YES) .c.o .m.o: - $(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o -MD -dependency-file $(OBJROOT)/$*.d + $(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) -Wmissing-prototypes -Wmissing-declarations $< -o $(OBJROOT)/$*.o -MD -dependency-file $(OBJROOT)/$*.d $(SYMROOT)/md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d $(OBJROOT)/%.o: %.c - $(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o -MD -dependency-file $(OBJROOT)/$*.d + $(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) -Wmissing-prototypes -Wmissing-declarations $< -o $(OBJROOT)/$*.o -MD -dependency-file $(OBJROOT)/$*.d $(SYMROOT)/md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d $(OBJROOT)/%.o: %.m Index: branches/cparm/i386/boot2/boot.c =================================================================== --- branches/cparm/i386/boot2/boot.c (revision 2116) +++ branches/cparm/i386/boot2/boot.c (revision 2117) @@ -94,8 +94,8 @@ #ifdef NBP_SUPPORT static bool gUnloadPXEOnExit = false; #endif +static void getRootDevice(void); - /* * How long to wait (in seconds) to load the * kernel after displaying the "boot:" prompt. @@ -931,7 +931,7 @@ } } -static void getRootDevice() +static void getRootDevice(void) { // Maximum config table value size #define VALUE_SIZE 2048 Index: branches/cparm/i386/boot2/Makefile =================================================================== --- branches/cparm/i386/boot2/Makefile (revision 2116) +++ branches/cparm/i386/boot2/Makefile (revision 2117) @@ -24,10 +24,10 @@ BUNDLE_CLASS_PROVIDER = SYSTEM OPTIM = -Os -Oz -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror -fno-stack-protector \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fno-stack-protector \ -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \ -mpreferred-stack-boundary=2 -fno-align-functions \ - -march=pentium4 -msse2 -mfpmath=sse -msoft-float -Qunused-arguments -ffreestanding -DBOOT_CORE + -march=pentium4 -msse2 -mfpmath=sse -msoft-float -Qunused-arguments -ffreestanding -DBOOT_CORE -Werror GFLAGS = DEFINES= Index: branches/cparm/i386/modules/NetbookInstaller/Makefile =================================================================== --- branches/cparm/i386/modules/NetbookInstaller/Makefile (revision 2116) +++ branches/cparm/i386/modules/NetbookInstaller/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/RamDiskLoader/Makefile =================================================================== --- branches/cparm/i386/modules/RamDiskLoader/Makefile (revision 2116) +++ branches/cparm/i386/modules/RamDiskLoader/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/YellowIconFixer/Makefile =================================================================== --- branches/cparm/i386/modules/YellowIconFixer/Makefile (revision 2116) +++ branches/cparm/i386/modules/YellowIconFixer/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/KextPatcher/Makefile =================================================================== --- branches/cparm/i386/modules/KextPatcher/Makefile (revision 2116) +++ branches/cparm/i386/modules/KextPatcher/Makefile (revision 2117) @@ -23,7 +23,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/ACPIPatcher/Makefile =================================================================== --- branches/cparm/i386/modules/ACPIPatcher/Makefile (revision 2116) +++ branches/cparm/i386/modules/ACPIPatcher/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/GUI/Makefile =================================================================== --- branches/cparm/i386/modules/GUI/Makefile (revision 2116) +++ branches/cparm/i386/modules/GUI/Makefile (revision 2117) @@ -37,7 +37,7 @@ OPTIM = -O0 # -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/KernelPatcher/Makefile =================================================================== --- branches/cparm/i386/modules/KernelPatcher/Makefile (revision 2116) +++ branches/cparm/i386/modules/KernelPatcher/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -O3 DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/Networking/Makefile =================================================================== --- branches/cparm/i386/modules/Networking/Makefile (revision 2116) +++ branches/cparm/i386/modules/Networking/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/GraphicsEnabler/Makefile =================================================================== --- branches/cparm/i386/modules/GraphicsEnabler/Makefile (revision 2116) +++ branches/cparm/i386/modules/GraphicsEnabler/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/SMBiosGetters/Makefile =================================================================== --- branches/cparm/i386/modules/SMBiosGetters/Makefile (revision 2116) +++ branches/cparm/i386/modules/SMBiosGetters/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/HibernateEnabler/Makefile =================================================================== --- branches/cparm/i386/modules/HibernateEnabler/Makefile (revision 2116) +++ branches/cparm/i386/modules/HibernateEnabler/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/Keymapper/Makefile =================================================================== --- branches/cparm/i386/modules/Keymapper/Makefile (revision 2116) +++ branches/cparm/i386/modules/Keymapper/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/USBFix/Makefile =================================================================== --- branches/cparm/i386/modules/USBFix/Makefile (revision 2116) +++ branches/cparm/i386/modules/USBFix/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/HPET/Makefile =================================================================== --- branches/cparm/i386/modules/HPET/Makefile (revision 2116) +++ branches/cparm/i386/modules/HPET/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/SMBiosPatcher/Makefile =================================================================== --- branches/cparm/i386/modules/SMBiosPatcher/Makefile (revision 2116) +++ branches/cparm/i386/modules/SMBiosPatcher/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/Resolution/Makefile =================================================================== --- branches/cparm/i386/modules/Resolution/Makefile (revision 2116) +++ branches/cparm/i386/modules/Resolution/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/CPUfreq/Makefile =================================================================== --- branches/cparm/i386/modules/CPUfreq/Makefile (revision 2116) +++ branches/cparm/i386/modules/CPUfreq/Makefile (revision 2117) @@ -35,7 +35,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/Memory/spd.c =================================================================== --- branches/cparm/i386/modules/Memory/spd.c (revision 2116) +++ branches/cparm/i386/modules/Memory/spd.c (revision 2117) @@ -326,7 +326,7 @@ /*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]);*/ - 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/cparm/i386/modules/Memory/Makefile =================================================================== --- branches/cparm/i386/modules/Memory/Makefile (revision 2116) +++ branches/cparm/i386/modules/Memory/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/ACPICodec/Makefile =================================================================== --- branches/cparm/i386/modules/ACPICodec/Makefile (revision 2116) +++ branches/cparm/i386/modules/ACPICodec/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/modules/HelloWorld/Makefile =================================================================== --- branches/cparm/i386/modules/HelloWorld/Makefile (revision 2116) +++ branches/cparm/i386/modules/HelloWorld/Makefile (revision 2117) @@ -36,7 +36,7 @@ OPTIM = -Os -Oz DEBUG = -DNOTHING -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -fstack-protector-all \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fstack-protector-all \ -D__ARCHITECTURE__=\"i386\" \ $(DEBUG) \ -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ Index: branches/cparm/i386/libsa/libsa.h =================================================================== --- branches/cparm/i386/libsa/libsa.h (revision 2116) +++ branches/cparm/i386/libsa/libsa.h (revision 2117) @@ -140,8 +140,15 @@ void (*putc)(int ch, void *arg), void *arg, int radix); - + /* + * qsort.c + */ + +extern void qsort(void *a,size_t n,size_t es, int (*cmp)()); + + +/* * zalloc.c */ Index: branches/cparm/i386/libsa/Makefile =================================================================== --- branches/cparm/i386/libsa/Makefile (revision 2116) +++ branches/cparm/i386/libsa/Makefile (revision 2117) @@ -8,9 +8,9 @@ INSTALL_MD_DIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/machdep/i386 OPTIM = -Os -Oz -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror -fno-stack-protector \ +CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wall -fno-stack-protector \ -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \ - -march=pentium4 -msse2 -msoft-float -Qunused-arguments -ffreestanding -DBOOT_CORE -mpreferred-stack-boundary=2 -fno-align-functions -mfpmath=sse + -march=pentium4 -msse2 -msoft-float -Qunused-arguments -ffreestanding -DBOOT_CORE -mpreferred-stack-boundary=2 -fno-align-functions -mfpmath=sse -Werror GFLAGS = INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSAIODIR) ifneq "" "$(wildcard /bin/mkdirs)" Index: branches/cparm/i386/util/Makefile =================================================================== --- branches/cparm/i386/util/Makefile (revision 2116) +++ branches/cparm/i386/util/Makefile (revision 2117) @@ -13,7 +13,7 @@ LOCALBIN = $(DSTROOT)/usr/local/bin OPTIM = -Os -Oz -CFLAGS = $(RC_CFLAGS) $(OPTIM) -Wmost -Werror -g +CFLAGS = $(RC_CFLAGS) $(OPTIM) -Wall -Werror -g LDFLAGS = CFILES = machOconv.c ALLSRC = $(CFILES) $(MFILES) $(HFILES) $(EXPORT_HFILES) Index: branches/cparm/xcode3_sym.zip =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream