From 8a438e4872b465a41ec8c838af2dfd985bb9468d Mon Sep 17 00:00:00 2001
From: Jan Mercl <0xjnml@gmail.com>
Date: Wed, 30 Dec 2020 22:08:17 +0100
Subject: [PATCH] bump {libc,tcl} version
---
go.mod | 4 +-
go.sum | 8 +-
internal/testfixture/testfixture_linux_386.go | 92 ----------------
.../testfixture/testfixture_linux_amd64.go | 102 ++----------------
internal/testfixture/testfixture_linux_arm.go | 88 ++-------------
lib/sqlite_darwin_amd64.go | 1 -
6 files changed, 24 insertions(+), 271 deletions(-)
diff --git a/go.mod b/go.mod
index ae50537..7f0eabf 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module modernc.org/sqlite
go 1.15
require (
- modernc.org/libc v0.0.0-20201230103131-0bb20a0a77f0
+ modernc.org/libc v0.0.0-20201230202152-b53fdb57d837
modernc.org/mathutil v1.2.1
- modernc.org/tcl v0.0.0-20201230103751-6cdf2a1035d8
+ modernc.org/tcl v0.0.0-20201230205409-25be3d1c4329
)
diff --git a/go.sum b/go.sum
index 6fea99d..cf6555d 100644
--- a/go.sum
+++ b/go.sum
@@ -7,13 +7,13 @@ golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr
golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
modernc.org/httpfs v1.0.2 h1:4aw8F68gTwx7FWL/vEMjm/XaPwPL16MItkF/P9ziEPY=
modernc.org/httpfs v1.0.2/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/libc v0.0.0-20201230103131-0bb20a0a77f0 h1:qHppwIBsGvr1jP+xXoXiCHFia2HICvnWaT364g4caUo=
-modernc.org/libc v0.0.0-20201230103131-0bb20a0a77f0/go.mod h1:IR66laG5b3bONN1tfix3Gpy8xk/6WDf+Rtc4NqNczls=
+modernc.org/libc v0.0.0-20201230202152-b53fdb57d837 h1:yfxBxPNx4T70CsXX4FmT7iv4WYoERnVDzLuFB0BwUjM=
+modernc.org/libc v0.0.0-20201230202152-b53fdb57d837/go.mod h1:IR66laG5b3bONN1tfix3Gpy8xk/6WDf+Rtc4NqNczls=
modernc.org/mathutil v1.1.1 h1:FeylZSVX8S+58VsyJlkEj2bcpdytmp9MmDKZkKx8OIE=
modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
modernc.org/mathutil v1.2.1 h1:PSIN4RdyeB6MbFsNLSkFCzDjnEVEMS3H/hFHcJtAJ9g=
modernc.org/mathutil v1.2.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
modernc.org/memory v1.0.1 h1:bhVo78NAdgvRD4N+b2hGnAwL5RP2+QyiEJDsX3jpeDA=
modernc.org/memory v1.0.1/go.mod h1:NSjvC08+g3MLOpcAxQbdctcThAEX4YlJ20WWHYEhvRg=
-modernc.org/tcl v0.0.0-20201230103751-6cdf2a1035d8 h1:E9WLsh7FVD57ot68rCQGuKV0X4tqQa4q6UVVFnsgYRo=
-modernc.org/tcl v0.0.0-20201230103751-6cdf2a1035d8/go.mod h1:tGuLIyS4d0m1Y2U9nHnkBBcxELi/XCCJ9s4GFnPJUPo=
+modernc.org/tcl v0.0.0-20201230205409-25be3d1c4329 h1:EKze/1KW4Twcu4FnQzITnajE+FLqvg4tEGtERKl5vlA=
+modernc.org/tcl v0.0.0-20201230205409-25be3d1c4329/go.mod h1:INH5AHW3df14LzZ91oB8+5Lks8b+jeGlah6V1Cqe/SM=
diff --git a/internal/testfixture/testfixture_linux_386.go b/internal/testfixture/testfixture_linux_386.go
index b82b746..7507b9b 100644
--- a/internal/testfixture/testfixture_linux_386.go
+++ b/internal/testfixture/testfixture_linux_386.go
@@ -3891,98 +3891,6 @@ const ( /* waitflags.h:52:1: */
P_PGID = 2
)
-// Floating-point inline functions for stdlib.h.
-// Copyright (C) 2012-2018 Free Software Foundation, Inc.
-// This file is part of the GNU C Library.
-//
-// The GNU C Library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// The GNU C Library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with the GNU C Library; if not, see
-// .
-
-// Define some macros helping to catch buffer overflows.
-
-// Copyright (C) 1991-2018 Free Software Foundation, Inc.
-// This file is part of the GNU C Library.
-//
-// The GNU C Library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// The GNU C Library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with the GNU C Library; if not, see
-// .
-
-// ISO C99 Standard: 7.2 Diagnostics
-
-// Copyright (C) 1991-2018 Free Software Foundation, Inc.
-// This file is part of the GNU C Library.
-//
-// The GNU C Library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// The GNU C Library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with the GNU C Library; if not, see
-// .
-
-// void assert (int expression);
-//
-// If NDEBUG is defined, do nothing.
-// If not, and EXPRESSION is zero, print an error message and abort.
-
-// void assert_perror (int errnum);
-//
-// If NDEBUG is defined, do nothing. If not, and ERRNUM is not zero, print an
-// error message with the error text for ERRNUM and abort.
-// (This is a GNU extension.)
-
-// Copyright (C) 1989-2018 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-//
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
-// .
-
-// ISO C Standard: 7.15 Variable arguments
-
// Copyright (C) 1991-2018 Free Software Foundation, Inc.
// This file is part of the GNU C Library.
//
diff --git a/internal/testfixture/testfixture_linux_amd64.go b/internal/testfixture/testfixture_linux_amd64.go
index b971629..94b64ee 100644
--- a/internal/testfixture/testfixture_linux_amd64.go
+++ b/internal/testfixture/testfixture_linux_amd64.go
@@ -3099,98 +3099,6 @@ const (
TESTVFS_WRITE_MASK = 0x00001000
)
-// Floating-point inline functions for stdlib.h.
-// Copyright (C) 2012-2018 Free Software Foundation, Inc.
-// This file is part of the GNU C Library.
-//
-// The GNU C Library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// The GNU C Library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with the GNU C Library; if not, see
-// .
-
-// Define some macros helping to catch buffer overflows.
-
-// Copyright (C) 1991-2018 Free Software Foundation, Inc.
-// This file is part of the GNU C Library.
-//
-// The GNU C Library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// The GNU C Library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with the GNU C Library; if not, see
-// .
-
-// ISO C99 Standard: 7.2 Diagnostics
-
-// Copyright (C) 1991-2018 Free Software Foundation, Inc.
-// This file is part of the GNU C Library.
-//
-// The GNU C Library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// The GNU C Library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with the GNU C Library; if not, see
-// .
-
-// void assert (int expression);
-//
-// If NDEBUG is defined, do nothing.
-// If not, and EXPRESSION is zero, print an error message and abort.
-
-// void assert_perror (int errnum);
-//
-// If NDEBUG is defined, do nothing. If not, and ERRNUM is not zero, print an
-// error message with the error text for ERRNUM and abort.
-// (This is a GNU extension.)
-
-// Copyright (C) 1989-2018 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-//
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
-// .
-
-// ISO C Standard: 7.15 Variable arguments
-
// Copyright (C) 1991-2018 Free Software Foundation, Inc.
// This file is part of the GNU C Library.
//
@@ -3878,9 +3786,15 @@ const ( /* resource.h:187:1: */
PRIO_USER = 2
)
-// Convenience macros for operations on timevals.
-// NOTE: `timercmp' does not work for >= or <=.
+// end block for C++
+// Local Variables:
+// mode: c
+// c-basic-offset: 4
+// fill-column: 78
+// End:
+
+// Needed for the setrlimit() system call on unix
// Copyright (C) 1992-2018 Free Software Foundation, Inc.
// This file is part of the GNU C Library.
//
diff --git a/internal/testfixture/testfixture_linux_arm.go b/internal/testfixture/testfixture_linux_arm.go
index 2e113dd..8a4aa1f 100644
--- a/internal/testfixture/testfixture_linux_arm.go
+++ b/internal/testfixture/testfixture_linux_arm.go
@@ -3531,9 +3531,15 @@ const ( /* resource.h:187:1: */
PRIO_USER = 2
)
-// Convenience macros for operations on timevals.
-// NOTE: `timercmp' does not work for >= or <=.
+// end block for C++
+// Local Variables:
+// mode: c
+// c-basic-offset: 4
+// fill-column: 78
+// End:
+
+// Needed for the setrlimit() system call on unix
// Copyright (C) 1992-2018 Free Software Foundation, Inc.
// This file is part of the GNU C Library.
//
@@ -3890,8 +3896,8 @@ const ( /* waitflags.h:52:1: */
P_PGID = 2
)
-// Floating-point inline functions for stdlib.h.
-// Copyright (C) 2012-2018 Free Software Foundation, Inc.
+// Definitions for POSIX 1003.1b-1993 (aka POSIX.4) scheduling interface.
+// Copyright (C) 1996-2018 Free Software Foundation, Inc.
// This file is part of the GNU C Library.
//
// The GNU C Library is free software; you can redistribute it and/or
@@ -3908,80 +3914,6 @@ const ( /* waitflags.h:52:1: */
// License along with the GNU C Library; if not, see
// .
-// Define some macros helping to catch buffer overflows.
-
-// Copyright (C) 1991-2018 Free Software Foundation, Inc.
-// This file is part of the GNU C Library.
-//
-// The GNU C Library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// The GNU C Library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with the GNU C Library; if not, see
-// .
-
-// ISO C99 Standard: 7.2 Diagnostics
-
-// Copyright (C) 1991-2018 Free Software Foundation, Inc.
-// This file is part of the GNU C Library.
-//
-// The GNU C Library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// The GNU C Library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with the GNU C Library; if not, see
-// .
-
-// void assert (int expression);
-//
-// If NDEBUG is defined, do nothing.
-// If not, and EXPRESSION is zero, print an error message and abort.
-
-// void assert_perror (int errnum);
-//
-// If NDEBUG is defined, do nothing. If not, and ERRNUM is not zero, print an
-// error message with the error text for ERRNUM and abort.
-// (This is a GNU extension.)
-
-// Copyright (C) 1989-2018 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-//
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
-// .
-
-// ISO C Standard: 7.15 Variable arguments
-
// Copyright (C) 1991-2018 Free Software Foundation, Inc.
// This file is part of the GNU C Library.
//
diff --git a/lib/sqlite_darwin_amd64.go b/lib/sqlite_darwin_amd64.go
index bf3f26c..5fa9a74 100644
--- a/lib/sqlite_darwin_amd64.go
+++ b/lib/sqlite_darwin_amd64.go
@@ -176432,7 +176432,6 @@ __15:
goto __14
goto __16
__16:
-
}
// This is a helper function for rbuObjIterCacheTableInfo(). It populates