# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1237925909 -3600
# Node ID 49421d3ac5a7213394c989ced939f960f5fef543
# Parent  946fad6c96a1af0868faea8961ec38cff0282b5f# Parent  f99a3b393c035e4d51532d97daecf03658c8afc8
Automated merge with http://hg.dsource.org/projects/ldc

diff -r f99a3b393c03 -r 49421d3ac5a7 CMakeLists.txt
--- a/CMakeLists.txt	Tue Mar 24 21:18:18 2009 +0100
+++ b/CMakeLists.txt	Tue Mar 24 21:18:29 2009 +0100
@@ -15,10 +15,12 @@
 else(NOT PKG_CONFIG_FOUND)
     pkg_search_module(LIBCONFIGPP libconfig++)
     if(NOT LIBCONFIGPP_FOUND)
-        message(FATAL_ERROR "libconfig++ not found")
+        set(LIBCONFIG_CXXFLAGS "" CACHE STRING "libconfig++ compiler flags")
+        set(LIBCONFIG_LDFLAGS "" CACHE STRING "libconfig++ linker flags")
+    else(NOT LIBCONFIGPP_FOUND)
+        set(LIBCONFIG_CXXFLAGS ${LIBCONFIGPP_CFLAGS} CACHE STRING "libconfig++ compiler flags")
+        set(LIBCONFIG_LDFLAGS ${LIBCONFIGPP_LDFLAGS} CACHE STRING "libconfig++ linker flags")
     endif(NOT LIBCONFIGPP_FOUND)
-    set(LIBCONFIG_CXXFLAGS ${LIBCONFIGPP_CFLAGS} CACHE STRING "libconfig++ compiler flags")
-    set(LIBCONFIG_LDFLAGS ${LIBCONFIGPP_LDFLAGS} CACHE STRING "libconfig++ linker flags")
 endif(NOT PKG_CONFIG_FOUND)
 
 
diff -r f99a3b393c03 -r 49421d3ac5a7 gen/tollvm.cpp
--- a/gen/tollvm.cpp	Tue Mar 24 21:18:18 2009 +0100
+++ b/gen/tollvm.cpp	Tue Mar 24 21:18:29 2009 +0100
@@ -20,6 +20,7 @@
 #include "gen/complex.h"
 #include "gen/llvmhelpers.h"
 #include "gen/linkage.h"
+#include "gen/llvm-version.h"
 
 bool DtoIsPassedByRef(Type* type)
 {
@@ -521,8 +522,16 @@
         return LLConstantFP::get(llty, value);
     else if(llty == LLType::X86_FP80Ty) {
         uint64_t bits[] = {0, 0};
+    #if LLVM_REV < 67562
+        // Prior to r67562, the i80 APInt format expected by the APFloat
+        // constructor was different than the memory layout on the actual
+        // processor.
         bits[1] = *(uint16_t*)&value;
         bits[0] = *(uint64_t*)((uint16_t*)&value + 1);
+    #else
+        bits[0] = *(uint64_t*)&value;
+        bits[1] = *(uint16_t*)((uint64_t*)&value + 1);
+    #endif
         return LLConstantFP::get(APFloat(APInt(80, 2, bits)));
     } else {
         assert(0 && "Unknown floating point type encountered");