[abe] Drop unused abe.png file. Update -aarch64 patch with newer config.{guess, sub}.
Jerry James
jjames at fedoraproject.org
Wed Aug 13 18:45:51 UTC 2014
commit e09f18d26ae14933b6059d56375741d58aae4d88
Author: Jerry James <jamesjer at betterlinux.com>
Date: Wed Aug 13 12:45:40 2014 -0600
Drop unused abe.png file.
Update -aarch64 patch with newer config.{guess,sub}.
abe-1.1-aarch64.patch | 531 ++++++++++++++++++++++++++++---------------------
abe.png | Bin 1989 -> 0 bytes
abe.spec | 8 +-
3 files changed, 315 insertions(+), 224 deletions(-)
---
diff --git a/abe-1.1-aarch64.patch b/abe-1.1-aarch64.patch
index 5827a0d..480d876 100644
--- a/abe-1.1-aarch64.patch
+++ b/abe-1.1-aarch64.patch
@@ -1,20 +1,23 @@
---- config.guess.orig 2005-03-05 10:20:39.000000000 -0600
-+++ config.guess 2013-03-03 00:30:18.802031358 -0600
-@@ -1,9 +1,10 @@
+--- config.guess.orig 2005-03-05 09:20:39.000000000 -0700
++++ config.guess 2014-06-09 08:07:14.000000000 -0600
+@@ -1,13 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-+# 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='2001-09-04'
-+timestamp='2012-09-25'
++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
-@@ -16,23 +17,24 @@
+-# 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
+@@ -16,23 +15,22 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
@@ -25,37 +28,40 @@
# 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.
+-
-# Written by Per Bothner <bothner at cygnus.com>.
-# Please send patches to <config-patches at gnu.org>.
-+
-+# Originally written by Per Bothner. Please send patches (context
-+# diff format) to <config-patches at 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.
+-# 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.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# 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 at gnu.org.
++
me=`echo "$0" | sed -e 's,.*/,,'`
-@@ -52,7 +54,8 @@
+@@ -52,8 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+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.
+-Free Software Foundation, Inc.
++Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
-@@ -65,11 +68,11 @@
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -65,11 +62,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
@@ -70,7 +76,7 @@
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
-@@ -87,30 +90,42 @@
+@@ -87,30 +84,42 @@
exit 1
fi
@@ -123,7 +129,32 @@
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
-@@ -127,32 +142,34 @@
+@@ -123,36 +132,59 @@
+ 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
*:NetBSD:*:*)
@@ -174,7 +205,7 @@
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -162,124 +179,139 @@
+@@ -162,124 +194,139 @@
fi
;;
*)
@@ -402,7 +433,7 @@
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -287,25 +319,51 @@
+@@ -287,25 +334,51 @@
else
echo pyramid-pyramid-bsd
fi
@@ -462,7 +493,7 @@
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
-@@ -314,12 +372,12 @@
+@@ -314,12 +387,12 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -478,7 +509,7 @@
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
-@@ -329,16 +387,10 @@
+@@ -329,16 +402,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
@@ -497,7 +528,7 @@
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
-@@ -348,50 +400,41 @@
+@@ -348,50 +415,41 @@
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
@@ -567,7 +598,7 @@
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
-@@ -415,30 +458,36 @@
+@@ -415,30 +473,36 @@
exit (-1);
}
EOF
@@ -616,7 +647,7 @@
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -451,29 +500,29 @@
+@@ -451,29 +515,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
@@ -655,7 +686,7 @@
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
-@@ -481,7 +530,7 @@
+@@ -481,7 +545,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -664,7 +695,7 @@
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
-@@ -496,17 +545,20 @@
+@@ -496,17 +560,20 @@
exit(0);
}
EOF
@@ -691,7 +722,7 @@
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
-@@ -518,96 +570,114 @@
+@@ -518,96 +585,114 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -750,18 +781,44 @@
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
--
++ if [ -x /usr/bin/getconf ]; then
++ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++ case "${sc_cpu_version}" in
++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++ 532) # CPU_PA_RISC2_0
++ case "${sc_kernel_bits}" in
++ 32) HP_ARCH="hppa2.0n" ;;
++ 64) HP_ARCH="hppa2.0w" ;;
++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
++ esac ;;
++ esac
++ fi
++ if [ "${HP_ARCH}" = "" ]; then
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
+
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
--
++ #define _HPUX_SOURCE
++ #include <stdlib.h>
++ #include <unistd.h>
+
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
--
++ int main ()
++ {
++ #if defined(_SC_KERNEL_BITS)
++ long bits = sysconf(_SC_KERNEL_BITS);
++ #endif
++ long cpu = sysconf (_SC_CPU_VERSION);
+
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
@@ -781,35 +838,6 @@
- }
- exit (0);
- }
-+ if [ -x /usr/bin/getconf ]; then
-+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
-+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-+ esac ;;
-+ esac
-+ fi
-+ if [ "${HP_ARCH}" = "" ]; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-+
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
@@ -870,7 +898,7 @@
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
-@@ -635,158 +705,176 @@
+@@ -635,158 +720,176 @@
exit (0);
}
EOF
@@ -1083,30 +1111,26 @@
- exit 0 ;;
+ 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-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
++ # the GNU system
++ 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 0 ;;
- arm*:Linux:*:*)
-+ exit ;;
-+ aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux
- exit 0 ;;
- m68*:Linux:*:*)
-+ exit ;;
-+ aarch64_be:Linux:*:*)
-+ UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- mips:Linux:*:*)
- case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
@@ -1121,71 +1145,75 @@
- echo powerpc64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
++ aarch64:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ aarch64_be:Linux:*:*)
++ UNAME_MACHINE=aarch64_be
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
-@@ -796,11 +884,90 @@
+@@ -796,104 +899,166 @@
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit 0 ;;
+ 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}
-- exit 0 ;;
++ 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
@@ -1204,23 +1232,29 @@
+ #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
-@@ -808,92 +975,71 @@
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+- 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 0 ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
@@ -1228,31 +1262,40 @@
- exit 0 ;;
+ 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
- exit 0 ;;
++ 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-gnu
- exit 0 ;;
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
++ 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 x86_64-unknown-linux-gnu
@@ -1313,10 +1356,10 @@
- rm -f $dummy.c $dummy
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- ;;
-+ 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.
@@ -1361,7 +1404,7 @@
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -901,99 +1047,113 @@
+@@ -901,99 +1066,113 @@
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
@@ -1514,7 +1557,7 @@
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1001,82 +1161,126 @@
+@@ -1001,82 +1180,138 @@
else
echo ns32k-sni-sysv
fi
@@ -1616,19 +1659,31 @@
- echo `uname -p`-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ 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 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 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1672,7 +1727,7 @@
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
-@@ -1087,41 +1291,55 @@
+@@ -1087,41 +1322,55 @@
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
@@ -1749,7 +1804,7 @@
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
-@@ -1139,16 +1357,16 @@
+@@ -1139,16 +1388,16 @@
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
@@ -1770,7 +1825,7 @@
#endif
#if defined (hp300) && !defined (hpux)
-@@ -1237,12 +1455,12 @@
+@@ -1237,12 +1486,12 @@
}
EOF
@@ -1786,7 +1841,7 @@
# Convex versions that predate uname can use getsysinfo(1)
-@@ -1251,22 +1469,22 @@
+@@ -1251,22 +1500,22 @@
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
@@ -1814,7 +1869,7 @@
esac
fi
-@@ -1277,7 +1495,9 @@
+@@ -1277,7 +1526,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
@@ -1825,24 +1880,38 @@
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
---- config.sub.orig 2005-03-05 10:20:39.000000000 -0600
-+++ config.sub 2013-03-03 00:30:18.841026879 -0600
-@@ -1,9 +1,10 @@
+--- config.sub.orig 2005-03-05 09:20:39.000000000 -0700
++++ config.sub 2014-06-09 08:07:14.000000000 -0600
+@@ -1,41 +1,40 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-+# 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='2001-09-07'
-+timestamp='2012-10-10'
++timestamp='2013-10-01'
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -20,22 +21,25 @@
- # GNU General Public License for more details.
+-# 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
++# 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, write to the Free Software
@@ -1854,12 +1923,14 @@
# 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.
++# 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 at gnu.org>.
+
-+# Please send patches to <config-patches at gnu.org>. Submit a context
-+# diff and a properly formatted GNU ChangeLog entry.
++# Please send patches with a ChangeLog entry to config-patches at gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -1872,17 +1943,17 @@
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
-@@ -69,7 +73,8 @@
+@@ -69,8 +68,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+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.
+-Free Software Foundation, Inc.
++Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
-@@ -82,11 +87,11 @@
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -82,11 +80,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
@@ -1897,7 +1968,7 @@
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
-@@ -98,7 +103,7 @@
+@@ -98,7 +96,7 @@
*local*)
# First pass through any local machine types.
echo $1
@@ -1906,7 +1977,7 @@
* )
break ;;
-@@ -117,10 +122,18 @@
+@@ -117,10 +115,18 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
@@ -1926,7 +1997,7 @@
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
-@@ -143,10 +156,13 @@
+@@ -143,10 +149,13 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -1941,7 +2012,7 @@
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -161,13 +177,17 @@
+@@ -161,13 +170,17 @@
os=-chorusos
basic_machine=$1
;;
@@ -1962,7 +2033,7 @@
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -184,6 +204,10 @@
+@@ -184,6 +197,10 @@
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
@@ -1973,7 +2044,7 @@
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -201,6 +225,12 @@
+@@ -201,6 +218,12 @@
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
@@ -1986,21 +2057,24 @@
-lynx*)
os=-lynxos
;;
-@@ -225,43 +255,103 @@
+@@ -225,43 +248,107 @@
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+- | c4x | clipper \
+- | d10v | d30v | dsp16xx \
+- | fr30 \
+ | 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 \
-- | d10v | d30v | dsp16xx \
-- | fr30 \
++ | c4x | c8051 | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | epiphany \
+ | fido | fr30 | frv \
@@ -2014,6 +2088,7 @@
- | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
- | mipsisa32 \
+ | ip2k | iq2000 \
++ | k1om \
+ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -2035,17 +2110,18 @@
+ | 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 \
- | openrisc \
+ | open8 \
-+ | or32 \
++ | or1k | or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
@@ -2084,7 +2160,7 @@
+ 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
;;
@@ -2111,7 +2187,7 @@
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
-@@ -277,41 +367,81 @@
+@@ -277,41 +364,83 @@
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
@@ -2124,13 +2200,13 @@
- | clipper-* | cray2-* | cydra-* \
- | d10v-* | d30v-* \
+ | 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-* | fr30-* | fx80-* \
@@ -2147,6 +2223,7 @@
- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
- | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+ | ip2k-* | iq2000-* \
++ | k1om-* \
+ | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
@@ -2170,12 +2247,13 @@
+ | 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-* \
@@ -2217,7 +2295,7 @@
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
-@@ -329,6 +459,9 @@
+@@ -329,6 +458,9 @@
basic_machine=a29k-amd
os=-udi
;;
@@ -2227,7 +2305,7 @@
adobe68k)
basic_machine=m68010-adobe
os=-scout
-@@ -343,6 +476,12 @@
+@@ -343,6 +475,12 @@
basic_machine=a29k-none
os=-bsd
;;
@@ -2240,7 +2318,7 @@
amdahl)
basic_machine=580-amdahl
os=-sysv
-@@ -366,6 +505,10 @@
+@@ -366,6 +504,10 @@
basic_machine=m68k-apollo
os=-bsd
;;
@@ -2251,7 +2329,7 @@
aux)
basic_machine=m68k-apple
os=-aux
-@@ -374,6 +517,35 @@
+@@ -374,6 +516,35 @@
basic_machine=ns32k-sequent
os=-dynix
;;
@@ -2287,7 +2365,7 @@
convex-c1)
basic_machine=c1-convex
os=-bsd
-@@ -394,30 +566,45 @@
+@@ -394,30 +565,45 @@
basic_machine=c38-convex
os=-bsd
;;
@@ -2341,7 +2419,7 @@
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
-@@ -426,6 +613,14 @@
+@@ -426,6 +612,14 @@
basic_machine=m88k-motorola
os=-sysv3
;;
@@ -2356,7 +2434,7 @@
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
-@@ -537,7 +732,6 @@
+@@ -537,7 +731,6 @@
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
@@ -2364,7 +2442,7 @@
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
-@@ -576,6 +770,14 @@
+@@ -576,6 +769,14 @@
basic_machine=m68k-isi
os=-sysv
;;
@@ -2379,7 +2457,7 @@
m88k-omron*)
basic_machine=m88k-omron
;;
-@@ -587,10 +789,21 @@
+@@ -587,10 +788,21 @@
basic_machine=ns32k-utek
os=-sysv
;;
@@ -2391,7 +2469,8 @@
+ os=-mingw64
+ ;;
mingw32)
- basic_machine=i386-pc
+- basic_machine=i386-pc
++ basic_machine=i686-pc
os=-mingw32
;;
+ mingw32ce)
@@ -2401,7 +2480,7 @@
miniframe)
basic_machine=m68000-convergent
;;
-@@ -598,36 +811,39 @@
+@@ -598,36 +810,39 @@
basic_machine=m68k-atari
os=-mint
;;
@@ -2439,7 +2518,7 @@
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
+ msys)
-+ basic_machine=i386-pc
++ basic_machine=i686-pc
+ os=-msys
+ ;;
mvs)
@@ -2453,7 +2532,7 @@
ncr3000)
basic_machine=i486-ncr
os=-sysv4
-@@ -692,6 +908,12 @@
+@@ -692,6 +907,12 @@
np1)
basic_machine=np1-gould
;;
@@ -2466,7 +2545,7 @@
nsr-tandem)
basic_machine=nsr-tandem
;;
-@@ -699,6 +921,13 @@
+@@ -699,6 +920,13 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
@@ -2480,7 +2559,7 @@
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
-@@ -715,55 +944,76 @@
+@@ -715,55 +943,76 @@
basic_machine=i860-intel
os=-osf
;;
@@ -2559,8 +2638,9 @@
;;
ppc64) basic_machine=powerpc64-unknown
- ;;
+- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
@@ -2569,18 +2649,22 @@
ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
-@@ -774,6 +1024,10 @@
+@@ -774,6 +1023,14 @@
basic_machine=i586-unknown
os=-pw32
;;
-+ rdos)
++ rdos | rdos64)
++ basic_machine=x86_64-pc
++ os=-rdos
++ ;;
++ rdos32)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
-@@ -784,10 +1038,30 @@
+@@ -784,10 +1041,30 @@
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
@@ -2611,7 +2695,7 @@
sequent)
basic_machine=i386-sequent
;;
-@@ -795,7 +1069,13 @@
+@@ -795,7 +1072,13 @@
basic_machine=sh-hitachi
os=-hms
;;
@@ -2626,7 +2710,7 @@
basic_machine=sparclite-wrs
os=-vxworks
;;
-@@ -813,6 +1093,9 @@
+@@ -813,6 +1096,9 @@
basic_machine=i860-stratus
os=-sysv4
;;
@@ -2636,7 +2720,7 @@
sun2)
basic_machine=m68000-sun
;;
-@@ -862,12 +1145,16 @@
+@@ -862,12 +1148,16 @@
os=-dynix
;;
t3e)
@@ -2657,7 +2741,7 @@
;;
tx39)
basic_machine=mipstx39-unknown
-@@ -875,9 +1162,17 @@
+@@ -875,9 +1165,17 @@
tx39el)
basic_machine=mipstx39el-unknown
;;
@@ -2675,7 +2759,7 @@
udi29k)
basic_machine=a29k-amd
os=-udi
-@@ -899,8 +1194,8 @@
+@@ -899,8 +1197,8 @@
os=-vms
;;
vpp*|vx|vx-*)
@@ -2686,7 +2770,7 @@
vxworks960)
basic_machine=i960-wrs
os=-vxworks
-@@ -921,21 +1216,28 @@
+@@ -921,21 +1219,28 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
@@ -2723,7 +2807,7 @@
none)
basic_machine=none-none
os=-none
-@@ -952,16 +1254,12 @@
+@@ -952,16 +1257,12 @@
op60c)
basic_machine=hppa1.1-oki
;;
@@ -2743,7 +2827,7 @@
rs6000)
basic_machine=rs6000-ibm
;;
-@@ -978,13 +1276,13 @@
+@@ -978,13 +1279,13 @@
we32k)
basic_machine=we32k-att
;;
@@ -2760,7 +2844,7 @@
basic_machine=cydra-cydrome
;;
orion)
-@@ -999,10 +1297,6 @@
+@@ -999,10 +1300,6 @@
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
@@ -2771,7 +2855,7 @@
*-unknown)
# Make sure to match an already-canonicalized machine name.
;;
-@@ -1029,9 +1323,12 @@
+@@ -1029,9 +1326,12 @@
if [ x"$os" != x"" ]
then
case $os in
@@ -2786,7 +2870,7 @@
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
-@@ -1052,23 +1349,31 @@
+@@ -1052,23 +1352,31 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -2794,7 +2878,7 @@
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -*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* \
+ | -aos* | -aros* \
@@ -2828,7 +2912,7 @@
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
-@@ -1080,16 +1385,21 @@
+@@ -1080,16 +1388,21 @@
;;
esac
;;
@@ -2852,7 +2936,7 @@
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-@@ -1102,6 +1412,9 @@
+@@ -1102,6 +1415,9 @@
-opened*)
os=-openedition
;;
@@ -2862,7 +2946,7 @@
-wince*)
os=-wince
;;
-@@ -1120,14 +1433,23 @@
+@@ -1120,14 +1436,23 @@
-acis*)
os=-aos
;;
@@ -2887,7 +2971,7 @@
;;
-nsk*)
os=-nsk
-@@ -1139,6 +1461,9 @@
+@@ -1139,6 +1464,9 @@
-sinix*)
os=-sysv4
;;
@@ -2897,7 +2981,7 @@
-triton*)
os=-sysv3
;;
-@@ -1166,8 +1491,22 @@
+@@ -1166,8 +1494,19 @@
-xenix)
os=-xenix
;;
@@ -2909,9 +2993,6 @@
+ -aros*)
+ os=-aros
+ ;;
-+ -kaos*)
-+ os=-kaos
-+ ;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
@@ -2935,13 +3016,16 @@
*-acorn)
os=-riscix1.2
;;
-@@ -1200,10 +1545,26 @@
+@@ -1200,10 +1545,29 @@
arm*-semi)
os=-aout
;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
++ c8051-*)
++ os=-elf
++ ;;
+ hexagon-*)
+ os=-elf
+ ;;
@@ -2963,7 +3047,7 @@
os=-none
;;
*-dec | vax-*)
-@@ -1217,19 +1578,22 @@
+@@ -1217,19 +1581,25 @@
;;
m68000-sun)
os=-sunos3
@@ -2983,13 +3067,16 @@
mips*-*)
os=-elf
;;
++ or1k-*)
++ os=-elf
++ ;;
+ or32-*)
+ os=-coff
+ ;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
-@@ -1239,9 +1603,15 @@
+@@ -1239,9 +1609,15 @@
*-be)
os=-beos
;;
@@ -3005,7 +3092,7 @@
*-wec)
os=-proelf
;;
-@@ -1293,19 +1663,19 @@
+@@ -1293,19 +1669,19 @@
*-next)
os=-nextstep3
;;
@@ -3029,7 +3116,7 @@
os=-sysv4
;;
*-masscomp)
-@@ -1344,7 +1714,7 @@
+@@ -1344,7 +1720,7 @@
-sunos*)
vendor=sun
;;
@@ -3038,7 +3125,7 @@
vendor=ibm
;;
-beos*)
-@@ -1374,10 +1744,16 @@
+@@ -1374,10 +1750,16 @@
-mvs* | -opened*)
vendor=ibm
;;
@@ -3056,7 +3143,7 @@
vendor=wrs
;;
-aux*)
-@@ -1401,7 +1777,7 @@
+@@ -1401,7 +1783,7 @@
esac
echo $basic_machine$os
diff --git a/abe.spec b/abe.spec
index 20d0cad..c2f08d9 100644
--- a/abe.spec
+++ b/abe.spec
@@ -1,6 +1,6 @@
Name: abe
Version: 1.1
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: Scrolling, platform-jumping, ancient pyramid exploring game
Group: Amusements/Games
@@ -15,7 +15,7 @@ Patch0: %{name}-1.1-settings.patch
# Fix a double free() bug. Sent upstream 15 Mar 2011:
# https://sourceforge.net/tracker/?func=detail&aid=3214269&group_id=70141&atid=526745
Patch1: %{name}-1.1-doublefree.patch
-# Fix an incorrect printf format specifier. Sent upstram 15 Mar 2011:
+# Fix an incorrect printf format specifier. Sent upstream 15 Mar 2011:
# https://sourceforge.net/tracker/?func=detail&aid=3214270&group_id=70141&atid=526745
Patch2: %{name}-1.1-format.patch
# Add support for aarch64. Sent upstream 25 Mar 2013:
@@ -99,6 +99,10 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||:
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%changelog
+* Wed Aug 13 2014 Jerry James <loganjerry at gmail.com> - 1.1-24
+- Drop unused abe.png file
+- Update -aarch64 patch with newer config.{guess,sub}
+
* Mon Jul 21 2014 Jerry James <loganjerry at gmail.com> - 1.1-23
- Add icons of varying sizes
- Use the new license macro
More information about the scm-commits
mailing list