Skip to content

Commit 3cdda8f

Browse files
author
nixnodes
committed
Signed-off-by: nixnodes <[email protected]>
1 parent 69386a5 commit 3cdda8f

File tree

6 files changed

+581
-580
lines changed

6 files changed

+581
-580
lines changed

INSTALL

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Installation Instructions
22
*************************
33

4-
Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
4+
Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
55
Inc.
66

77
Copying and distribution of this file, with or without modification,
@@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
309309
overridden in the site shell script).
310310

311311
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
312-
an Autoconf bug. Until the bug is fixed you can use this workaround:
312+
an Autoconf limitation. Until the limitation is lifted, you can use
313+
this workaround:
313314

314-
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
315+
CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
315316

316317
`configure' Invocation
317318
======================
@@ -367,4 +368,3 @@ operates.
367368

368369
`configure' also accepts some other, not widely useful, options. Run
369370
`configure --help' for more details.
370-

config.guess

+106-78
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5-
# 2011, 2012 Free Software Foundation, Inc.
3+
# Copyright 1992-2013 Free Software Foundation, Inc.
64

7-
timestamp='2012-02-10'
5+
timestamp='2013-06-10'
86

97
# This file is free software; you can redistribute it and/or modify it
108
# under the terms of the GNU General Public License as published by
11-
# the Free Software Foundation; either version 2 of the License, or
9+
# the Free Software Foundation; either version 3 of the License, or
1210
# (at your option) any later version.
1311
#
1412
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
2220
# As a special exception to the GNU General Public License, if you
2321
# distribute this file as part of a program that contains a
2422
# configuration script generated by Autoconf, you may include it under
25-
# the same distribution terms that you use for the rest of that program.
26-
27-
28-
# Originally written by Per Bothner. Please send patches (context
29-
# diff format) to <[email protected]> and include a ChangeLog
30-
# entry.
23+
# the same distribution terms that you use for the rest of that
24+
# program. This Exception is an additional permission under section 7
25+
# of the GNU General Public License, version 3 ("GPLv3").
3126
#
32-
# This script attempts to guess a canonical system name similar to
33-
# config.sub. If it succeeds, it prints the system name on stdout, and
34-
# exits with 0. Otherwise, it exits with 1.
27+
# Originally written by Per Bothner.
3528
#
3629
# You can get the latest version of this script from:
3730
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
31+
#
32+
# Please send patches with a ChangeLog entry to [email protected].
33+
3834

3935
me=`echo "$0" | sed -e 's,.*/,,'`
4036

@@ -54,9 +50,7 @@ version="\
5450
GNU config.guess ($timestamp)
5551
5652
Originally written by Per Bothner.
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.
53+
Copyright 1992-2013 Free Software Foundation, Inc.
6054
6155
This is free software; see the source for copying conditions. There is NO
6256
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
138132
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
139133
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
140134

135+
case "${UNAME_SYSTEM}" in
136+
Linux|GNU|GNU/*)
137+
# If the system lacks a compiler, then just pick glibc.
138+
# We could probably try harder.
139+
LIBC=gnu
140+
141+
eval $set_cc_for_build
142+
cat <<-EOF > $dummy.c
143+
#include <features.h>
144+
#if defined(__UCLIBC__)
145+
LIBC=uclibc
146+
#elif defined(__dietlibc__)
147+
LIBC=dietlibc
148+
#else
149+
LIBC=gnu
150+
#endif
151+
EOF
152+
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
153+
;;
154+
esac
155+
141156
# Note: order is significant - the case branches are not exclusive.
142157

143158
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
200215
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
201216
echo "${machine}-${os}${release}"
202217
exit ;;
218+
*:Bitrig:*:*)
219+
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
220+
echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
221+
exit ;;
203222
*:OpenBSD:*:*)
204223
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
205224
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
302321
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
303322
echo arm-acorn-riscix${UNAME_RELEASE}
304323
exit ;;
305-
arm:riscos:*:*|arm:RISCOS:*:*)
324+
arm*:riscos:*:*|arm*:RISCOS:*:*)
306325
echo arm-unknown-riscos
307326
exit ;;
308327
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@ EOF
801820
i*:CYGWIN*:*)
802821
echo ${UNAME_MACHINE}-pc-cygwin
803822
exit ;;
823+
*:MINGW64*:*)
824+
echo ${UNAME_MACHINE}-pc-mingw64
825+
exit ;;
804826
*:MINGW*:*)
805827
echo ${UNAME_MACHINE}-pc-mingw32
806828
exit ;;
@@ -852,21 +874,21 @@ EOF
852874
exit ;;
853875
*:GNU:*:*)
854876
# the GNU system
855-
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
877+
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
856878
exit ;;
857879
*:GNU/*:*:*)
858880
# other systems with GNU libc and userland
859-
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
881+
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
860882
exit ;;
861883
i*86:Minix:*:*)
862884
echo ${UNAME_MACHINE}-pc-minix
863885
exit ;;
864886
aarch64:Linux:*:*)
865-
echo ${UNAME_MACHINE}-unknown-linux-gnu
887+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
866888
exit ;;
867889
aarch64_be:Linux:*:*)
868890
UNAME_MACHINE=aarch64_be
869-
echo ${UNAME_MACHINE}-unknown-linux-gnu
891+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
870892
exit ;;
871893
alpha:Linux:*:*)
872894
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@ EOF
879901
EV68*) UNAME_MACHINE=alphaev68 ;;
880902
esac
881903
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}
904+
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
905+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
906+
exit ;;
907+
arc:Linux:*:* | arceb:Linux:*:*)
908+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
884909
exit ;;
885910
arm*:Linux:*:*)
886911
eval $set_cc_for_build
887912
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
888913
| grep -q __ARM_EABI__
889914
then
890-
echo ${UNAME_MACHINE}-unknown-linux-gnu
915+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
891916
else
892917
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
893918
| grep -q __ARM_PCS_VFP
894919
then
895-
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
920+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
896921
else
897-
echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
922+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
898923
fi
899924
fi
900925
exit ;;
901926
avr32*:Linux:*:*)
902-
echo ${UNAME_MACHINE}-unknown-linux-gnu
927+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
903928
exit ;;
904929
cris:Linux:*:*)
905-
echo ${UNAME_MACHINE}-axis-linux-gnu
930+
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
906931
exit ;;
907932
crisv32:Linux:*:*)
908-
echo ${UNAME_MACHINE}-axis-linux-gnu
933+
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
909934
exit ;;
910935
frv:Linux:*:*)
911-
echo ${UNAME_MACHINE}-unknown-linux-gnu
936+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
912937
exit ;;
913938
hexagon:Linux:*:*)
914-
echo ${UNAME_MACHINE}-unknown-linux-gnu
939+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
915940
exit ;;
916941
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}"
942+
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
926943
exit ;;
927944
ia64:Linux:*:*)
928-
echo ${UNAME_MACHINE}-unknown-linux-gnu
945+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
929946
exit ;;
930947
m32r*:Linux:*:*)
931-
echo ${UNAME_MACHINE}-unknown-linux-gnu
948+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
932949
exit ;;
933950
m68*:Linux:*:*)
934-
echo ${UNAME_MACHINE}-unknown-linux-gnu
951+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
935952
exit ;;
936953
mips:Linux:*:* | mips64:Linux:*:*)
937954
eval $set_cc_for_build
@@ -950,54 +967,63 @@ EOF
950967
#endif
951968
EOF
952969
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
953-
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
970+
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
954971
;;
972+
or1k:Linux:*:*)
973+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
974+
exit ;;
955975
or32:Linux:*:*)
956-
echo ${UNAME_MACHINE}-unknown-linux-gnu
976+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
957977
exit ;;
958978
padre:Linux:*:*)
959-
echo sparc-unknown-linux-gnu
979+
echo sparc-unknown-linux-${LIBC}
960980
exit ;;
961981
parisc64:Linux:*:* | hppa64:Linux:*:*)
962-
echo hppa64-unknown-linux-gnu
982+
echo hppa64-unknown-linux-${LIBC}
963983
exit ;;
964984
parisc:Linux:*:* | hppa:Linux:*:*)
965985
# Look for CPU level
966986
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
967-
PA7*) echo hppa1.1-unknown-linux-gnu ;;
968-
PA8*) echo hppa2.0-unknown-linux-gnu ;;
969-
*) echo hppa-unknown-linux-gnu ;;
987+
PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
988+
PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
989+
*) echo hppa-unknown-linux-${LIBC} ;;
970990
esac
971991
exit ;;
972992
ppc64:Linux:*:*)
973-
echo powerpc64-unknown-linux-gnu
993+
echo powerpc64-unknown-linux-${LIBC}
974994
exit ;;
975995
ppc:Linux:*:*)
976-
echo powerpc-unknown-linux-gnu
996+
echo powerpc-unknown-linux-${LIBC}
997+
exit ;;
998+
ppc64le:Linux:*:*)
999+
echo powerpc64le-unknown-linux-${LIBC}
1000+
exit ;;
1001+
ppcle:Linux:*:*)
1002+
echo powerpcle-unknown-linux-${LIBC}
9771003
exit ;;
9781004
s390:Linux:*:* | s390x:Linux:*:*)
979-
echo ${UNAME_MACHINE}-ibm-linux
1005+
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
9801006
exit ;;
9811007
sh64*:Linux:*:*)
982-
echo ${UNAME_MACHINE}-unknown-linux-gnu
1008+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9831009
exit ;;
9841010
sh*:Linux:*:*)
985-
echo ${UNAME_MACHINE}-unknown-linux-gnu
1011+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9861012
exit ;;
9871013
sparc:Linux:*:* | sparc64:Linux:*:*)
988-
echo ${UNAME_MACHINE}-unknown-linux-gnu
1014+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9891015
exit ;;
9901016
tile*:Linux:*:*)
991-
echo ${UNAME_MACHINE}-unknown-linux-gnu
1017+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9921018
exit ;;
9931019
vax:Linux:*:*)
994-
echo ${UNAME_MACHINE}-dec-linux-gnu
1020+
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
9951021
exit ;;
9961022
x86_64:Linux:*:*)
997-
echo ${UNAME_MACHINE}-unknown-linux-gnu
1023+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9981024
exit ;;
9991025
xtensa*:Linux:*:*)
1000-
echo ${UNAME_MACHINE}-unknown-linux-gnu
1026+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
10011027
exit ;;
10021028
i*86:DYNIX/ptx:4*:*)
10031029
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1227,9 @@ EOF
12011227
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
12021228
echo i586-pc-haiku
12031229
exit ;;
1230+
x86_64:Haiku:*:*)
1231+
echo x86_64-unknown-haiku
1232+
exit ;;
12041233
SX-4:SUPER-UX:*:*)
12051234
echo sx4-nec-superux${UNAME_RELEASE}
12061235
exit ;;
@@ -1227,19 +1256,21 @@ EOF
12271256
exit ;;
12281257
*:Darwin:*:*)
12291258
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
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 ;;
1241-
unknown) UNAME_PROCESSOR=powerpc ;;
1242-
esac
1259+
eval $set_cc_for_build
1260+
if test "$UNAME_PROCESSOR" = unknown ; then
1261+
UNAME_PROCESSOR=powerpc
1262+
fi
1263+
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1264+
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1265+
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1266+
grep IS_64BIT_ARCH >/dev/null
1267+
then
1268+
case $UNAME_PROCESSOR in
1269+
i386) UNAME_PROCESSOR=x86_64 ;;
1270+
powerpc) UNAME_PROCESSOR=powerpc64 ;;
1271+
esac
1272+
fi
1273+
fi
12431274
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
12441275
exit ;;
12451276
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1287,7 @@ EOF
12561287
NEO-?:NONSTOP_KERNEL:*:*)
12571288
echo neo-tandem-nsk${UNAME_RELEASE}
12581289
exit ;;
1259-
NSE-?:NONSTOP_KERNEL:*:*)
1290+
NSE-*:NONSTOP_KERNEL:*:*)
12601291
echo nse-tandem-nsk${UNAME_RELEASE}
12611292
exit ;;
12621293
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,9 +1361,6 @@ EOF
13301361
exit ;;
13311362
esac
13321363

1333-
#echo '(No uname command or uname output not recognized.)' 1>&2
1334-
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1335-
13361364
eval $set_cc_for_build
13371365
cat >$dummy.c <<EOF
13381366
#ifdef _SEQUENT_

0 commit comments

Comments
 (0)