diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-12-19 17:36:10 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-12-19 17:36:10 +0000 |
| commit | 21fea2e228c4e6f83bf51133de72f70fc61a6b6c (patch) | |
| tree | 4ce5521b35de028349a255cbe1c4ae99dd8dcdda /scripts/config.guess | |
| parent | 6f6fc48226fa2144379d394b0ac91447a27c1639 (diff) | |
| download | glibc-21fea2e228c4e6f83bf51133de72f70fc61a6b6c.tar.gz glibc-21fea2e228c4e6f83bf51133de72f70fc61a6b6c.tar.xz glibc-21fea2e228c4e6f83bf51133de72f70fc61a6b6c.zip | |
Update texinfo.tex, config.guess, config.sub from upstream.
This patch updates various miscellaneous files we take from upstream GNU sources (texinfo.texi, config.guess, config.sub - various others haven't changed upstream since we last updated them) to their current upstream versions. Tested x86_64. * manual/texinfo.tex: Update to version 2013-11-26.10 with trailing whitespace removed. * scripts/config.guess: Update to version 2013-11-29. * scripts/config.sub: Update to version 2013-10-01.
Diffstat (limited to 'scripts/config.guess')
| -rwxr-xr-x | scripts/config.guess | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/scripts/config.guess b/scripts/config.guess index 516ac6c173..9afd676206 100755 --- a/scripts/config.guess +++ b/scripts/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-05-16' +timestamp='2013-11-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 @@ -1260,16 +1260,26 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; |