From: Charles W. <cwi...@us...> - 2011-11-06 21:41:41
|
* config.guess (i*:MSYS*:*): New. * config.sub: Recognize -msys*. * testsuite/config-guess.data: Add test case. --- config.guess | 5 ++++- config.sub | 8 ++++++-- testsuite/config-guess.data | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) For many years, the MinGW/MSYS team has resisted adding the msys triple to config.guess/config.sub. However, recent discussions resulted in a new decision to promulgate support for msys "upstream" -- see Re: Time to add msys to config.{guess,sub}? http://article.gmane.org/gmane.comp.gnu.mingw.devel/4497 This patch represents the way all existing msys packages have been internally patching config.guess/config.sub for years (well, other than the timestamps and test data). -- Chuck diff --git a/config.guess b/config.guess index 43f0cdb..7486cf9 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011 Free Software Foundation, Inc. -timestamp='2011-10-01' +timestamp='2011-11-06' # 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 @@ -806,6 +806,9 @@ EOF *: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 diff --git a/config.sub b/config.sub index 78176a4..1247c60 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011 Free Software Foundation, Inc. -timestamp='2011-10-29' +timestamp='2011-11-06' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -816,6 +816,10 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -1343,7 +1347,7 @@ case $os in | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data index ac8e858..90fb1e2 100644 --- a/testsuite/config-guess.data +++ b/testsuite/config-guess.data @@ -48,3 +48,4 @@ tilegx 2.6.36 Linux ignored tilegx-unknown-linux-gnu NEO-1 1.0 NONSTOP_KERNEL ignored neo-tandem-nsk1.0 NSE-1 1.0 NONSTOP_KERNEL ignored nse-tandem-nsk1.0 hexagon 1.0 Linux ignored hexagon-unknown-linux-gnu +i686 1.0.17(0.48/3/2) MSYS_NT-6.0 ignored i686-pc-msys -- 1.7.5.1 |