X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gnulib%2Fupdate-gnulib.sh;h=f539647d03aed266d5545b66073e4fb0aba6eae6;hb=8c74a764f2cf5ea5e6997e35ba0f755fe2c09889;hp=fb79b23c5310ac57415326c5f5435006a5ec91b1;hpb=73cc72729a184f00bf6fc4d74684a8516ba6b683;p=deliverable%2Fbinutils-gdb.git

diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh
index fb79b23c53..f539647d03 100755
--- a/gnulib/update-gnulib.sh
+++ b/gnulib/update-gnulib.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2011-2019 Free Software Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
 # This file is part of GDB.
 #
@@ -32,6 +32,7 @@
 IMPORTED_GNULIB_MODULES="\
     alloca \
     canonicalize-lgpl \
+    count-one-bits \
     dirent \
     dirfd \
     errno \
@@ -55,9 +56,11 @@ IMPORTED_GNULIB_MODULES="\
     setenv \
     signal-h \
     strchrnul \
+    strerror_r-posix \
     strstr \
     strtok_r \
     sys_stat \
+    time_r \
     unistd \
     unsetenv \
     update-copyright \
@@ -66,7 +69,7 @@ IMPORTED_GNULIB_MODULES="\
 "
 
 # The gnulib commit ID to use for the update.
-GNULIB_COMMIT_SHA1="38237baf99386101934cd93278023aa4ae523ec0"
+GNULIB_COMMIT_SHA1="e22cd2677a4b7beacbf30b93bb0559f7b89f96ce"
 
 # The expected version number for the various auto tools we will
 # use after the import.
@@ -100,9 +103,9 @@ if [ "$gnulib_head_sha1" != "$GNULIB_COMMIT_SHA1" ]; then
    exit 1
 fi
 
-# Verify that we are in the gdb/ subdirectory.
-if [ ! -f ../main.c -o ! -d import ]; then
-   echo "Error: This script should be called from the gdb/gnulib subdirectory."
+# Verify that we are in the correct directory.
+if [ ! -f ../gdb/main.c -o ! -d import ]; then
+   echo "Error: This script should be called from the gnulib subdirectory."
    echo "Aborting."
    exit 1
 fi
@@ -162,18 +165,15 @@ fi
 # Apply our local patches.
 apply_patches ()
 {
-    patch -p3 -f -i "$1"
+    patch -p2 -f -i "$1"
     if [ $? -ne 0 ]; then
         echo "Failed to apply some patches.  Aborting."
         exit 1
     fi
 }
 
-apply_patches "patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch"
-apply_patches "patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch"
-
 # Regenerate all necessary files...
-aclocal -Iimport/m4 -I../config &&
+aclocal &&
 autoconf &&
 autoheader &&
 automake
@@ -181,15 +181,3 @@ if [ $? -ne 0 ]; then
    echo "Error: Failed to regenerate Makefiles and configure scripts."
    exit 1
 fi
-
-# Update aclocal-m4-deps.mk
-ACLOCAL_M4_DEPS_FILE=aclocal-m4-deps.mk
-cat > ${ACLOCAL_M4_DEPS_FILE}.tmp <<EOF
-# THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi :set ro:
-aclocal_m4_deps = \\
-$(find import/m4 -type f -name "*.m4" | LC_COLLATE=C sort | \
-  sed 's/^/	/; s/$/ \\/; $s/ \\//g')
-EOF
-
-../../move-if-change ${ACLOCAL_M4_DEPS_FILE}.tmp ${ACLOCAL_M4_DEPS_FILE}
-rm -f ${ACLOCAL_M4_DEPS_FILE}.tmp