aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2018-04-18 12:45:43 +0300
committerArnold D. Robbins <arnold@skeeve.com>2018-04-18 12:45:43 +0300
commit5ff0c8cd5bd07d03af406746e1012ffbf5ffb17a (patch)
treeb222aed09828ae5a0a3c61c107f1d6548a76f533
parent4a4e94a4eb04cb8a57d54a357409da47821020ab (diff)
parentdc99abc9803ae1d6481eb2da77b6c67eb9d5880d (diff)
downloadegawk-5ff0c8cd5bd07d03af406746e1012ffbf5ffb17a.tar.gz
egawk-5ff0c8cd5bd07d03af406746e1012ffbf5ffb17a.tar.bz2
egawk-5ff0c8cd5bd07d03af406746e1012ffbf5ffb17a.zip
Merge branch 'master' into feature/fix-comments
-rw-r--r--ChangeLog4
-rwxr-xr-xconfig.sub10
-rw-r--r--extension/build-aux/ChangeLog4
-rwxr-xr-xextension/build-aux/config.sub10
-rw-r--r--pc/ChangeLog5
-rw-r--r--pc/config.h2
-rw-r--r--pc/config.sed2
7 files changed, 29 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d351b3d3..a6d169da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-18 Arnold D. Robbins <arnold@skeeve.com>
+
+ * config.sub: Updated from GNULIB.
+
2018-04-14 Manuel Collado <m-collado@users.sourceforge.net>
* field.c (reset_record): Disable fieldwidth from API
diff --git a/config.sub b/config.sub
index 9ccf09a7..657a8625 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-03-08'
+timestamp='2018-04-16'
# 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
@@ -254,7 +254,7 @@ case $basic_machine in
| ba \
| be32 | be64 \
| bfin \
- | c4x | c8051 | clipper \
+ | c4x | c8051 | clipper | csky \
| d10v | d30v | dlx | dsp16xx \
| e2k | epiphany \
| fido | fr30 | frv | ft32 \
@@ -335,6 +335,10 @@ case $basic_machine in
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
;;
+ m9s12z | m68hcs12z | hcs12z | s12z)
+ basic_machine=s12z-unknown
+ os=-none
+ ;;
ms1)
basic_machine=mt-unknown
;;
@@ -378,7 +382,7 @@ case $basic_machine in
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | c8051-* | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
diff --git a/extension/build-aux/ChangeLog b/extension/build-aux/ChangeLog
index 87ada523..8b6c3325 100644
--- a/extension/build-aux/ChangeLog
+++ b/extension/build-aux/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-18 Arnold D. Robbins <arnold@skeeve.com>
+
+ * config.sub: Updated from GNULIB.
+
2018-04-02 Arnold D. Robbins <arnold@skeeve.com>
* config.guess, config.sub, install-sh: Updated from GNULIB.
diff --git a/extension/build-aux/config.sub b/extension/build-aux/config.sub
index 9ccf09a7..657a8625 100755
--- a/extension/build-aux/config.sub
+++ b/extension/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-03-08'
+timestamp='2018-04-16'
# 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
@@ -254,7 +254,7 @@ case $basic_machine in
| ba \
| be32 | be64 \
| bfin \
- | c4x | c8051 | clipper \
+ | c4x | c8051 | clipper | csky \
| d10v | d30v | dlx | dsp16xx \
| e2k | epiphany \
| fido | fr30 | frv | ft32 \
@@ -335,6 +335,10 @@ case $basic_machine in
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
;;
+ m9s12z | m68hcs12z | hcs12z | s12z)
+ basic_machine=s12z-unknown
+ os=-none
+ ;;
ms1)
basic_machine=mt-unknown
;;
@@ -378,7 +382,7 @@ case $basic_machine in
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | c8051-* | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
diff --git a/pc/ChangeLog b/pc/ChangeLog
index e623a9a3..cdecbc4c 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-18 Arnold D. Robbins <arnold@skeeve.com>
+
+ * config.sed: Add HAVE_STDBOOL_H for MinGW.
+ * config.h: Ditto.
+
2018-03-22 Arnold D. Robbins <arnold@skeeve.com>
* config.h: Add support for printf %a format.
diff --git a/pc/config.h b/pc/config.h
index d7c25142..e2a388a4 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -233,7 +233,7 @@
#define HAVE_STDARG_H 1
/* Define to 1 if stdbool.h conforms to C99. */
-#ifdef __DJGPP__
+#if defined(__MINGW32__) || defined(__DJGPP__)
#define HAVE_STDBOOL_H 1
#endif
diff --git a/pc/config.sed b/pc/config.sed
index a7ba8788..315c9cad 100644
--- a/pc/config.sed
+++ b/pc/config.sed
@@ -142,7 +142,7 @@ s/^#undef HAVE_MKTIME *$/#define HAVE_MKTIME 1/
#endif
s/^#undef HAVE_STDARG_H *$/#define HAVE_STDARG_H 1/
/^#undef HAVE_STDBOOL_H *$/c\
-#ifdef __DJGPP__\
+#if defined(__MINGW32__) || defined(__DJGPP__)\
#define HAVE_STDBOOL_H 1\
#endif
/^#undef HAVE_STDDEF_H *$/c\