Update cmake build on recent Haiku

[korli]

Summary

[Copied from [ https://llvm.org/bugs/show_bug.cgi?id=26405 | https://llvm.org/bugs/show_bug.cgi?id=26405 ]

cmake build support on Haiku is lagging a bit.

This patch updates cmake build scripts to build on Haiku. It updates config.guess to a newer version which recognizes Haiku x86_64.
It should apply directly to trunk, please consider reviewing.

[• ehsan]

I'm afraid I'm not a good reviewer for this. Sorry!

[beanz]

I'm sorry we cannot accept this patch. The updates to config.guess involve taking a new version of the script that is licensed under GPLv3. We cannot accept GPLv3 code into LLVM without at least a larger discussion on LLVM-dev about it.

It is my belief that GPLv3 is incompatible with some of the goals of the LLVM project. Specifically the creation of a permissive-licensed open-source compiler.

[rengolin]

cmake/config.guess

1209

This seems to be the *only* change that is needed in this file. We can't take the GPLv3 version of config.guess, but we can take this change into our old version.

[rengolin]

Please, abandon this patch, ignore every change to config.guess, only add the three lines you need for your case, and re-submit as a new revision. Also, add Chris Lattner to the review, because this is a sensitive issue.

We have precedent for that kind of change (r202125), so without the GPLv3 stuff, it should be fine. But you still need explicit approval for this change.

cheers,
--renato

[korli]

In D16798#360787, @rengolin wrote:

Please, abandon this patch, ignore every change to config.guess, only add the three lines you need for your case, and re-submit as a new revision. Also, add Chris Lattner to the review, because this is a sensitive issue.

We have precedent for that kind of change (r202125), so without the GPLv3 stuff, it should be fine. But you still need explicit approval for this change.

Thanks. I re-submitted as revision D17595 with new patch. Though I have no idea what Chris Lattner phab account is :/

Bye,
Jerome

cmake/config-ix.cmake

 
 include(HandleLLVMStdlib)
 
-if( UNIX AND NOT BEOS )
+if( UNIX AND NOT (BEOS OR HAIKU) )
   # Used by check_symbol_exists:
   set(CMAKE_REQUIRED_LIBRARIES m)
 endif()

cmake/config.guess

 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012, 2013 Free Software Foundation, Inc.
 
-timestamp='2011-08-20'
+timestamp='2012-12-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but

 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <[e-mail]> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner. 
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to [e-mail].
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 

 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
   # NetBSD (nbsd) targets should (where applicable) match one or
-  # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+  # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
   # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
   # switched to ELF, *-*-netbsd* would select the old
   # object file format.  This provides both forward

   # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   echo "${machine}-${os}${release}"
   exit ;;
-    *:OpenBSD:*:*)
-  UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-  echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-  exit ;;
     *:Bitrig:*:*)
   UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
   echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
   exit ;;
+    *:OpenBSD:*:*)
+  UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+  echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+  exit ;;
     *:ekkoBSD:*:*)
   echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
   exit ;;

     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   echo arm-acorn-riscix${UNAME_RELEASE}
   exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
   echo arm-unknown-riscos
   exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)

     i*:CYGWIN*:*)
   echo ${UNAME_MACHINE}-pc-cygwin
   exit ;;
+    *:MINGW64*:*)
+  echo ${UNAME_MACHINE}-pc-mingw64
+  exit ;;
     *:MINGW*:*)
   echo ${UNAME_MACHINE}-pc-mingw32
   exit ;;
-    *:MSYS*:*)
+    i*:MSYS*:*)
   echo ${UNAME_MACHINE}-pc-msys
   exit ;;
     i*:windows32*:*)

     i*86:Minix:*:*)
   echo ${UNAME_MACHINE}-pc-minix
   exit ;;
-    aarch64*:Linux:*)
-      echo ${UNAME_MACHINE}-unknown-linux-gnu
+    aarch64:Linux:*:*)
+  echo ${UNAME_MACHINE}-unknown-linux-gnu
+  exit ;;
+    aarch64_be:Linux:*:*)
+  UNAME_MACHINE=aarch64_be
+  echo ${UNAME_MACHINE}-unknown-linux-gnu
   exit ;;
     alpha:Linux:*:*)
   case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in

   echo ${UNAME_MACHINE}-unknown-linux-gnu
   exit ;;
     cris:Linux:*:*)
-  echo cris-axis-linux-gnu
+  echo ${UNAME_MACHINE}-axis-linux-gnu
   exit ;;
     crisv32:Linux:*:*)
-  echo crisv32-axis-linux-gnu
+  echo ${UNAME_MACHINE}-axis-linux-gnu
   exit ;;
     frv:Linux:*:*)
-  echo frv-unknown-linux-gnu
+  echo ${UNAME_MACHINE}-unknown-linux-gnu
+  exit ;;
+    hexagon:Linux:*:*)
+  echo ${UNAME_MACHINE}-unknown-linux-gnu
   exit ;;
     i*86:Linux:*:*)
   LIBC=gnu

   test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
   ;;
     or32:Linux:*:*)
-  echo or32-unknown-linux-gnu
+  echo ${UNAME_MACHINE}-unknown-linux-gnu
   exit ;;
     padre:Linux:*:*)
   echo sparc-unknown-linux-gnu

     ppc64:Linux:*:*)
   echo powerpc64-unknown-linux-gnu
   exit ;;
-    ppc64le:Linux:*:*)
-  echo powerpc64le-unknown-linux-gnu
-  exit ;;
     ppc:Linux:*:*)
   echo powerpc-unknown-linux-gnu
   exit ;;

   echo ${UNAME_MACHINE}-dec-linux-gnu
   exit ;;
     x86_64:Linux:*:*)
-  echo x86_64-unknown-linux-gnu
+  echo ${UNAME_MACHINE}-unknown-linux-gnu
   exit ;;
     xtensa*:Linux:*:*)
   echo ${UNAME_MACHINE}-unknown-linux-gnu

     BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
   echo i586-pc-haiku
   exit ;;
+    x86_64:Haiku:*:*)
+  echo x86_64-unknown-haiku
+  exit ;;
     SX-4:SUPER-UX:*:*)
   echo sx4-nec-superux${UNAME_RELEASE}
   exit ;;

     NEO-?:NONSTOP_KERNEL:*:*)
   echo neo-tandem-nsk${UNAME_RELEASE}
   exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
   echo nse-tandem-nsk${UNAME_RELEASE}
   exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)

     i*86:AROS:*:*)
   echo ${UNAME_MACHINE}-pc-aros
   exit ;;
+    x86_64:VMkernel:*:*)
+  echo ${UNAME_MACHINE}-unknown-esx
+  exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_

include/llvm/Support/Host.h

 
 #include "llvm/ADT/StringMap.h"
 
-#if defined(__linux__) || defined(__GNU__)
+#if defined(__linux__) || defined(__GNU__) || defined(__HAIKU__)
 #include <endian.h>
 #else
 #if !defined(BYTE_ORDER) && !defined(LLVM_ON_WIN32)

lib/Support/CMakeLists.txt

     if ( LLVM_ENABLE_ZLIB AND HAVE_LIBZ )
       set(system_libs ${system_libs} z)
     endif()
-    set(system_libs ${system_libs} m)
+    if( UNIX AND NOT (BEOS OR HAIKU) )
+      set(system_libs ${system_libs} m)
+    endif()
   endif( MINGW )
 endif( NOT MSVC )