aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2018-07-03 23:47:52 -0700
committerPaul Eggert2018-07-03 23:51:31 -0700
commit891536aaad5a2a456656b778735513a57bb461c3 (patch)
tree7a4cc66a9eac78e4740b723629c31d2144cc4abd
parent38ea8e147add0b386737df4145d7ee0fc841fe55 (diff)
downloademacs-891536aaad5a2a456656b778735513a57bb461c3.tar.gz
emacs-891536aaad5a2a456656b778735513a57bb461c3.zip
Update from Gnulib
This incorporates: 2018-07-01 getloadavg: don't redefine WINDOWS32 2018-07-01 manywarnings: omit -Wswitch-default * build-aux/config.sub, lib/getloadavg.c, m4/manywarnings.m4: Copy from Gnulib.
-rwxr-xr-xbuild-aux/config.sub8
-rw-r--r--lib/getloadavg.c2
-rw-r--r--m4/manywarnings.m43
3 files changed, 9 insertions, 4 deletions
diff --git a/build-aux/config.sub b/build-aux/config.sub
index d1f5b549034..072700fb037 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright 1992-2018 Free Software Foundation, Inc. 3# Copyright 1992-2018 Free Software Foundation, Inc.
4 4
5timestamp='2018-05-24' 5timestamp='2018-07-02'
6 6
7# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
@@ -1125,6 +1125,12 @@ case $basic_machine in
1125 ps2) 1125 ps2)
1126 basic_machine=i386-ibm 1126 basic_machine=i386-ibm
1127 ;; 1127 ;;
1128 riscv)
1129 basic_machine=riscv32-unknown
1130 ;;
1131 riscv-*)
1132 basic_machine=`echo "$basic_machine" | sed 's/^riscv/riscv32/'`
1133 ;;
1128 rm[46]00) 1134 rm[46]00)
1129 basic_machine=mips-siemens 1135 basic_machine=mips-siemens
1130 ;; 1136 ;;
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 435d10a6b10..578316e34d8 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -97,7 +97,7 @@
97 97
98# include "intprops.h" 98# include "intprops.h"
99 99
100# if defined _WIN32 && ! defined __CYGWIN__ 100# if defined _WIN32 && ! defined __CYGWIN__ && ! defined WINDOWS32
101# define WINDOWS32 101# define WINDOWS32
102# endif 102# endif
103 103
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index 925c40e139a..516c5874765 100644
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -1,4 +1,4 @@
1# manywarnings.m4 serial 15 1# manywarnings.m4 serial 16
2dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. 2dnl Copyright (C) 2008-2018 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -239,7 +239,6 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
239 -Wsuggest-final-types \ 239 -Wsuggest-final-types \
240 -Wswitch \ 240 -Wswitch \
241 -Wswitch-bool \ 241 -Wswitch-bool \
242 -Wswitch-default \
243 -Wswitch-unreachable \ 242 -Wswitch-unreachable \
244 -Wsync-nand \ 243 -Wsync-nand \
245 -Wsystem-headers \ 244 -Wsystem-headers \