[llvm-commits] [PROPOSAL] Add --program-prefix support to build
Rick Foos
rfoos at codeaurora.org
Mon Sep 24 15:54:57 PDT 2012
I'll pull config.guess from the patch. There are currently three
different versions of config.guess in the tree.
On 09/24/2012 03:13 PM, Jim Grosbach wrote:
> Updating config.guess should probably be a separate patch, as it's unrelated to the core change you're wanting. I gather the new version is still OK license-wise?
>
Yes, the GPL license exception is still in place.
# 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.
> No comment on the guts of the patch (I'm not familiar w/ how/why it failed before, so not really qualified to weigh in there).
>
> -Jim
>
> On Sep 24, 2012, at 1:03 PM, Sebastian Pop<spop at codeaurora.org> wrote:
>
>> Hi,
>>
>> I would like to submit this patch again: the first time we had to revert it
>> because some buildbots started failing. Rick has then set up a dragonegg bot to
>> test and fix the problems. I think that we can try to push the patch once more,
>> now that the problem is fixed. If there are no objections, I will be pushing
>> this and follow the build bots activity on IRC.
>>
>> Sebastian
>>
>> Rick Foos wrote:
>>> On 09/20/2012 10:52 PM, Rick Foos wrote:
>>>> This patch adds --program-prefix support to the autoconf build.
>>>>
>>>> The cmake build isn't changed.
>>>>
>>>> makefile.rules now has program_prefix from configure. Some install
>>>> rules need it with Destdir.
>>>>
>>>> In configure.ac, A trap for the program_prefix = NONE before
>>>> AC_SUBST is needed. Configure ususally doesn't export
>>>> program-<prefix|suffix|transform> variables, and the NONE default
>>>> value can escape w/o a trap.
>>>>
>>>> config.guess is updated to 2012-08-14. No platforms are removed.
>>>> Hexagon is added.
>>>>
>>>> --program-suffix wasn't included as it might interfere with the
>>>> EXEEXT variables, and goes beyond the scope of this patch.
>>>>
>>>> Thank you,
>>>> -rick
>>>>
>>>>
>>>> _______________________________________________
>>>> llvm-commits mailing list
>>>> llvm-commits at cs.uiuc.edu
>>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>> resolve merge conflict with --backtrace
>>>
>>> --
>>> Rick Foos
>>> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
>>>
>>> From a1b616853c4b2a82b0a8ed65e94374cd18660b54 Mon Sep 17 00:00:00 2001
>>> From: Rick Foos<rfoos at codeaurora.org>
>>> Date: Tue, 28 Aug 2012 18:25:17 -0500
>>> Subject: [PATCH] Add --program-prefix support to build
>>>
>>> Change-Id: I414cce2936093b0ef1d4df466d8d9232051e2701
>>> ---
>>> Makefile.config.in | 1 +
>>> Makefile.rules | 4 +-
>>> autoconf/config.guess | 60 +++++++++++++++++++++-----------
>>> autoconf/configure.ac | 5 +++
>>> configure | 16 +++++---
>>> projects/sample/Makefile.llvm.rules | 4 +-
>>> projects/sample/autoconf/config.guess | 56 +++++++++++++++++++++---------
>>> tools/llvm-config/Makefile | 2 +-
>>> 8 files changed, 99 insertions(+), 49 deletions(-)
>>>
>>> diff --git a/Makefile.config.in b/Makefile.config.in
>>> index e3bd2a2..b4ecea6 100644
>>> --- a/Makefile.config.in
>>> +++ b/Makefile.config.in
>>> @@ -61,6 +61,7 @@ endif
>>>
>>> prefix := @prefix@
>>> PROJ_prefix := $(prefix)
>>> +program_prefix := @program_prefix@
>>> PROJ_VERSION := $(LLVMVersion)
>>> else
>>> ifndef PROJ_SRC_ROOT
>>> diff --git a/Makefile.rules b/Makefile.rules
>>> index 289adc2..f74c6f5 100644
>>> --- a/Makefile.rules
>>> +++ b/Makefile.rules
>>> @@ -1541,7 +1541,7 @@ ToolBinDir = $(DESTDIR)$(PROJ_internal_prefix)/bin
>>> else
>>> ToolBinDir = $(DESTDIR)$(PROJ_bindir)
>>> endif
>>> -DestTool = $(ToolBinDir)/$(TOOLEXENAME)
>>> +DestTool = $(ToolBinDir)/$(program_prefix)$(TOOLEXENAME)
>>>
>>> install-local:: $(DestTool)
>>>
>>> @@ -1556,7 +1556,7 @@ uninstall-local::
>>>
>>> # TOOLALIAS install.
>>> ifdef TOOLALIAS
>>> -DestToolAlias = $(ToolBinDir)/$(TOOLALIAS)$(EXEEXT)
>>> +DestToolAlias = $(ToolBinDir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT)
>>>
>>> install-local:: $(DestToolAlias)
>>>
>>> diff --git a/autoconf/config.guess b/autoconf/config.guess
>>> index dd6dcb3..00a2c45 100755
>>> --- a/autoconf/config.guess
>>> +++ b/autoconf/config.guess
>>> @@ -2,9 +2,9 @@
>>> # 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 Free Software Foundation, Inc.
>>>
>>> -timestamp='2011-08-20'
>>> +timestamp='2012-08-14'
>>>
>>> # 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
>>> @@ -17,9 +17,7 @@ timestamp='2011-08-20'
>>> # 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
>>> @@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
>>>
>>> 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
>>> +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."
>>> @@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
>>> 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
>>> @@ -202,14 +200,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>>> # 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 ;;
>>> @@ -807,9 +805,15 @@ EOF
>>> i*:CYGWIN*:*)
>>> echo ${UNAME_MACHINE}-pc-cygwin
>>> exit ;;
>>> + *:MINGW64*:*)
>>> + echo ${UNAME_MACHINE}-pc-mingw64
>>> + exit ;;
>>> *:MINGW*:*)
>>> echo ${UNAME_MACHINE}-pc-mingw32
>>> exit ;;
>>> + i*:MSYS*:*)
>>> + echo ${UNAME_MACHINE}-pc-msys
>>> + exit ;;
>>> i*:windows32*:*)
>>> # uname -m includes "-pc" on this system.
>>> echo ${UNAME_MACHINE}-mingw32
>>> @@ -864,6 +868,13 @@ EOF
>>> i*86:Minix:*:*)
>>> echo ${UNAME_MACHINE}-pc-minix
>>> exit ;;
>>> + 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
>>> EV5) UNAME_MACHINE=alphaev5 ;;
>>> @@ -898,13 +909,16 @@ EOF
>>> 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
>>> @@ -946,7 +960,7 @@ EOF
>>> 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
>>> @@ -987,7 +1001,7 @@ EOF
>>> 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
>>> @@ -1194,6 +1208,9 @@ EOF
>>> 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 ;;
>>> @@ -1249,7 +1266,7 @@ EOF
>>> 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:*:*)
>>> @@ -1318,11 +1335,11 @@ EOF
>>> 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_
>>> @@ -1518,3 +1535,4 @@ exit 1
>>> # time-stamp-format: "%:y-%02m-%02d"
>>> # time-stamp-end: "'"
>>> # End:
>>> +
>>> diff --git a/autoconf/configure.ac b/autoconf/configure.ac
>>> index 2f381fe..ee7eb29 100644
>>> --- a/autoconf/configure.ac
>>> +++ b/autoconf/configure.ac
>>> @@ -1732,6 +1732,11 @@ fi
>>> dnl OCaml findlib META file
>>> AC_CONFIG_FILES([bindings/ocaml/llvm/META.llvm])
>>>
>>> +dnl Add --program-prefix value to Makefile.rules. Already an ARG variable.
>>> +test "x$program_prefix" = "xNONE"&& program_prefix=""
>>> +AC_SUBST([program_prefix])
>>> +
>>> +
>>> dnl Do special configuration of Makefiles
>>> AC_CONFIG_COMMANDS([setup],,[llvm_src="${srcdir}"])
>>> AC_CONFIG_MAKEFILE(Makefile)
>>> diff --git a/configure b/configure
>>> index 2bbfe59..3664774 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -792,6 +792,7 @@ OCAML_LIBDIR
>>> ENABLE_VISIBILITY_INLINES_HIDDEN
>>> RPATH
>>> RDYNAMIC
>>> +program_prefix
>>> LIBOBJS
>>> LTLIBOBJS'
>>> ac_subst_files=''
>>> @@ -10316,7 +10317,7 @@ else
>>> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>>> lt_status=$lt_dlunknown
>>> cat> conftest.$ac_ext<<EOF
>>> -#line 10319 "configure"
>>> +#line 10320 "configure"
>>> #include "confdefs.h"
>>>
>>> #if HAVE_DLFCN_H
>>> @@ -21409,6 +21410,10 @@ fi
>>> ac_config_files="$ac_config_files bindings/ocaml/llvm/META.llvm"
>>>
>>>
>>> +test "x$program_prefix" = "xNONE"&& program_prefix=""
>>> +
>>> +
>>> +
>>> ac_config_commands="$ac_config_commands setup"
>>>
>>> ac_config_commands="$ac_config_commands Makefile"
>>> @@ -22334,11 +22339,12 @@ OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
>>> ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
>>> RPATH!$RPATH$ac_delim
>>> RDYNAMIC!$RDYNAMIC$ac_delim
>>> +program_prefix!$program_prefix$ac_delim
>>> LIBOBJS!$LIBOBJS$ac_delim
>>> LTLIBOBJS!$LTLIBOBJS$ac_delim
>>> _ACEOF
>>>
>>> - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
>>> + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
>>> break
>>> elif $ac_last_try; then
>>> { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS">&5
>>> @@ -22357,7 +22363,7 @@ fi
>>>
>>> cat>>$CONFIG_STATUS<<_ACEOF
>>> cat>"\$tmp/subs-2.sed"<<\CEOF$ac_eof
>>> -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
>>> +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
>>> _ACEOF
>>> sed '
>>> s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
>>> @@ -22370,8 +22376,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
>>> '>>$CONFIG_STATUS<conf$$subs.sed
>>> rm -f conf$$subs.sed
>>> cat>>$CONFIG_STATUS<<_ACEOF
>>> -:end
>>> -s/|#_!!_#|//g
>>> CEOF$ac_eof
>>> _ACEOF
>>>
>>> @@ -22619,7 +22623,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
>>> s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
>>> s&@INSTALL@&$ac_INSTALL&;t t
>>> $ac_datarootdir_hack
>>> -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed">$tmp/out
>>> +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g'>$tmp/out
>>>
>>> test -z "$ac_datarootdir_hack$ac_datarootdir_seen"&&
>>> { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; }&&
>>> diff --git a/projects/sample/Makefile.llvm.rules b/projects/sample/Makefile.llvm.rules
>>> index a655302..7ed1c1b 100644
>>> --- a/projects/sample/Makefile.llvm.rules
>>> +++ b/projects/sample/Makefile.llvm.rules
>>> @@ -1437,7 +1437,7 @@ install-local::
>>> uninstall-local::
>>> $(Echo) Uninstall circumvented with NO_INSTALL
>>> else
>>> -DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLEXENAME)
>>> +DestTool = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(TOOLEXENAME)
>>>
>>> install-local:: $(DestTool)
>>>
>>> @@ -1451,7 +1451,7 @@ uninstall-local::
>>>
>>> # TOOLALIAS install.
>>> ifdef TOOLALIAS
>>> -DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(TOOLALIAS)$(EXEEXT)
>>> +DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT)
>>>
>>> install-local:: $(DestToolAlias)
>>>
>>> diff --git a/projects/sample/autoconf/config.guess b/projects/sample/autoconf/config.guess
>>> index f7dd69e..00a2c45 100755
>>> --- a/projects/sample/autoconf/config.guess
>>> +++ b/projects/sample/autoconf/config.guess
>>> @@ -2,9 +2,9 @@
>>> # 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 Free Software Foundation, Inc.
>>>
>>> -timestamp='2011-08-20'
>>> +timestamp='2012-08-14'
>>>
>>> # 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
>>> @@ -17,9 +17,7 @@ timestamp='2011-08-20'
>>> # 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
>>> @@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
>>>
>>> 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
>>> +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."
>>> @@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
>>> 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
>>> @@ -202,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>>> # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
>>> echo "${machine}-${os}${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}
>>> @@ -803,9 +805,15 @@ EOF
>>> i*:CYGWIN*:*)
>>> echo ${UNAME_MACHINE}-pc-cygwin
>>> exit ;;
>>> + *:MINGW64*:*)
>>> + echo ${UNAME_MACHINE}-pc-mingw64
>>> + exit ;;
>>> *:MINGW*:*)
>>> echo ${UNAME_MACHINE}-pc-mingw32
>>> exit ;;
>>> + i*:MSYS*:*)
>>> + echo ${UNAME_MACHINE}-pc-msys
>>> + exit ;;
>>> i*:windows32*:*)
>>> # uname -m includes "-pc" on this system.
>>> echo ${UNAME_MACHINE}-mingw32
>>> @@ -860,6 +868,13 @@ EOF
>>> i*86:Minix:*:*)
>>> echo ${UNAME_MACHINE}-pc-minix
>>> exit ;;
>>> + 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
>>> EV5) UNAME_MACHINE=alphaev5 ;;
>>> @@ -894,13 +909,16 @@ EOF
>>> 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
>>> @@ -942,7 +960,7 @@ EOF
>>> 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
>>> @@ -983,7 +1001,7 @@ EOF
>>> 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
>>> @@ -1190,6 +1208,9 @@ EOF
>>> 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 ;;
>>> @@ -1245,7 +1266,7 @@ EOF
>>> 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:*:*)
>>> @@ -1314,11 +1335,11 @@ EOF
>>> 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_
>>> @@ -1514,3 +1535,4 @@ exit 1
>>> # time-stamp-format: "%:y-%02m-%02d"
>>> # time-stamp-end: "'"
>>> # End:
>>> +
>>> diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
>>> index e8c8692..b20b6bf 100644
>>> --- a/tools/llvm-config/Makefile
>>> +++ b/tools/llvm-config/Makefile
>>> @@ -63,5 +63,5 @@ ifeq ($(LLVM_CROSS_COMPILING),1)
>>> install:: $(DESTDIR)$(PROJ_bindir)
>>> $(Echo) Installing llvm-config-host
>>> $(Verb) $(ProgInstall) $(BuildLLVMToolDir)/llvm-config \
>>> - $(DESTDIR)$(PROJ_bindir)/llvm-config-host
>>> + $(DESTDIR)$(PROJ_bindir)/$(program_prefix)llvm-config-host
>>> endif
>>> --
>>> 1.7.8.3
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>> --
>> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
--
Rick Foos
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
More information about the llvm-commits
mailing list