From 045a3187ce1cac93646da2f34a637367a170c9dd Mon Sep 17 00:00:00 2001 From: hailfinger Date: Thu, 9 Aug 2012 23:34:41 +0000 Subject: Portability fixes and cleanups Move Mac OS X IOKit/DirectHW availability checks in the Makefile from compiler check to pciutils check. Print the compiler error messages for feature detection. Add DOS libpci in the Makefile includes only if a PCI-based programmer was requested. Restrict mmap usage in ich_descriptors_tool to Unix style systems. Build ich_descriptors_tool with the correct .exe extension on DOS/Windows. Build ich_descriptors_tool by default on x86. (Patch by Stefan Tauner) Print the Windows version instead of "unknown machine" on Windows. Don't #define our own __DARWIN__, use the standard OS X detection method. Update the README. Add more generated files to svn:ignore Signed-off-by: Carl-Daniel Hailfinger Acked-by: Carl-Daniel Hailfinger git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1567 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- physmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'physmap.c') diff --git a/physmap.c b/physmap.c index eca6760..5aa9874 100644 --- a/physmap.c +++ b/physmap.c @@ -129,7 +129,7 @@ int setup_cpu_msr(int cpu) void cleanup_cpu_msr(void) { } -#elif defined(__DARWIN__) +#elif defined(__MACH__) && defined(__APPLE__) #define MEM_DEV "DirectHW" @@ -468,7 +468,7 @@ void cleanup_cpu_msr(void) #else -#ifdef __DARWIN__ +#if defined(__MACH__) && defined(__APPLE__) int setup_cpu_msr(int cpu) { // Always succeed for now -- cgit v1.2.1