=== Applying patches on top of PostgreSQL commit ID b27f8637ea708c4b6113f0d29a76cb411b430a27 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Mar 30 22:50:22 UTC 2025 On branch cf/5100 nothing to commit, working tree clean === using 'git am' to apply patch ./v10-0001-Add-a-Postgres-SQL-function-for-crc32c-benchmark.patch === Applying: Add a Postgres SQL function for crc32c benchmarking. === using 'git am' to apply patch ./v10-0002-Refactor-consolidate-x86-ISA-and-OS-runtime-chec.patch === Applying: Refactor: consolidate x86 ISA and OS runtime checks .git/rebase-apply/patch:349: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M src/include/port/pg_bitutils.h M src/port/Makefile M src/port/meson.build M src/port/pg_bitutils.c M src/port/pg_crc32c_sse42_choose.c M src/port/pg_popcount_avx512.c Falling back to patching base and 3-way merge... Auto-merging src/port/pg_popcount_avx512.c Auto-merging src/port/pg_crc32c_sse42_choose.c Auto-merging src/port/pg_bitutils.c CONFLICT (content): Merge conflict in src/port/pg_bitutils.c Auto-merging src/port/meson.build Auto-merging src/port/Makefile Auto-merging src/include/port/pg_bitutils.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Refactor: consolidate x86 ISA and OS runtime checks When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Unstaged changes after reset: M src/include/port/pg_bitutils.h M src/port/Makefile M src/port/meson.build M src/port/pg_bitutils.c M src/port/pg_crc32c_sse42_choose.c M src/port/pg_popcount_avx512.c Removing src/include/port/pg_hw_feat_check.h Removing src/port/pg_hw_feat_check.c === using patch(1) to apply patch ./v10-0002-Refactor-consolidate-x86-ISA-and-OS-runtime-chec.patch === patch: unrecognized option `--no-backup-if-mismatch' usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory] [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count] [-r rej-name] [-V t | nil | never | none] [-x number] [-z backup-ext] [--posix] [origfile [patchfile]] patch >>>>>> theirs static int pg_popcount32_choose(uint32 word); static int pg_popcount64_choose(uint64 word); static uint64 pg_popcount_choose(const char *buf, int bytes); @@@ -128,29 -122,10 +132,10 @@@ int (*pg_popcount32) (uint32 word) = int (*pg_popcount64) (uint64 word) = pg_popcount64_choose; uint64 (*pg_popcount_optimized) (const char *buf, int bytes) = pg_popcount_choose; uint64 (*pg_popcount_masked_optimized) (const char *buf, int bytes, bits8 mask) = pg_popcount_masked_choose; -#endif /* TRY_POPCNT_FAST */ +#endif /* TRY_POPCNT_X86_64 */ -#ifdef TRY_POPCNT_FAST +#ifdef TRY_POPCNT_X86_64 - /* - * Return true if CPUID indicates that the POPCNT instruction is available. - */ - static bool - pg_popcount_available(void) - { - unsigned int exx[4] = {0, 0, 0, 0}; - - #if defined(HAVE__GET_CPUID) - __get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]); - #elif defined(HAVE__CPUID) - __cpuid(exx, 1); - #else - #error cpuid instruction not available - #endif - - return (exx[2] & (1 << 23)) != 0; /* POPCNT */ - } - /* * These functions get called on the first call to pg_popcount32 etc. * They detect whether we can use the asm implementations, and replace