nutcracker 0.2.4.1 → 0.2.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. data/README.md +28 -10
  2. data/Rakefile +5 -19
  3. data/bin/nutcracker +6 -1
  4. data/ext/nutcracker/ChangeLog +9 -0
  5. data/ext/nutcracker/Makefile.in +54 -29
  6. data/ext/nutcracker/README.md +13 -11
  7. data/ext/nutcracker/aclocal.m4 +46 -26
  8. data/ext/nutcracker/config/config.guess +209 -240
  9. data/ext/nutcracker/config/config.sub +157 -70
  10. data/ext/nutcracker/config/depcomp +66 -8
  11. data/ext/nutcracker/config/install-sh +18 -11
  12. data/ext/nutcracker/config/ltmain.sh +2632 -1384
  13. data/ext/nutcracker/config/missing +4 -49
  14. data/ext/nutcracker/configure +2866 -2118
  15. data/ext/nutcracker/configure.ac +1 -1
  16. data/ext/nutcracker/contrib/Makefile.in +17 -10
  17. data/ext/nutcracker/m4/libtool.m4 +1437 -812
  18. data/ext/nutcracker/m4/ltoptions.m4 +24 -8
  19. data/ext/nutcracker/m4/ltversion.m4 +6 -6
  20. data/ext/nutcracker/m4/lt~obsolete.m4 +9 -3
  21. data/ext/nutcracker/notes/recommendation.md +21 -2
  22. data/ext/nutcracker/notes/redis.md +9 -9
  23. data/ext/nutcracker/scripts/redis-check.sh +9 -0
  24. data/ext/nutcracker/src/Makefile.in +18 -11
  25. data/ext/nutcracker/src/hashkit/Makefile.am +1 -0
  26. data/ext/nutcracker/src/hashkit/Makefile.in +23 -13
  27. data/ext/nutcracker/src/hashkit/nc_crc16.c +66 -0
  28. data/ext/nutcracker/src/hashkit/nc_hashkit.h +2 -0
  29. data/ext/nutcracker/src/hashkit/nc_modula.c +18 -6
  30. data/ext/nutcracker/src/nc_conf.c +14 -35
  31. data/ext/nutcracker/src/nc_conf.h +1 -1
  32. data/ext/nutcracker/src/nc_message.h +2 -0
  33. data/ext/nutcracker/src/nc_server.c +9 -7
  34. data/ext/nutcracker/src/proto/Makefile.in +16 -9
  35. data/ext/nutcracker/src/proto/nc_redis.c +17 -4
  36. data/lib/nutcracker/version.rb +1 -1
  37. data/lib/nutcracker.rb +60 -2
  38. metadata +3 -2
@@ -1,10 +1,10 @@
1
1
  #! /bin/sh
2
2
  # Attempt to guess a canonical system name.
3
3
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5
- # Free Software Foundation, Inc.
4
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
+ # 2011, 2012 Free Software Foundation, Inc.
6
6
 
7
- timestamp='2009-04-27'
7
+ timestamp='2012-02-10'
8
8
 
9
9
  # This file is free software; you can redistribute it and/or modify it
10
10
  # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2009-04-27'
17
17
  # General Public License for more details.
18
18
  #
19
19
  # You should have received a copy of the GNU General Public License
20
- # along with this program; if not, write to the Free Software
21
- # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
22
- # 02110-1301, USA.
20
+ # along with this program; if not, see <http://www.gnu.org/licenses/>.
23
21
  #
24
22
  # As a special exception to the GNU General Public License, if you
25
23
  # distribute this file as part of a program that contains a
@@ -27,16 +25,16 @@ timestamp='2009-04-27'
27
25
  # the same distribution terms that you use for the rest of that program.
28
26
 
29
27
 
30
- # Originally written by Per Bothner <per@bothner.com>.
31
- # Please send patches to <config-patches@gnu.org>. Submit a context
32
- # diff and a properly formatted ChangeLog entry.
28
+ # Originally written by Per Bothner. Please send patches (context
29
+ # diff format) to <config-patches@gnu.org> and include a ChangeLog
30
+ # entry.
33
31
  #
34
32
  # This script attempts to guess a canonical system name similar to
35
33
  # config.sub. If it succeeds, it prints the system name on stdout, and
36
34
  # exits with 0. Otherwise, it exits with 1.
37
35
  #
38
- # The plan is that this can be called by configure scripts if you
39
- # don't specify an explicit build system type.
36
+ # You can get the latest version of this script from:
37
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
40
38
 
41
39
  me=`echo "$0" | sed -e 's,.*/,,'`
42
40
 
@@ -56,8 +54,9 @@ version="\
56
54
  GNU config.guess ($timestamp)
57
55
 
58
56
  Originally written by Per Bothner.
59
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
60
- 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
57
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
58
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
59
+ Free Software Foundation, Inc.
61
60
 
62
61
  This is free software; see the source for copying conditions. There is NO
63
62
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
144
143
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
145
144
  *:NetBSD:*:*)
146
145
  # NetBSD (nbsd) targets should (where applicable) match one or
147
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
146
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
148
147
  # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
149
148
  # switched to ELF, *-*-netbsd* would select the old
150
149
  # object file format. This provides both forward
@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
170
169
  arm*|i386|m68k|ns32k|sh3*|sparc|vax)
171
170
  eval $set_cc_for_build
172
171
  if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
173
- | grep __ELF__ >/dev/null
172
+ | grep -q __ELF__
174
173
  then
175
174
  # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
176
175
  # Return netbsd for either. FIX?
@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
180
179
  fi
181
180
  ;;
182
181
  *)
183
- os=netbsd
182
+ os=netbsd
184
183
  ;;
185
184
  esac
186
185
  # The OS release
@@ -223,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
223
222
  UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
224
223
  ;;
225
224
  *5.*)
226
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
225
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
227
226
  ;;
228
227
  esac
229
228
  # According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
269
268
  # A Xn.n version is an unreleased experimental baselevel.
270
269
  # 1.2 uses "1.2" for uname -r.
271
270
  echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
272
- exit ;;
271
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
272
+ exitcode=$?
273
+ trap '' 0
274
+ exit $exitcode ;;
273
275
  Alpha\ *:Windows_NT*:*)
274
276
  # How do we know it's Interix rather than the generic POSIX subsystem?
275
277
  # Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
295
297
  echo s390-ibm-zvmoe
296
298
  exit ;;
297
299
  *:OS400:*:*)
298
- echo powerpc-ibm-os400
300
+ echo powerpc-ibm-os400
299
301
  exit ;;
300
302
  arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
301
303
  echo arm-acorn-riscix${UNAME_RELEASE}
@@ -333,6 +335,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
333
335
  sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
334
336
  echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
335
337
  exit ;;
338
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
339
+ echo i386-pc-auroraux${UNAME_RELEASE}
340
+ exit ;;
336
341
  i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
337
342
  eval $set_cc_for_build
338
343
  SUN_ARCH="i386"
@@ -391,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
391
396
  # MiNT. But MiNT is downward compatible to TOS, so this should
392
397
  # be no problem.
393
398
  atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
394
- echo m68k-atari-mint${UNAME_RELEASE}
399
+ echo m68k-atari-mint${UNAME_RELEASE}
395
400
  exit ;;
396
401
  atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
397
402
  echo m68k-atari-mint${UNAME_RELEASE}
398
- exit ;;
403
+ exit ;;
399
404
  *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
400
- echo m68k-atari-mint${UNAME_RELEASE}
405
+ echo m68k-atari-mint${UNAME_RELEASE}
401
406
  exit ;;
402
407
  milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
403
- echo m68k-milan-mint${UNAME_RELEASE}
404
- exit ;;
408
+ echo m68k-milan-mint${UNAME_RELEASE}
409
+ exit ;;
405
410
  hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
406
- echo m68k-hades-mint${UNAME_RELEASE}
407
- exit ;;
411
+ echo m68k-hades-mint${UNAME_RELEASE}
412
+ exit ;;
408
413
  *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
409
- echo m68k-unknown-mint${UNAME_RELEASE}
410
- exit ;;
414
+ echo m68k-unknown-mint${UNAME_RELEASE}
415
+ exit ;;
411
416
  m68k:machten:*:*)
412
417
  echo m68k-apple-machten${UNAME_RELEASE}
413
418
  exit ;;
@@ -477,8 +482,8 @@ EOF
477
482
  echo m88k-motorola-sysv3
478
483
  exit ;;
479
484
  AViiON:dgux:*:*)
480
- # DG/UX returns AViiON for all architectures
481
- UNAME_PROCESSOR=`/usr/bin/uname -p`
485
+ # DG/UX returns AViiON for all architectures
486
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
482
487
  if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
483
488
  then
484
489
  if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -491,7 +496,7 @@ EOF
491
496
  else
492
497
  echo i586-dg-dgux${UNAME_RELEASE}
493
498
  fi
494
- exit ;;
499
+ exit ;;
495
500
  M88*:DolphinOS:*:*) # DolphinOS (SVR3)
496
501
  echo m88k-dolphin-sysv3
497
502
  exit ;;
@@ -548,7 +553,7 @@ EOF
548
553
  echo rs6000-ibm-aix3.2
549
554
  fi
550
555
  exit ;;
551
- *:AIX:*:[456])
556
+ *:AIX:*:[4567])
552
557
  IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
553
558
  if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
554
559
  IBM_ARCH=rs6000
@@ -591,52 +596,52 @@ EOF
591
596
  9000/[678][0-9][0-9])
592
597
  if [ -x /usr/bin/getconf ]; then
593
598
  sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
594
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
595
- case "${sc_cpu_version}" in
596
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
597
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
598
- 532) # CPU_PA_RISC2_0
599
- case "${sc_kernel_bits}" in
600
- 32) HP_ARCH="hppa2.0n" ;;
601
- 64) HP_ARCH="hppa2.0w" ;;
599
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
600
+ case "${sc_cpu_version}" in
601
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
602
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
603
+ 532) # CPU_PA_RISC2_0
604
+ case "${sc_kernel_bits}" in
605
+ 32) HP_ARCH="hppa2.0n" ;;
606
+ 64) HP_ARCH="hppa2.0w" ;;
602
607
  '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
603
- esac ;;
604
- esac
608
+ esac ;;
609
+ esac
605
610
  fi
606
611
  if [ "${HP_ARCH}" = "" ]; then
607
612
  eval $set_cc_for_build
608
- sed 's/^ //' << EOF >$dummy.c
613
+ sed 's/^ //' << EOF >$dummy.c
609
614
 
610
- #define _HPUX_SOURCE
611
- #include <stdlib.h>
612
- #include <unistd.h>
615
+ #define _HPUX_SOURCE
616
+ #include <stdlib.h>
617
+ #include <unistd.h>
613
618
 
614
- int main ()
615
- {
616
- #if defined(_SC_KERNEL_BITS)
617
- long bits = sysconf(_SC_KERNEL_BITS);
618
- #endif
619
- long cpu = sysconf (_SC_CPU_VERSION);
619
+ int main ()
620
+ {
621
+ #if defined(_SC_KERNEL_BITS)
622
+ long bits = sysconf(_SC_KERNEL_BITS);
623
+ #endif
624
+ long cpu = sysconf (_SC_CPU_VERSION);
620
625
 
621
- switch (cpu)
622
- {
623
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
624
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
625
- case CPU_PA_RISC2_0:
626
- #if defined(_SC_KERNEL_BITS)
627
- switch (bits)
628
- {
629
- case 64: puts ("hppa2.0w"); break;
630
- case 32: puts ("hppa2.0n"); break;
631
- default: puts ("hppa2.0"); break;
632
- } break;
633
- #else /* !defined(_SC_KERNEL_BITS) */
634
- puts ("hppa2.0"); break;
635
- #endif
636
- default: puts ("hppa1.0"); break;
637
- }
638
- exit (0);
639
- }
626
+ switch (cpu)
627
+ {
628
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
629
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
630
+ case CPU_PA_RISC2_0:
631
+ #if defined(_SC_KERNEL_BITS)
632
+ switch (bits)
633
+ {
634
+ case 64: puts ("hppa2.0w"); break;
635
+ case 32: puts ("hppa2.0n"); break;
636
+ default: puts ("hppa2.0"); break;
637
+ } break;
638
+ #else /* !defined(_SC_KERNEL_BITS) */
639
+ puts ("hppa2.0"); break;
640
+ #endif
641
+ default: puts ("hppa1.0"); break;
642
+ }
643
+ exit (0);
644
+ }
640
645
  EOF
641
646
  (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
642
647
  test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -656,7 +661,7 @@ EOF
656
661
  # => hppa64-hp-hpux11.23
657
662
 
658
663
  if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
659
- grep __LP64__ >/dev/null
664
+ grep -q __LP64__
660
665
  then
661
666
  HP_ARCH="hppa2.0w"
662
667
  else
@@ -727,22 +732,22 @@ EOF
727
732
  exit ;;
728
733
  C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
729
734
  echo c1-convex-bsd
730
- exit ;;
735
+ exit ;;
731
736
  C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
732
737
  if getsysinfo -f scalar_acc
733
738
  then echo c32-convex-bsd
734
739
  else echo c2-convex-bsd
735
740
  fi
736
- exit ;;
741
+ exit ;;
737
742
  C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
738
743
  echo c34-convex-bsd
739
- exit ;;
744
+ exit ;;
740
745
  C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
741
746
  echo c38-convex-bsd
742
- exit ;;
747
+ exit ;;
743
748
  C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
744
749
  echo c4-convex-bsd
745
- exit ;;
750
+ exit ;;
746
751
  CRAY*Y-MP:*:*:*)
747
752
  echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
748
753
  exit ;;
@@ -766,14 +771,14 @@ EOF
766
771
  exit ;;
767
772
  F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
768
773
  FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
769
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
770
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
771
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
772
- exit ;;
774
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
775
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
776
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
777
+ exit ;;
773
778
  5000:UNIX_System_V:4.*:*)
774
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
775
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
776
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
779
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
780
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
781
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
777
782
  exit ;;
778
783
  i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
779
784
  echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -785,13 +790,12 @@ EOF
785
790
  echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
786
791
  exit ;;
787
792
  *:FreeBSD:*:*)
788
- case ${UNAME_MACHINE} in
789
- pc98)
790
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
793
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
794
+ case ${UNAME_PROCESSOR} in
791
795
  amd64)
792
796
  echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
793
797
  *)
794
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
798
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
795
799
  esac
796
800
  exit ;;
797
801
  i*:CYGWIN*:*)
@@ -800,19 +804,22 @@ EOF
800
804
  *:MINGW*:*)
801
805
  echo ${UNAME_MACHINE}-pc-mingw32
802
806
  exit ;;
807
+ i*:MSYS*:*)
808
+ echo ${UNAME_MACHINE}-pc-msys
809
+ exit ;;
803
810
  i*:windows32*:*)
804
- # uname -m includes "-pc" on this system.
805
- echo ${UNAME_MACHINE}-mingw32
811
+ # uname -m includes "-pc" on this system.
812
+ echo ${UNAME_MACHINE}-mingw32
806
813
  exit ;;
807
814
  i*:PW*:*)
808
815
  echo ${UNAME_MACHINE}-pc-pw32
809
816
  exit ;;
810
- *:Interix*:[3456]*)
811
- case ${UNAME_MACHINE} in
817
+ *:Interix*:*)
818
+ case ${UNAME_MACHINE} in
812
819
  x86)
813
820
  echo i586-pc-interix${UNAME_RELEASE}
814
821
  exit ;;
815
- EM64T | authenticamd | genuineintel)
822
+ authenticamd | genuineintel | EM64T)
816
823
  echo x86_64-unknown-interix${UNAME_RELEASE}
817
824
  exit ;;
818
825
  IA64)
@@ -822,6 +829,9 @@ EOF
822
829
  [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
823
830
  echo i${UNAME_MACHINE}-pc-mks
824
831
  exit ;;
832
+ 8664:Windows_NT:*)
833
+ echo x86_64-pc-mks
834
+ exit ;;
825
835
  i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
826
836
  # How do we know it's Interix rather than the generic POSIX subsystem?
827
837
  # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +861,27 @@ EOF
851
861
  i*86:Minix:*:*)
852
862
  echo ${UNAME_MACHINE}-pc-minix
853
863
  exit ;;
864
+ aarch64:Linux:*:*)
865
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
866
+ exit ;;
867
+ aarch64_be:Linux:*:*)
868
+ UNAME_MACHINE=aarch64_be
869
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
870
+ exit ;;
871
+ alpha:Linux:*:*)
872
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
873
+ EV5) UNAME_MACHINE=alphaev5 ;;
874
+ EV56) UNAME_MACHINE=alphaev56 ;;
875
+ PCA56) UNAME_MACHINE=alphapca56 ;;
876
+ PCA57) UNAME_MACHINE=alphapca56 ;;
877
+ EV6) UNAME_MACHINE=alphaev6 ;;
878
+ EV67) UNAME_MACHINE=alphaev67 ;;
879
+ EV68*) UNAME_MACHINE=alphaev68 ;;
880
+ esac
881
+ objdump --private-headers /bin/sh | grep -q ld.so.1
882
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
883
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
884
+ exit ;;
854
885
  arm*:Linux:*:*)
855
886
  eval $set_cc_for_build
856
887
  if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -858,20 +889,40 @@ EOF
858
889
  then
859
890
  echo ${UNAME_MACHINE}-unknown-linux-gnu
860
891
  else
861
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
892
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
893
+ | grep -q __ARM_PCS_VFP
894
+ then
895
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
896
+ else
897
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
898
+ fi
862
899
  fi
863
900
  exit ;;
864
901
  avr32*:Linux:*:*)
865
902
  echo ${UNAME_MACHINE}-unknown-linux-gnu
866
903
  exit ;;
867
904
  cris:Linux:*:*)
868
- echo cris-axis-linux-gnu
905
+ echo ${UNAME_MACHINE}-axis-linux-gnu
869
906
  exit ;;
870
907
  crisv32:Linux:*:*)
871
- echo crisv32-axis-linux-gnu
908
+ echo ${UNAME_MACHINE}-axis-linux-gnu
872
909
  exit ;;
873
910
  frv:Linux:*:*)
874
- echo frv-unknown-linux-gnu
911
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
912
+ exit ;;
913
+ hexagon:Linux:*:*)
914
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
915
+ exit ;;
916
+ i*86:Linux:*:*)
917
+ LIBC=gnu
918
+ eval $set_cc_for_build
919
+ sed 's/^ //' << EOF >$dummy.c
920
+ #ifdef __dietlibc__
921
+ LIBC=dietlibc
922
+ #endif
923
+ EOF
924
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
925
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
875
926
  exit ;;
876
927
  ia64:Linux:*:*)
877
928
  echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -882,78 +933,34 @@ EOF
882
933
  m68*:Linux:*:*)
883
934
  echo ${UNAME_MACHINE}-unknown-linux-gnu
884
935
  exit ;;
885
- mips:Linux:*:*)
936
+ mips:Linux:*:* | mips64:Linux:*:*)
886
937
  eval $set_cc_for_build
887
938
  sed 's/^ //' << EOF >$dummy.c
888
939
  #undef CPU
889
- #undef mips
890
- #undef mipsel
940
+ #undef ${UNAME_MACHINE}
941
+ #undef ${UNAME_MACHINE}el
891
942
  #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
892
- CPU=mipsel
943
+ CPU=${UNAME_MACHINE}el
893
944
  #else
894
945
  #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
895
- CPU=mips
946
+ CPU=${UNAME_MACHINE}
896
947
  #else
897
948
  CPU=
898
949
  #endif
899
950
  #endif
900
951
  EOF
901
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
902
- /^CPU/{
903
- s: ::g
904
- p
905
- }'`"
906
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
907
- ;;
908
- mips64:Linux:*:*)
909
- eval $set_cc_for_build
910
- sed 's/^ //' << EOF >$dummy.c
911
- #undef CPU
912
- #undef mips64
913
- #undef mips64el
914
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
915
- CPU=mips64el
916
- #else
917
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
918
- CPU=mips64
919
- #else
920
- CPU=
921
- #endif
922
- #endif
923
- EOF
924
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
925
- /^CPU/{
926
- s: ::g
927
- p
928
- }'`"
952
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
929
953
  test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
930
954
  ;;
931
955
  or32:Linux:*:*)
932
- echo or32-unknown-linux-gnu
933
- exit ;;
934
- ppc:Linux:*:*)
935
- echo powerpc-unknown-linux-gnu
936
- exit ;;
937
- ppc64:Linux:*:*)
938
- echo powerpc64-unknown-linux-gnu
939
- exit ;;
940
- alpha:Linux:*:*)
941
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
942
- EV5) UNAME_MACHINE=alphaev5 ;;
943
- EV56) UNAME_MACHINE=alphaev56 ;;
944
- PCA56) UNAME_MACHINE=alphapca56 ;;
945
- PCA57) UNAME_MACHINE=alphapca56 ;;
946
- EV6) UNAME_MACHINE=alphaev6 ;;
947
- EV67) UNAME_MACHINE=alphaev67 ;;
948
- EV68*) UNAME_MACHINE=alphaev68 ;;
949
- esac
950
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
951
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
952
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
956
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
953
957
  exit ;;
954
958
  padre:Linux:*:*)
955
959
  echo sparc-unknown-linux-gnu
956
960
  exit ;;
961
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
962
+ echo hppa64-unknown-linux-gnu
963
+ exit ;;
957
964
  parisc:Linux:*:* | hppa:Linux:*:*)
958
965
  # Look for CPU level
959
966
  case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,14 +969,17 @@ EOF
962
969
  *) echo hppa-unknown-linux-gnu ;;
963
970
  esac
964
971
  exit ;;
965
- parisc64:Linux:*:* | hppa64:Linux:*:*)
966
- echo hppa64-unknown-linux-gnu
972
+ ppc64:Linux:*:*)
973
+ echo powerpc64-unknown-linux-gnu
974
+ exit ;;
975
+ ppc:Linux:*:*)
976
+ echo powerpc-unknown-linux-gnu
967
977
  exit ;;
968
978
  s390:Linux:*:* | s390x:Linux:*:*)
969
979
  echo ${UNAME_MACHINE}-ibm-linux
970
980
  exit ;;
971
981
  sh64*:Linux:*:*)
972
- echo ${UNAME_MACHINE}-unknown-linux-gnu
982
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
973
983
  exit ;;
974
984
  sh*:Linux:*:*)
975
985
  echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -977,75 +987,18 @@ EOF
977
987
  sparc:Linux:*:* | sparc64:Linux:*:*)
978
988
  echo ${UNAME_MACHINE}-unknown-linux-gnu
979
989
  exit ;;
990
+ tile*:Linux:*:*)
991
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
992
+ exit ;;
980
993
  vax:Linux:*:*)
981
994
  echo ${UNAME_MACHINE}-dec-linux-gnu
982
995
  exit ;;
983
996
  x86_64:Linux:*:*)
984
- echo x86_64-unknown-linux-gnu
997
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
985
998
  exit ;;
986
999
  xtensa*:Linux:*:*)
987
- echo ${UNAME_MACHINE}-unknown-linux-gnu
1000
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
988
1001
  exit ;;
989
- i*86:Linux:*:*)
990
- # The BFD linker knows what the default object file format is, so
991
- # first see if it will tell us. cd to the root directory to prevent
992
- # problems with other programs or directories called `ld' in the path.
993
- # Set LC_ALL=C to ensure ld outputs messages in English.
994
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
995
- | sed -ne '/supported targets:/!d
996
- s/[ ][ ]*/ /g
997
- s/.*supported targets: *//
998
- s/ .*//
999
- p'`
1000
- case "$ld_supported_targets" in
1001
- elf32-i386)
1002
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
1003
- ;;
1004
- a.out-i386-linux)
1005
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
1006
- exit ;;
1007
- "")
1008
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
1009
- # one that does not give us useful --help.
1010
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
1011
- exit ;;
1012
- esac
1013
- # Determine whether the default compiler is a.out or elf
1014
- eval $set_cc_for_build
1015
- sed 's/^ //' << EOF >$dummy.c
1016
- #include <features.h>
1017
- #ifdef __ELF__
1018
- # ifdef __GLIBC__
1019
- # if __GLIBC__ >= 2
1020
- LIBC=gnu
1021
- # else
1022
- LIBC=gnulibc1
1023
- # endif
1024
- # else
1025
- LIBC=gnulibc1
1026
- # endif
1027
- #else
1028
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1029
- LIBC=gnu
1030
- #else
1031
- LIBC=gnuaout
1032
- #endif
1033
- #endif
1034
- #ifdef __dietlibc__
1035
- LIBC=dietlibc
1036
- #endif
1037
- EOF
1038
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1039
- /^LIBC/{
1040
- s: ::g
1041
- p
1042
- }'`"
1043
- test x"${LIBC}" != x && {
1044
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1045
- exit
1046
- }
1047
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1048
- ;;
1049
1002
  i*86:DYNIX/ptx:4*:*)
1050
1003
  # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1051
1004
  # earlier versions are messed up and put the nodename in both
@@ -1053,11 +1006,11 @@ EOF
1053
1006
  echo i386-sequent-sysv4
1054
1007
  exit ;;
1055
1008
  i*86:UNIX_SV:4.2MP:2.*)
1056
- # Unixware is an offshoot of SVR4, but it has its own version
1057
- # number series starting with 2...
1058
- # I am not positive that other SVR4 systems won't match this,
1009
+ # Unixware is an offshoot of SVR4, but it has its own version
1010
+ # number series starting with 2...
1011
+ # I am not positive that other SVR4 systems won't match this,
1059
1012
  # I just have to hope. -- rms.
1060
- # Use sysv4.2uw... so that sysv4* matches it.
1013
+ # Use sysv4.2uw... so that sysv4* matches it.
1061
1014
  echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1062
1015
  exit ;;
1063
1016
  i*86:OS/2:*:*)
@@ -1074,7 +1027,7 @@ EOF
1074
1027
  i*86:syllable:*:*)
1075
1028
  echo ${UNAME_MACHINE}-pc-syllable
1076
1029
  exit ;;
1077
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1030
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1078
1031
  echo i386-unknown-lynxos${UNAME_RELEASE}
1079
1032
  exit ;;
1080
1033
  i*86:*DOS:*:*)
@@ -1089,7 +1042,7 @@ EOF
1089
1042
  fi
1090
1043
  exit ;;
1091
1044
  i*86:*:5:[678]*)
1092
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
1045
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
1093
1046
  case `/bin/uname -X | grep "^Machine"` in
1094
1047
  *486*) UNAME_MACHINE=i486 ;;
1095
1048
  *Pentium) UNAME_MACHINE=i586 ;;
@@ -1117,13 +1070,13 @@ EOF
1117
1070
  exit ;;
1118
1071
  pc:*:*:*)
1119
1072
  # Left here for compatibility:
1120
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
1121
- # the processor, so we play safe by assuming i586.
1073
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
1074
+ # the processor, so we play safe by assuming i586.
1122
1075
  # Note: whatever this is, it MUST be the same as what config.sub
1123
1076
  # prints for the "djgpp" host, or else GDB configury will decide that
1124
1077
  # this is a cross-build.
1125
1078
  echo i586-pc-msdosdjgpp
1126
- exit ;;
1079
+ exit ;;
1127
1080
  Intel:Mach:3*:*)
1128
1081
  echo i386-pc-mach3
1129
1082
  exit ;;
@@ -1158,8 +1111,8 @@ EOF
1158
1111
  /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1159
1112
  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1160
1113
  3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1161
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1162
- && { echo i486-ncr-sysv4; exit; } ;;
1114
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1115
+ && { echo i486-ncr-sysv4; exit; } ;;
1163
1116
  NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1164
1117
  OS_REL='.3'
1165
1118
  test -r /etc/.relid \
@@ -1182,7 +1135,7 @@ EOF
1182
1135
  rs6000:LynxOS:2.*:*)
1183
1136
  echo rs6000-unknown-lynxos${UNAME_RELEASE}
1184
1137
  exit ;;
1185
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1138
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1186
1139
  echo powerpc-unknown-lynxos${UNAME_RELEASE}
1187
1140
  exit ;;
1188
1141
  SM[BE]S:UNIX_SV:*:*)
@@ -1202,10 +1155,10 @@ EOF
1202
1155
  echo ns32k-sni-sysv
1203
1156
  fi
1204
1157
  exit ;;
1205
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1206
- # says <Richard.M.Bartel@ccMail.Census.GOV>
1207
- echo i586-unisys-sysv4
1208
- exit ;;
1158
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1159
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
1160
+ echo i586-unisys-sysv4
1161
+ exit ;;
1209
1162
  *:UNIX_System_V:4*:FTX*)
1210
1163
  # From Gerald Hewes <hewes@openmarket.com>.
1211
1164
  # How about differentiating between stratus architectures? -djm
@@ -1231,11 +1184,11 @@ EOF
1231
1184
  exit ;;
1232
1185
  R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1233
1186
  if [ -d /usr/nec ]; then
1234
- echo mips-nec-sysv${UNAME_RELEASE}
1187
+ echo mips-nec-sysv${UNAME_RELEASE}
1235
1188
  else
1236
- echo mips-unknown-sysv${UNAME_RELEASE}
1189
+ echo mips-unknown-sysv${UNAME_RELEASE}
1237
1190
  fi
1238
- exit ;;
1191
+ exit ;;
1239
1192
  BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1240
1193
  echo powerpc-be-beos
1241
1194
  exit ;;
@@ -1275,6 +1228,16 @@ EOF
1275
1228
  *:Darwin:*:*)
1276
1229
  UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1277
1230
  case $UNAME_PROCESSOR in
1231
+ i386)
1232
+ eval $set_cc_for_build
1233
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1234
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1235
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1236
+ grep IS_64BIT_ARCH >/dev/null
1237
+ then
1238
+ UNAME_PROCESSOR="x86_64"
1239
+ fi
1240
+ fi ;;
1278
1241
  unknown) UNAME_PROCESSOR=powerpc ;;
1279
1242
  esac
1280
1243
  echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1290,6 +1253,9 @@ EOF
1290
1253
  *:QNX:*:4*)
1291
1254
  echo i386-pc-qnx
1292
1255
  exit ;;
1256
+ NEO-?:NONSTOP_KERNEL:*:*)
1257
+ echo neo-tandem-nsk${UNAME_RELEASE}
1258
+ exit ;;
1293
1259
  NSE-?:NONSTOP_KERNEL:*:*)
1294
1260
  echo nse-tandem-nsk${UNAME_RELEASE}
1295
1261
  exit ;;
@@ -1335,13 +1301,13 @@ EOF
1335
1301
  echo pdp10-unknown-its
1336
1302
  exit ;;
1337
1303
  SEI:*:*:SEIUX)
1338
- echo mips-sei-seiux${UNAME_RELEASE}
1304
+ echo mips-sei-seiux${UNAME_RELEASE}
1339
1305
  exit ;;
1340
1306
  *:DragonFly:*:*)
1341
1307
  echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1342
1308
  exit ;;
1343
1309
  *:*VMS:*:*)
1344
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
1310
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
1345
1311
  case "${UNAME_MACHINE}" in
1346
1312
  A*) echo alpha-dec-vms ; exit ;;
1347
1313
  I*) echo ia64-dec-vms ; exit ;;
@@ -1359,6 +1325,9 @@ EOF
1359
1325
  i*86:AROS:*:*)
1360
1326
  echo ${UNAME_MACHINE}-pc-aros
1361
1327
  exit ;;
1328
+ x86_64:VMkernel:*:*)
1329
+ echo ${UNAME_MACHINE}-unknown-esx
1330
+ exit ;;
1362
1331
  esac
1363
1332
 
1364
1333
  #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1381,11 +1350,11 @@ main ()
1381
1350
  #include <sys/param.h>
1382
1351
  printf ("m68k-sony-newsos%s\n",
1383
1352
  #ifdef NEWSOS4
1384
- "4"
1353
+ "4"
1385
1354
  #else
1386
- ""
1355
+ ""
1387
1356
  #endif
1388
- ); exit (0);
1357
+ ); exit (0);
1389
1358
  #endif
1390
1359
  #endif
1391
1360