emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 3518592: Update from Gnulib


From: Paul Eggert
Subject: [Emacs-diffs] master 3518592: Update from Gnulib
Date: Sun, 19 Aug 2018 02:14:35 -0400 (EDT)

branch: master
commit 351859238d8b72c514f6714bd0f6b4dd39941606
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Update from Gnulib
    
    This incorporates:
    2018-08-18 Avoid -Wcast-function-type warnings from casts
    * build-aux/config.sub, lib/gettimeofday.c: Copy from Gnulib.
---
 build-aux/config.sub | 312 +++++++++++++++++++++++++++------------------------
 lib/gettimeofday.c   |   4 +
 2 files changed, 169 insertions(+), 147 deletions(-)

diff --git a/build-aux/config.sub b/build-aux/config.sub
index 97d38aa..6e8fa65 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-25'
+timestamp='2018-08-13'
 
 # 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
@@ -149,29 +149,39 @@ case $1 in
                esac
                ;;
        *-*)
-               # Second component is usually, but not always the OS
-               case $field2 in
-                       # Prevent following clause from handling this valid os
-                       sun*os*)
-                               basic_machine=$field1
-                               os=$field2
-                               ;;
-                       # Manufacturers
-                       dec* | mips* | sequent* | encore* | pc532* | sgi* | 
sony* \
-                       | att* | 7300* | 3300* | delta* | motorola* | sun[234]* 
\
-                       | unicom* | ibm* | next | hp | isi* | apollo | altos* \
-                       | 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* \
-                       | sim | cisco | oki | wec | wrs | winbond)
-                               basic_machine=$field1-$field2
+               # A lone config we happen to match not fitting any patern
+               case $field1-$field2 in
+                       decstation-3100)
+                               basic_machine=mips-dec
                                os=
                                ;;
-                       *)
-                               basic_machine=$field1
-                               os=$field2
-                               ;;
+                       *-*)
+                               # Second component is usually, but not always 
the OS
+                               case $field2 in
+                                       # Prevent following clause from 
handling this valid os
+                                       sun*os*)
+                                               basic_machine=$field1
+                                               os=$field2
+                                               ;;
+                                       # Manufacturers
+                                       dec* | mips* | sequent* | encore* | 
pc533* | sgi* | sony* \
+                                       | att* | 7300* | 3300* | delta* | 
motorola* | sun[234]* \
+                                       | unicom* | ibm* | next | hp | isi* | 
apollo | altos* \
+                                       | 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* | sim | cisco \
+                                       | oki | wec | wrs | winbond)
+                                               basic_machine=$field1-$field2
+                                               os=
+                                               ;;
+                                       *)
+                                               basic_machine=$field1
+                                               os=$field2
+                                               ;;
+                               esac
+                       ;;
                esac
                ;;
        *)
@@ -190,6 +200,14 @@ case $1 in
                                basic_machine=m68010-adobe
                                os=scout
                                ;;
+                       alliant)
+                               basic_machine=fx80-alliant
+                               os=
+                               ;;
+                       altos | altos3068)
+                               basic_machine=m68k-altos
+                               os=
+                               ;;
                        am29k)
                                basic_machine=a29k-none
                                os=bsd
@@ -198,6 +216,10 @@ case $1 in
                                basic_machine=580-amdahl
                                os=sysv
                                ;;
+                       amiga)
+                               basic_machine=m68k-unknown
+                               os=
+                               ;;
                        amigaos | amigados)
                                basic_machine=m68k-unknown
                                os=amigaos
@@ -234,13 +256,41 @@ case $1 in
                                basic_machine=arm-unknown
                                os=cegcc
                                ;;
+                       convex-c1)
+                               basic_machine=c1-convex
+                               os=bsd
+                               ;;
+                       convex-c2)
+                               basic_machine=c2-convex
+                               os=bsd
+                               ;;
+                       convex-c32)
+                               basic_machine=c32-convex
+                               os=bsd
+                               ;;
+                       convex-c34)
+                               basic_machine=c34-convex
+                               os=bsd
+                               ;;
+                       convex-c38)
+                               basic_machine=c38-convex
+                               os=bsd
+                               ;;
                        cray)
                                basic_machine=j90-cray
                                os=unicos
                                ;;
-                       craynv)
-                               basic_machine=craynv-cray
-                               os=unicosmp
+                       crds | unos)
+                               basic_machine=m68k-crds
+                               os=
+                               ;;
+                       da30)
+                               basic_machine=m68k-da30
+                               os=
+                               ;;
+                       decstation | pmax | pmin | dec3100 | decstatn)
+                               basic_machine=mips-dec
+                               os=
                                ;;
                        delta88)
                                basic_machine=m88k-motorola
@@ -286,6 +336,9 @@ case $1 in
                                basic_machine=m88k-harris
                                os=sysv3
                                ;;
+                       hp300)
+                               basic_machine=m68k-hp
+                               ;;
                        hp300bsd)
                                basic_machine=m68k-hp
                                os=bsd
@@ -454,14 +507,26 @@ case $1 in
                                basic_machine=mips-sei
                                os=seiux
                                ;;
+                       sequent)
+                               basic_machine=i386-sequent
+                               os=
+                               ;;
                        sps7)
                                basic_machine=m68k-bull
                                os=sysv2
                                ;;
+                       st2000)
+                               basic_machine=m68k-tandem
+                               os=
+                               ;;
                        stratus)
                                basic_machine=i860-stratus
                                os=sysv4
                                ;;
+                       sun2)
+                               basic_machine=m68000-sun
+                               os=
+                               ;;
                        sun2os3)
                                basic_machine=m68000-sun
                                os=sunos3
@@ -470,6 +535,10 @@ case $1 in
                                basic_machine=m68000-sun
                                os=sunos4
                                ;;
+                       sun3)
+                               basic_machine=m68k-sun
+                               os=
+                               ;;
                        sun3os3)
                                basic_machine=m68k-sun
                                os=sunos3
@@ -478,6 +547,10 @@ case $1 in
                                basic_machine=m68k-sun
                                os=sunos4
                                ;;
+                       sun4)
+                               basic_machine=sparc-sun
+                               os=
+                               ;;
                        sun4os3)
                                basic_machine=sparc-sun
                                os=sunos3
@@ -490,6 +563,10 @@ case $1 in
                                basic_machine=sparc-sun
                                os=solaris2
                                ;;
+                       sun386 | sun386i | roadrunner)
+                               basic_machine=i386-sun
+                               os=
+                               ;;
                        sv1)
                                basic_machine=sv1-cray
                                os=unicos
@@ -564,6 +641,64 @@ esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
+       # Here we handle the default manufacturer of certain CPU types.  It is 
in
+       # some cases the only manufacturer, in others, it is the most popular.
+       craynv)
+               basic_machine=craynv-cray
+               os=${os:-unicosmp}
+               ;;
+       fx80)
+               basic_machine=fx80-alliant
+               ;;
+       w89k)
+               basic_machine=hppa1.1-winbond
+               ;;
+       op50n)
+               basic_machine=hppa1.1-oki
+               ;;
+       op60c)
+               basic_machine=hppa1.1-oki
+               ;;
+       romp)
+               basic_machine=romp-ibm
+               ;;
+       mmix)
+               basic_machine=mmix-knuth
+               ;;
+       rs6000)
+               basic_machine=rs6000-ibm
+               ;;
+       vax)
+               basic_machine=vax-dec
+               ;;
+       pdp11)
+               basic_machine=pdp11-dec
+               ;;
+       we32k)
+               basic_machine=we32k-att
+               ;;
+       cydra)
+               basic_machine=cydra-cydrome
+               ;;
+       i370-ibm* | ibm*)
+               basic_machine=i370-ibm
+               ;;
+       orion)
+               basic_machine=orion-highlevel
+               ;;
+       orion105)
+               basic_machine=clipper-highlevel
+               ;;
+       mac | mpw | mac-mpw)
+               basic_machine=m68k-apple
+               ;;
+       pmac | pmac-mpw)
+               basic_machine=powerpc-apple
+               ;;
+       xps | xps100)
+               basic_machine=xps100-honeywell
+               ;;
+
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.
        1750a | 580 \
@@ -592,6 +727,7 @@ case $basic_machine in
        | le32 | le64 \
        | lm32 \
        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+       | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
        | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
@@ -640,7 +776,7 @@ case $basic_machine in
        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
        | visium \
        | wasm32 \
-       | x86 | xc16x | xstormy16 | xtensa \
+       | x86 | xc16x | xstormy16 | xgate | xtensa \
        | z8k | z80)
                basic_machine=$basic_machine-unknown
                ;;
@@ -656,11 +792,6 @@ case $basic_machine in
        leon|leon[3-9])
                basic_machine=sparc-$basic_machine
                ;;
-       m6811-* | m68hc11-* | m6812-* | m68hc12-* | m68hcs12x-* | nvptx-* | 
picochip-*)
-               ;;
-       m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-               basic_machine=$basic_machine-unknown
-               ;;
        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
                ;;
        m9s12z | m68hcs12z | hcs12z | s12z)
@@ -675,11 +806,6 @@ case $basic_machine in
        strongarm | thumb | xscale)
                basic_machine=arm-unknown
                ;;
-       xgate)
-               basic_machine=$basic_machine-unknown
-               ;;
-       xgate-*)
-               ;;
        xscaleeb)
                basic_machine=armeb-unknown
                ;;
@@ -718,13 +844,14 @@ case $basic_machine in
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | hexagon-* \
-       | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+       | i370-* | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
        | ip2k-* | iq2000-* \
        | k1om-* \
        | le32-* | le64-* \
        | lm32-* \
        | m32c-* | m32r-* | m32rle-* \
        | m5200-* | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* | 
v70-* | w65-* \
+       | m6811-* | m68hc11-* | m6812-* | m68hc12-* | m68hcs12x-* | nvptx-* | 
picochip-* \
        | m88110-* | m88k-* | maxq-* | mb-* | mcore-* | mep-* | metag-* \
        | microblaze-* | microblazeel-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -783,7 +910,7 @@ case $basic_machine in
        | visium-* \
        | wasm32-* \
        | we32k-* \
-       | x86-* | x86_64-* | xc16x-* | xps100-* \
+       | x86-* | x86_64-* | xc16x-* | xgate-* | xps100-* \
        | xstormy16-* | xtensa*-* \
        | ymp-* \
        | z8k-* | z80-*)
@@ -800,21 +927,12 @@ case $basic_machine in
        3b*)
                basic_machine=we32k-att
                ;;
-       alliant | fx80)
-               basic_machine=fx80-alliant
-               ;;
-       altos | altos3068)
-               basic_machine=m68k-altos
-               ;;
        amd64)
                basic_machine=x86_64-pc
                ;;
        amd64-*)
                basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                ;;
-       amiga | amiga-*)
-               basic_machine=m68k-unknown
-               ;;
        blackfin-*)
                basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                os=linux
@@ -836,33 +954,10 @@ case $basic_machine in
                basic_machine=c90-cray
                os=${os:-unicos}
                ;;
-       convex-c1)
-               basic_machine=c1-convex
-               os=bsd
-               ;;
-       convex-c2)
-               basic_machine=c2-convex
-               os=bsd
-               ;;
-       convex-c32)
-               basic_machine=c32-convex
-               os=bsd
-               ;;
-       convex-c34)
-               basic_machine=c34-convex
-               os=bsd
-               ;;
-       convex-c38)
-               basic_machine=c38-convex
-               os=bsd
-               ;;
        cr16 | cr16-*)
                basic_machine=cr16-unknown
                os=${os:-elf}
                ;;
-       crds | unos)
-               basic_machine=m68k-crds
-               ;;
        crisv32 | crisv32-* | etraxfs*)
                basic_machine=crisv32-axis
                ;;
@@ -873,12 +968,6 @@ case $basic_machine in
                basic_machine=crx-unknown
                os=${os:-elf}
                ;;
-       da30 | da30-*)
-               basic_machine=m68k-da30
-               ;;
-       decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | 
decstatn)
-               basic_machine=mips-dec
-               ;;
        decsystem10* | dec10*)
                basic_machine=pdp10-dec
                os=tops10
@@ -924,9 +1013,6 @@ case $basic_machine in
                basic_machine=hppa1.1-hitachi
                os=hiuxwe2
                ;;
-       hp300-*)
-               basic_machine=m68k-hp
-               ;;
        hp3k9[0-9][0-9] | hp9[0-9][0-9])
                basic_machine=hppa1.0-hp
                ;;
@@ -956,9 +1042,6 @@ case $basic_machine in
        hp9k8[0-9][0-9] | hp8[0-9][0-9])
                basic_machine=hppa1.0-hp
                ;;
-       i370-ibm* | ibm*)
-               basic_machine=i370-ibm
-               ;;
        i*86v32)
                basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
                os=sysv32
@@ -1155,9 +1238,6 @@ case $basic_machine in
                basic_machine=mipsisa32-sde
                os=${os:-elf}
                ;;
-       sequent)
-               basic_machine=i386-sequent
-               ;;
        sh5el)
                basic_machine=sh5le-unknown
                ;;
@@ -1171,24 +1251,9 @@ case $basic_machine in
        spur)
                basic_machine=spur-unknown
                ;;
-       st2000)
-               basic_machine=m68k-tandem
-               ;;
        strongarm-* | thumb-*)
                basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                ;;
-       sun2)
-               basic_machine=m68000-sun
-               ;;
-       sun3 | sun3-*)
-               basic_machine=m68k-sun
-               ;;
-       sun4)
-               basic_machine=sparc-sun
-               ;;
-       sun386 | sun386i | roadrunner)
-               basic_machine=i386-sun
-               ;;
        tile*-*)
                ;;
        tile*)
@@ -1218,9 +1283,6 @@ case $basic_machine in
        x64)
                basic_machine=x86_64-pc
                ;;
-       xps | xps100)
-               basic_machine=xps100-honeywell
-               ;;
        xscale-* | xscalee[bl]-*)
                basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
                ;;
@@ -1228,50 +1290,6 @@ case $basic_machine in
                basic_machine=none-none
                ;;
 
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-       w89k)
-               basic_machine=hppa1.1-winbond
-               ;;
-       op50n)
-               basic_machine=hppa1.1-oki
-               ;;
-       op60c)
-               basic_machine=hppa1.1-oki
-               ;;
-       romp)
-               basic_machine=romp-ibm
-               ;;
-       mmix)
-               basic_machine=mmix-knuth
-               ;;
-       rs6000)
-               basic_machine=rs6000-ibm
-               ;;
-       vax)
-               basic_machine=vax-dec
-               ;;
-       pdp11)
-               basic_machine=pdp11-dec
-               ;;
-       we32k)
-               basic_machine=we32k-att
-               ;;
-       cydra)
-               basic_machine=cydra-cydrome
-               ;;
-       orion)
-               basic_machine=orion-highlevel
-               ;;
-       orion105)
-               basic_machine=clipper-highlevel
-               ;;
-       mac | mpw | mac-mpw)
-               basic_machine=m68k-apple
-               ;;
-       pmac | pmac-mpw)
-               basic_machine=powerpc-apple
-               ;;
        *)
                echo Invalid configuration \`"$1"\': machine 
\`"$basic_machine"\' not recognized 1>&2
                exit 1
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index fd44f45..1bd50fa 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -33,6 +33,10 @@
 
 #ifdef WINDOWS_NATIVE
 
+/* Avoid warnings from gcc -Wcast-function-type.  */
+# define GetProcAddress \
+   (void *) GetProcAddress
+
 /* GetSystemTimePreciseAsFileTime was introduced only in Windows 8.  */
 typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME 
*lpTime);
 static GetSystemTimePreciseAsFileTimeFuncType 
GetSystemTimePreciseAsFileTimeFunc = NULL;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]