Skip to content

Commit 0ca347d

Browse files
authored
Merge pull request IvorySQL#888 from OreoYang/sync_pg18_0828
Sync pg18 take3
2 parents b621866 + 6fbd98f commit 0ca347d

1,266 files changed

Lines changed: 176485 additions & 119285 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cirrus.tasks.yml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ task:
322322
build
323323
EOF
324324
325-
build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS}'
325+
build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}'
326326
upload_caches: ccache
327327

328328
test_world_script: |
@@ -471,6 +471,7 @@ task:
471471
--enable-cassert --enable-injection-points --enable-debug \
472472
--enable-tap-tests --enable-nls \
473473
--with-segsize-blocks=6 \
474+
--with-libnuma \
474475
--with-liburing \
475476
\
476477
${LINUX_CONFIGURE_FEATURES} \
@@ -523,11 +524,21 @@ task:
523524
-Dllvm=disabled \
524525
--pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \
525526
-DPERL=perl5.36-i386-linux-gnu \
527+
-Dlibnuma=disabled \
526528
build-32
527529
EOF
528530
529-
build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}'
530-
build_32_script: su postgres -c 'ninja -C build-32 -j${BUILD_JOBS} ${MBUILD_TARGET}'
531+
build_script: |
532+
su postgres <<-EOF
533+
ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}
534+
ninja -C build -t missingdeps
535+
EOF
536+
537+
build_32_script: |
538+
su postgres <<-EOF
539+
ninja -C build-32 -j${BUILD_JOBS} ${MBUILD_TARGET}
540+
ninja -C build -t missingdeps
541+
EOF
531542
532543
upload_caches: ccache
533544

@@ -727,6 +738,7 @@ task:
727738
build_script: |
728739
vcvarsall x64
729740
ninja -C build %MBUILD_TARGET%
741+
ninja -C build -t missingdeps
730742
731743
check_world_script: |
732744
vcvarsall x64

‎.git-blame-ignore-revs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@
1414
#
1515
# $ git log --pretty=format:"%H # %cd%n# %s" $PGINDENTGITHASH -1 --date=iso
1616

17+
b27644bade0348d0dafd3036c47880a349fe9332 # 2025-06-15 13:04:24 -0400
18+
# Sync typedefs.list with the buildfarm.
19+
20+
4672b6223910687b2aab075bcd2dd54ce90d5171 # 2025-06-01 14:55:24 -0400
21+
# Run pgindent on the previous commit.
22+
23+
918e7287ed20eb1fe280ab6c4056ccf94dcd53a8 # 2025-04-30 19:18:30 +1200
24+
# Fix broken indentation
25+
26+
e1a8b1ad587112e67fdc5aa7b388631dde4dbdda # 2025-04-04 09:38:22 -0500
27+
# Re-pgindent pg_largeobject.c after commit 0d6c477664.
28+
1729
796bdda484c838313959f65e2b700f14ac7c0e66 # 2025-03-18 09:02:36 -0400
1830
# Fix indentation again.
1931

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PostgreSQL Database Management System
2-
(formerly known as Postgres, then as Postgres95)
2+
(also known as Postgres, formerly known as Postgres95)
33

44
Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
55

‎config/c-compiler.m4‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,44 @@ fi
581581
undefine([Ac_cachevar])dnl
582582
])# PGAC_SSE42_CRC32_INTRINSICS
583583

584+
# PGAC_AVX512_PCLMUL_INTRINSICS
585+
# ---------------------------
586+
# Check if the compiler supports AVX-512 carryless multiplication
587+
# and three-way exclusive-or instructions used for computing CRC.
588+
# AVX-512F is assumed to be supported if the above are.
589+
#
590+
# If the intrinsics are supported, sets pgac_avx512_pclmul_intrinsics.
591+
AC_DEFUN([PGAC_AVX512_PCLMUL_INTRINSICS],
592+
[define([Ac_cachevar], [AS_TR_SH([pgac_cv_avx512_pclmul_intrinsics])])dnl
593+
AC_CACHE_CHECK([for _mm512_clmulepi64_epi128], [Ac_cachevar],
594+
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <immintrin.h>
595+
__m512i x;
596+
__m512i y;
597+
598+
#if defined(__has_attribute) && __has_attribute (target)
599+
__attribute__((target("vpclmulqdq,avx512vl")))
600+
#endif
601+
static int avx512_pclmul_test(void)
602+
{
603+
__m128i z;
604+
605+
x = _mm512_xor_si512(_mm512_zextsi128_si512(_mm_cvtsi32_si128(0)), x);
606+
y = _mm512_clmulepi64_epi128(x, y, 0);
607+
z = _mm_ternarylogic_epi64(
608+
_mm512_castsi512_si128(y),
609+
_mm512_extracti32x4_epi32(y, 1),
610+
_mm512_extracti32x4_epi32(y, 2),
611+
0x96);
612+
return _mm_crc32_u64(0, _mm_extract_epi64(z, 0));
613+
}],
614+
[return avx512_pclmul_test();])],
615+
[Ac_cachevar=yes],
616+
[Ac_cachevar=no])])
617+
if test x"$Ac_cachevar" = x"yes"; then
618+
pgac_avx512_pclmul_intrinsics=yes
619+
fi
620+
undefine([Ac_cachevar])dnl
621+
])# PGAC_AVX512_PCLMUL_INTRINSICS
584622

585623
# PGAC_ARMV8_CRC32C_INTRINSICS
586624
# ----------------------------

‎config/config.guess‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# shellcheck disable=SC2006,SC2268 # see below for rationale
66

7-
timestamp='2024-01-01'
7+
timestamp='2024-07-27'
88

99
# This file is free software; you can redistribute it and/or modify it
1010
# under the terms of the GNU General Public License as published by
@@ -123,7 +123,7 @@ set_cc_for_build() {
123123
dummy=$tmp/dummy
124124
case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
125125
,,) echo "int x;" > "$dummy.c"
126-
for driver in cc gcc c89 c99 ; do
126+
for driver in cc gcc c17 c99 c89 ; do
127127
if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
128128
CC_FOR_BUILD=$driver
129129
break
@@ -634,7 +634,8 @@ EOF
634634
sed 's/^ //' << EOF > "$dummy.c"
635635
#include <sys/systemcfg.h>
636636
637-
main()
637+
int
638+
main ()
638639
{
639640
if (!__power_pc())
640641
exit(1);
@@ -718,7 +719,8 @@ EOF
718719
#include <stdlib.h>
719720
#include <unistd.h>
720721
721-
int main ()
722+
int
723+
main ()
722724
{
723725
#if defined(_SC_KERNEL_BITS)
724726
long bits = sysconf(_SC_KERNEL_BITS);
@@ -1621,6 +1623,7 @@ cat > "$dummy.c" <<EOF
16211623
#endif
16221624
#endif
16231625
#endif
1626+
int
16241627
main ()
16251628
{
16261629
#if defined (sony)

0 commit comments

Comments
 (0)