diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-27 11:45:21 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-27 11:45:47 -0800 |
| commit | ee7514b91beb254a7dc62f618046d34036555cea (patch) | |
| tree | 7299efc4b14731bb30d013bb9594b2e7834b1d8d /build-aux | |
| parent | a8576aba8fa45549985566bc8be4921dce508dd9 (diff) | |
| download | emacs-ee7514b91beb254a7dc62f618046d34036555cea.tar.gz | |
Update from Gnulib
* build-aux/config.guess, lib/regcomp.c, lib/regex.c:
* lib/regex_internal.h, lib/regexec.c: Copy from Gnulib.
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/config.guess | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess index 94c4ac154a3..28bec27b307 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -391,15 +391,20 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - case `isainfo -b` in - 32) - echo i386-pc-solaris2"$UNAME_REL" - ;; - 64) - echo x86_64-pc-solaris2"$UNAME_REL" - ;; - esac + set_cc_for_build + SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH=x86_64 + fi + fi + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize |