From a9590526e0bfc67184a10d122ac8e34b9f3e8024 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 18 Jun 2015 17:48:21 -0700 Subject: [PATCH] Update gmsl and config.guess --- doc/gmsl.html | 7 +++++++ ext/__gmsl | 17 ++++++++++------- ext/config.guess | 31 ++++++++++++++++++++++++------- ext/gmsl | 2 +- 4 files changed, 42 insertions(+), 15 deletions(-) diff --git a/doc/gmsl.html b/doc/gmsl.html index 822717b7..28fd58d9 100644 --- a/doc/gmsl.html +++ b/doc/gmsl.html @@ -250,6 +250,13 @@ Returns:   Returns the set with the element removed
Returns:   Returns $(true) if the element is in the set
+
set_is_not_member
+
+Arguments: 1: A single element
+           2: A set
+Returns:   Returns $(false) if the element is in the set
+ +
set_union

Arguments: 1: A set
diff --git a/ext/__gmsl b/ext/__gmsl index 22e56dcf..3db20ad9 100644 --- a/ext/__gmsl +++ b/ext/__gmsl @@ -42,7 +42,7 @@ # This is the GNU Make Standard Library version number as a list with # three items: major, minor, revision -gmsl_version := 1 1 6 +gmsl_version := 1 1 7 __gmsl_name := GNU Make Standard Library @@ -383,6 +383,11 @@ lc = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(call tr,$([A-Z]),$([a-z]),$1) # Arguments: 1: A string # Returns: Returns the length of the string # ---------------------------------------------------------------------------- + +# This results in __gmsl_tab containing a tab + +__gmsl_tab := # + __gmsl_characters := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z __gmsl_characters += a b c d e f g h i j k l m n o p q r s t u v w x y z __gmsl_characters += 0 1 2 3 4 5 6 7 8 9 @@ -403,10 +408,6 @@ define __gmsl_newline endef -# This results in __gmsl_tab containing a tab - -__gmsl_tab := # - # ---------------------------------------------------------------------------- # Function: substr # Arguments: 1: A string @@ -455,12 +456,14 @@ set_insert = $(__gmsl_tr2)$(sort $1 $2) set_remove = $(__gmsl_tr2)$(filter-out $1,$2) # ---------------------------------------------------------------------------- -# Function: set_is_member +# Function: set_is_member, set_is_not_member # Arguments: 1: A single element # 2: A set -# Returns: Returns $(true) if the element is in the set +# Returns: (set_is_member) Returns $(true) if the element is in the set +# (set_is_not_member) Returns $(false) if the element is in the set # ---------------------------------------------------------------------------- set_is_member = $(__gmsl_tr2)$(if $(filter $1,$2),$(true),$(false)) +set_is_not_member = $(__gmsl_tr2)$(if $(filter $1,$2),$(false),$(true)) # ---------------------------------------------------------------------------- # Function: set_union diff --git a/ext/config.guess b/ext/config.guess index 6c32c864..f7eb141e 100755 --- a/ext/config.guess +++ b/ext/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-11-04' +timestamp='2015-03-04' # 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 @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 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." @@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -213,7 +227,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -933,6 +947,9 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; diff --git a/ext/gmsl b/ext/gmsl index 78407ddf..17891f13 100644 --- a/ext/gmsl +++ b/ext/gmsl @@ -5,7 +5,7 @@ # A library of functions to be used with GNU Make's $(call) that # provides functionality not available in standard GNU Make. # -# Copyright (c) 2005-2013 John Graham-Cumming +# Copyright (c) 2005-2014 John Graham-Cumming # # This file is part of GMSL #