You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
708 lines
23 KiB
708 lines
23 KiB
--- fastjar-0.97/m4/libtool.m4.jj 2008-10-16 10:14:54.000000000 +0200 |
|
+++ fastjar-0.97/m4/libtool.m4 2014-04-10 20:41:26.563064023 +0200 |
|
@@ -1263,7 +1263,7 @@ ia64-*-hpux*) |
|
rm -rf conftest* |
|
;; |
|
|
|
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
|
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
|
s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
|
# Find out which ABI we are using. |
|
echo 'int i;' > conftest.$ac_ext |
|
@@ -1277,7 +1277,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* |
|
x86_64-*linux*) |
|
LD="${LD-ld} -m elf_i386" |
|
;; |
|
- ppc64-*linux*|powerpc64-*linux*) |
|
+ powerpc64le-*linux*) |
|
+ LD="${LD-ld} -m elf32lppclinux" |
|
+ ;; |
|
+ powerpc64-*linux*) |
|
LD="${LD-ld} -m elf32ppclinux" |
|
;; |
|
s390x-*linux*) |
|
@@ -1296,7 +1299,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* |
|
x86_64-*linux*) |
|
LD="${LD-ld} -m elf_x86_64" |
|
;; |
|
- ppc*-*linux*|powerpc*-*linux*) |
|
+ powerpcle-*linux*) |
|
+ LD="${LD-ld} -m elf64lppc" |
|
+ ;; |
|
+ powerpc-*linux*) |
|
LD="${LD-ld} -m elf64ppc" |
|
;; |
|
s390*-*linux*|s390*-*tpf*) |
|
--- fastjar-0.97/config.sub.jj 2014-04-10 20:40:53.000000000 +0200 |
|
+++ fastjar-0.97/config.sub 2014-04-10 10:38:39.000000000 +0200 |
|
@@ -1,24 +1,18 @@ |
|
#! /bin/sh |
|
# Configuration validation subroutine script. |
|
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
|
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
|
-# 2011, 2012 Free Software Foundation, Inc. |
|
- |
|
-timestamp='2012-04-18' |
|
- |
|
-# This file is (in principle) common to ALL GNU software. |
|
-# The presence of a machine in this file suggests that SOME GNU software |
|
-# can handle that machine. It does not imply ALL GNU software can. |
|
-# |
|
-# 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 |
|
-# the Free Software Foundation; either version 2 of the License, or |
|
+# Copyright 1992-2013 Free Software Foundation, Inc. |
|
+ |
|
+timestamp='2013-10-01' |
|
+ |
|
+# 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 |
|
+# the Free Software Foundation; either version 3 of the License, or |
|
# (at your option) any later version. |
|
# |
|
-# This program is distributed in the hope that it will be useful, |
|
-# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
-# GNU General Public License for more details. |
|
+# This program is distributed in the hope that it will be useful, but |
|
+# WITHOUT ANY WARRANTY; without even the implied warranty of |
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
+# General Public License for more details. |
|
# |
|
# You should have received a copy of the GNU General Public License |
|
# along with this program; if not, see <http://www.gnu.org/licenses/>. |
|
@@ -26,11 +20,12 @@ timestamp='2012-04-18' |
|
# As a special exception to the GNU General Public License, if you |
|
# distribute this file as part of a program that contains a |
|
# configuration script generated by Autoconf, you may include it under |
|
-# the same distribution terms that you use for the rest of that program. |
|
+# the same distribution terms that you use for the rest of that |
|
+# program. This Exception is an additional permission under section 7 |
|
+# of the GNU General Public License, version 3 ("GPLv3"). |
|
|
|
|
|
-# Please send patches to <config-patches@gnu.org>. Submit a context |
|
-# diff and a properly formatted GNU ChangeLog entry. |
|
+# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
|
# |
|
# Configuration subroutine to validate and canonicalize a configuration type. |
|
# Supply the specified configuration type as an argument. |
|
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patch |
|
version="\ |
|
GNU config.sub ($timestamp) |
|
|
|
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
|
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
|
-Free Software Foundation, Inc. |
|
+Copyright 1992-2013 Free Software Foundation, Inc. |
|
|
|
This is free software; see the source for copying conditions. There is NO |
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
|
@@ -123,7 +116,7 @@ esac |
|
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
|
case $maybe_os in |
|
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
|
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
|
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
|
knetbsd*-gnu* | netbsd*-gnu* | \ |
|
kopensolaris*-gnu* | \ |
|
storm-chaos* | os2-emx* | rtmk-nova*) |
|
@@ -156,7 +149,7 @@ case $os in |
|
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
|
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
|
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
|
- -apple | -axis | -knuth | -cray | -microblaze) |
|
+ -apple | -axis | -knuth | -cray | -microblaze*) |
|
os= |
|
basic_machine=$1 |
|
;; |
|
@@ -259,10 +252,12 @@ case $basic_machine in |
|
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
|
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
|
| am33_2.0 \ |
|
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
|
- | be32 | be64 \ |
|
+ | arc | arceb \ |
|
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ |
|
+ | avr | avr32 \ |
|
+ | be32 | be64 \ |
|
| bfin \ |
|
- | c4x | clipper \ |
|
+ | c4x | c8051 | clipper \ |
|
| d10v | d30v | dlx | dsp16xx \ |
|
| epiphany \ |
|
| fido | fr30 | frv \ |
|
@@ -270,10 +265,11 @@ case $basic_machine in |
|
| hexagon \ |
|
| i370 | i860 | i960 | ia64 \ |
|
| ip2k | iq2000 \ |
|
+ | k1om \ |
|
| le32 | le64 \ |
|
| lm32 \ |
|
| m32c | m32r | m32rle | m68000 | m68k | m88k \ |
|
- | maxq | mb | microblaze | mcore | mep | metag \ |
|
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ |
|
| mips | mipsbe | mipseb | mipsel | mipsle \ |
|
| mips16 \ |
|
| mips64 | mips64el \ |
|
@@ -291,16 +287,17 @@ case $basic_machine in |
|
| mipsisa64r2 | mipsisa64r2el \ |
|
| mipsisa64sb1 | mipsisa64sb1el \ |
|
| mipsisa64sr71k | mipsisa64sr71kel \ |
|
+ | mipsr5900 | mipsr5900el \ |
|
| mipstx39 | mipstx39el \ |
|
| mn10200 | mn10300 \ |
|
| moxie \ |
|
| mt \ |
|
| msp430 \ |
|
| nds32 | nds32le | nds32be \ |
|
- | nios | nios2 \ |
|
+ | nios | nios2 | nios2eb | nios2el \ |
|
| ns16k | ns32k \ |
|
| open8 \ |
|
- | or32 \ |
|
+ | or1k | or32 \ |
|
| pdp10 | pdp11 | pj | pjl \ |
|
| powerpc | powerpc64 | powerpc64le | powerpcle \ |
|
| pyramid \ |
|
@@ -328,7 +325,7 @@ case $basic_machine in |
|
c6x) |
|
basic_machine=tic6x-unknown |
|
;; |
|
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
|
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) |
|
basic_machine=$basic_machine-unknown |
|
os=-none |
|
;; |
|
@@ -370,13 +367,13 @@ case $basic_machine in |
|
| aarch64-* | aarch64_be-* \ |
|
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
|
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
|
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
|
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
|
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
|
| avr-* | avr32-* \ |
|
| be32-* | be64-* \ |
|
| bfin-* | bs2000-* \ |
|
| c[123]* | c30-* | [cjt]90-* | c4x-* \ |
|
- | clipper-* | craynv-* | cydra-* \ |
|
+ | c8051-* | clipper-* | craynv-* | cydra-* \ |
|
| d10v-* | d30v-* | dlx-* \ |
|
| elxsi-* \ |
|
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
|
@@ -385,11 +382,13 @@ case $basic_machine in |
|
| hexagon-* \ |
|
| i*86-* | i860-* | i960-* | ia64-* \ |
|
| ip2k-* | iq2000-* \ |
|
+ | k1om-* \ |
|
| le32-* | le64-* \ |
|
| lm32-* \ |
|
| m32c-* | m32r-* | m32rle-* \ |
|
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
|
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
|
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
|
+ | microblaze-* | microblazeel-* \ |
|
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
|
| mips16-* \ |
|
| mips64-* | mips64el-* \ |
|
@@ -407,12 +406,13 @@ case $basic_machine in |
|
| mipsisa64r2-* | mipsisa64r2el-* \ |
|
| mipsisa64sb1-* | mipsisa64sb1el-* \ |
|
| mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
|
+ | mipsr5900-* | mipsr5900el-* \ |
|
| mipstx39-* | mipstx39el-* \ |
|
| mmix-* \ |
|
| mt-* \ |
|
| msp430-* \ |
|
| nds32-* | nds32le-* | nds32be-* \ |
|
- | nios-* | nios2-* \ |
|
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \ |
|
| none-* | np1-* | ns16k-* | ns32k-* \ |
|
| open8-* \ |
|
| orion-* \ |
|
@@ -788,11 +788,15 @@ case $basic_machine in |
|
basic_machine=ns32k-utek |
|
os=-sysv |
|
;; |
|
- microblaze) |
|
+ microblaze*) |
|
basic_machine=microblaze-xilinx |
|
;; |
|
+ mingw64) |
|
+ basic_machine=x86_64-pc |
|
+ os=-mingw64 |
|
+ ;; |
|
mingw32) |
|
- basic_machine=i386-pc |
|
+ basic_machine=i686-pc |
|
os=-mingw32 |
|
;; |
|
mingw32ce) |
|
@@ -828,7 +832,7 @@ case $basic_machine in |
|
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
|
;; |
|
msys) |
|
- basic_machine=i386-pc |
|
+ basic_machine=i686-pc |
|
os=-msys |
|
;; |
|
mvs) |
|
@@ -1019,7 +1023,11 @@ case $basic_machine in |
|
basic_machine=i586-unknown |
|
os=-pw32 |
|
;; |
|
- rdos) |
|
+ rdos | rdos64) |
|
+ basic_machine=x86_64-pc |
|
+ os=-rdos |
|
+ ;; |
|
+ rdos32) |
|
basic_machine=i386-pc |
|
os=-rdos |
|
;; |
|
@@ -1346,21 +1354,21 @@ case $os in |
|
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
|
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
|
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
|
- | -sym* | -kopensolaris* \ |
|
+ | -sym* | -kopensolaris* | -plan9* \ |
|
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
|
| -aos* | -aros* \ |
|
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
|
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
|
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
|
- | -openbsd* | -solidbsd* \ |
|
+ | -bitrig* | -openbsd* | -solidbsd* \ |
|
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
|
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
|
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
|
| -chorusos* | -chorusrdb* | -cegcc* \ |
|
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
|
- | -mingw32* | -linux-gnu* | -linux-android* \ |
|
- | -linux-newlib* | -linux-uclibc* \ |
|
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
|
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
|
| -uxpv* | -beos* | -mpeix* | -udk* \ |
|
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
|
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
|
@@ -1492,9 +1500,6 @@ case $os in |
|
-aros*) |
|
os=-aros |
|
;; |
|
- -kaos*) |
|
- os=-kaos |
|
- ;; |
|
-zvmoe) |
|
os=-zvmoe |
|
;; |
|
@@ -1543,6 +1548,9 @@ case $basic_machine in |
|
c4x-* | tic4x-*) |
|
os=-coff |
|
;; |
|
+ c8051-*) |
|
+ os=-elf |
|
+ ;; |
|
hexagon-*) |
|
os=-elf |
|
;; |
|
@@ -1586,6 +1594,9 @@ case $basic_machine in |
|
mips*-*) |
|
os=-elf |
|
;; |
|
+ or1k-*) |
|
+ os=-elf |
|
+ ;; |
|
or32-*) |
|
os=-coff |
|
;; |
|
--- fastjar-0.97/config.guess.jj 2014-04-10 20:40:53.000000000 +0200 |
|
+++ fastjar-0.97/config.guess 2014-04-10 10:38:36.000000000 +0200 |
|
@@ -1,14 +1,12 @@ |
|
#! /bin/sh |
|
# Attempt to guess a canonical system name. |
|
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
|
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
|
-# 2011, 2012 Free Software Foundation, Inc. |
|
+# Copyright 1992-2013 Free Software Foundation, Inc. |
|
|
|
-timestamp='2012-06-10' |
|
+timestamp='2013-06-10' |
|
|
|
# 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 |
|
-# the Free Software Foundation; either version 2 of the License, or |
|
+# the Free Software Foundation; either version 3 of the License, or |
|
# (at your option) any later version. |
|
# |
|
# This program is distributed in the hope that it will be useful, but |
|
@@ -22,19 +20,17 @@ timestamp='2012-06-10' |
|
# As a special exception to the GNU General Public License, if you |
|
# distribute this file as part of a program that contains a |
|
# configuration script generated by Autoconf, you may include it under |
|
-# the same distribution terms that you use for the rest of that program. |
|
- |
|
- |
|
-# Originally written by Per Bothner. Please send patches (context |
|
-# diff format) to <config-patches@gnu.org> and include a ChangeLog |
|
-# entry. |
|
+# the same distribution terms that you use for the rest of that |
|
+# program. This Exception is an additional permission under section 7 |
|
+# of the GNU General Public License, version 3 ("GPLv3"). |
|
# |
|
-# This script attempts to guess a canonical system name similar to |
|
-# config.sub. If it succeeds, it prints the system name on stdout, and |
|
-# exits with 0. Otherwise, it exits with 1. |
|
+# Originally written by Per Bothner. |
|
# |
|
# You can get the latest version of this script from: |
|
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
|
+# |
|
+# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
|
+ |
|
|
|
me=`echo "$0" | sed -e 's,.*/,,'` |
|
|
|
@@ -54,9 +50,7 @@ version="\ |
|
GNU config.guess ($timestamp) |
|
|
|
Originally written by Per Bothner. |
|
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
|
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
|
-Free Software Foundation, Inc. |
|
+Copyright 1992-2013 Free Software Foundation, Inc. |
|
|
|
This is free software; see the source for copying conditions. There is NO |
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
|
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | |
|
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
|
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
|
|
|
+case "${UNAME_SYSTEM}" in |
|
+Linux|GNU|GNU/*) |
|
+ # If the system lacks a compiler, then just pick glibc. |
|
+ # We could probably try harder. |
|
+ LIBC=gnu |
|
+ |
|
+ eval $set_cc_for_build |
|
+ cat <<-EOF > $dummy.c |
|
+ #include <features.h> |
|
+ #if defined(__UCLIBC__) |
|
+ LIBC=uclibc |
|
+ #elif defined(__dietlibc__) |
|
+ LIBC=dietlibc |
|
+ #else |
|
+ LIBC=gnu |
|
+ #endif |
|
+ EOF |
|
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
|
+ ;; |
|
+esac |
|
+ |
|
# Note: order is significant - the case branches are not exclusive. |
|
|
|
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
|
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ |
|
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
|
echo "${machine}-${os}${release}" |
|
exit ;; |
|
+ *:Bitrig:*:*) |
|
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
|
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} |
|
+ exit ;; |
|
*:OpenBSD:*:*) |
|
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
|
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
|
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ |
|
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
|
echo arm-acorn-riscix${UNAME_RELEASE} |
|
exit ;; |
|
- arm:riscos:*:*|arm:RISCOS:*:*) |
|
+ arm*:riscos:*:*|arm*:RISCOS:*:*) |
|
echo arm-unknown-riscos |
|
exit ;; |
|
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
|
@@ -801,6 +820,9 @@ EOF |
|
i*:CYGWIN*:*) |
|
echo ${UNAME_MACHINE}-pc-cygwin |
|
exit ;; |
|
+ *:MINGW64*:*) |
|
+ echo ${UNAME_MACHINE}-pc-mingw64 |
|
+ exit ;; |
|
*:MINGW*:*) |
|
echo ${UNAME_MACHINE}-pc-mingw32 |
|
exit ;; |
|
@@ -852,21 +874,21 @@ EOF |
|
exit ;; |
|
*:GNU:*:*) |
|
# the GNU system |
|
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
|
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
|
exit ;; |
|
*:GNU/*:*:*) |
|
# other systems with GNU libc and userland |
|
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} |
|
exit ;; |
|
i*86:Minix:*:*) |
|
echo ${UNAME_MACHINE}-pc-minix |
|
exit ;; |
|
aarch64:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
aarch64_be:Linux:*:*) |
|
UNAME_MACHINE=aarch64_be |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
alpha:Linux:*:*) |
|
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
|
@@ -879,59 +901,54 @@ EOF |
|
EV68*) UNAME_MACHINE=alphaev68 ;; |
|
esac |
|
objdump --private-headers /bin/sh | grep -q ld.so.1 |
|
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
|
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
+ exit ;; |
|
+ arc:Linux:*:* | arceb:Linux:*:*) |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
arm*:Linux:*:*) |
|
eval $set_cc_for_build |
|
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
|
| grep -q __ARM_EABI__ |
|
then |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
else |
|
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
|
| grep -q __ARM_PCS_VFP |
|
then |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi |
|
else |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf |
|
fi |
|
fi |
|
exit ;; |
|
avr32*:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
cris:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-axis-linux-gnu |
|
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
|
exit ;; |
|
crisv32:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-axis-linux-gnu |
|
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
|
exit ;; |
|
frv:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
hexagon:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
i*86:Linux:*:*) |
|
- LIBC=gnu |
|
- eval $set_cc_for_build |
|
- sed 's/^ //' << EOF >$dummy.c |
|
- #ifdef __dietlibc__ |
|
- LIBC=dietlibc |
|
- #endif |
|
-EOF |
|
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
|
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
|
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
|
exit ;; |
|
ia64:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
m32r*:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
m68*:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
mips:Linux:*:* | mips64:Linux:*:*) |
|
eval $set_cc_for_build |
|
@@ -950,54 +967,63 @@ EOF |
|
#endif |
|
EOF |
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
|
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
|
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
|
;; |
|
+ or1k:Linux:*:*) |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
+ exit ;; |
|
or32:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
padre:Linux:*:*) |
|
- echo sparc-unknown-linux-gnu |
|
+ echo sparc-unknown-linux-${LIBC} |
|
exit ;; |
|
parisc64:Linux:*:* | hppa64:Linux:*:*) |
|
- echo hppa64-unknown-linux-gnu |
|
+ echo hppa64-unknown-linux-${LIBC} |
|
exit ;; |
|
parisc:Linux:*:* | hppa:Linux:*:*) |
|
# Look for CPU level |
|
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
|
- PA7*) echo hppa1.1-unknown-linux-gnu ;; |
|
- PA8*) echo hppa2.0-unknown-linux-gnu ;; |
|
- *) echo hppa-unknown-linux-gnu ;; |
|
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; |
|
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; |
|
+ *) echo hppa-unknown-linux-${LIBC} ;; |
|
esac |
|
exit ;; |
|
ppc64:Linux:*:*) |
|
- echo powerpc64-unknown-linux-gnu |
|
+ echo powerpc64-unknown-linux-${LIBC} |
|
exit ;; |
|
ppc:Linux:*:*) |
|
- echo powerpc-unknown-linux-gnu |
|
+ echo powerpc-unknown-linux-${LIBC} |
|
+ exit ;; |
|
+ ppc64le:Linux:*:*) |
|
+ echo powerpc64le-unknown-linux-${LIBC} |
|
+ exit ;; |
|
+ ppcle:Linux:*:*) |
|
+ echo powerpcle-unknown-linux-${LIBC} |
|
exit ;; |
|
s390:Linux:*:* | s390x:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-ibm-linux |
|
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} |
|
exit ;; |
|
sh64*:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
sh*:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
sparc:Linux:*:* | sparc64:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
tile*:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
vax:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-dec-linux-gnu |
|
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC} |
|
exit ;; |
|
x86_64:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
xtensa*:Linux:*:*) |
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
exit ;; |
|
i*86:DYNIX/ptx:4*:*) |
|
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
|
@@ -1201,6 +1227,9 @@ EOF |
|
BePC:Haiku:*:*) # Haiku running on Intel PC compatible. |
|
echo i586-pc-haiku |
|
exit ;; |
|
+ x86_64:Haiku:*:*) |
|
+ echo x86_64-unknown-haiku |
|
+ exit ;; |
|
SX-4:SUPER-UX:*:*) |
|
echo sx4-nec-superux${UNAME_RELEASE} |
|
exit ;; |
|
@@ -1227,19 +1256,21 @@ EOF |
|
exit ;; |
|
*:Darwin:*:*) |
|
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
|
- case $UNAME_PROCESSOR in |
|
- i386) |
|
- eval $set_cc_for_build |
|
- 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 |
|
- UNAME_PROCESSOR="x86_64" |
|
- fi |
|
- fi ;; |
|
- unknown) UNAME_PROCESSOR=powerpc ;; |
|
- esac |
|
+ eval $set_cc_for_build |
|
+ 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 |
|
+ fi |
|
+ fi |
|
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
|
exit ;; |
|
*:procnto*:*:* | *:QNX:[0123456789]*:*) |
|
@@ -1330,9 +1361,6 @@ EOF |
|
exit ;; |
|
esac |
|
|
|
-#echo '(No uname command or uname output not recognized.)' 1>&2 |
|
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 |
|
- |
|
eval $set_cc_for_build |
|
cat >$dummy.c <<EOF |
|
#ifdef _SEQUENT_ |
|
--- fastjar-0.97/configure.jj 2008-10-16 10:15:10.000000000 +0200 |
|
+++ fastjar-0.97/configure 2014-04-10 20:43:07.458531730 +0200 |
|
@@ -6918,7 +6918,7 @@ ia64-*-hpux*) |
|
rm -rf conftest* |
|
;; |
|
|
|
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
|
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
|
s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
|
# Find out which ABI we are using. |
|
echo 'int i;' > conftest.$ac_ext |
|
@@ -6936,7 +6936,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* |
|
x86_64-*linux*) |
|
LD="${LD-ld} -m elf_i386" |
|
;; |
|
- ppc64-*linux*|powerpc64-*linux*) |
|
+ powerpc64le-*linux*) |
|
+ LD="${LD-ld} -m elf32lppclinux" |
|
+ ;; |
|
+ powerpc64-*linux*) |
|
LD="${LD-ld} -m elf32ppclinux" |
|
;; |
|
s390x-*linux*) |
|
@@ -6955,7 +6958,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* |
|
x86_64-*linux*) |
|
LD="${LD-ld} -m elf_x86_64" |
|
;; |
|
- ppc*-*linux*|powerpc*-*linux*) |
|
+ powerpcle-*linux*) |
|
+ LD="${LD-ld} -m elf64lppc" |
|
+ ;; |
|
+ powerpc-*linux*) |
|
LD="${LD-ld} -m elf64ppc" |
|
;; |
|
s390*-*linux*|s390*-*tpf*)
|
|
|