diff --git a/configure.ac b/configure.ac index d3748e894..2ceb3894b 100644 --- a/configure.ac +++ b/configure.ac @@ -506,6 +506,7 @@ case "${host_os}" in AC_DEFINE([SDK_13_0], 130000, [SDK_VERS value for Xcode SDK macOS 13.0 / iOS 16]) AC_DEFINE([SDK_14_0], 140000, [SDK_VERS value for Xcode SDK macOS 14.0 / iOS 17]) AC_DEFINE([SDK_15_0], 150000, [SDK_VERS value for Xcode SDK macOS 15.0 / iOS 18]) + AC_DEFINE([SDK_26_0], 260000, [SDK_VERS value for Xcode SDK macOS / iOS 26]) # Substitute the Xcode include path detected earlier AC_SUBST(SDK_INC_DIR, [$xcodedir_inc]) @@ -721,6 +722,9 @@ case "${host_os}" in macosx-15.*|iphoneos-18.*) AC_DEFINE([SDK_VERS], SDK_15_0, [SDK version]) ;; + *-26.*) + AC_DEFINE([SDK_VERS], SDK_26_0, [SDK version]) + ;; legacy) AC_DEFINE([SDK_VERS], SDK_10_XX, [SDK version]) ;; diff --git a/memcheck/tests/wcpncpy.stderr.exp b/memcheck/tests/wcpncpy.stderr.exp index 3d68ff1c1..97f5fa8c7 100644 --- a/memcheck/tests/wcpncpy.stderr.exp +++ b/memcheck/tests/wcpncpy.stderr.exp @@ -1,19 +1,19 @@ Conditional jump or move depends on uninitialised value(s) - at 0x........: wcpncpy (vg_replace_strmem.c:2605) + at 0x........: wcpncpy (vg_replace_strmem.c:...) by 0x........: main (wcpncpy.c:14) Invalid write of size 4 - at 0x........: wcpncpy (vg_replace_strmem.c:2605) + at 0x........: wcpncpy (vg_replace_strmem.c:...) by 0x........: main (wcpncpy.c:27) Address 0x........ is 20 bytes inside a block of size 22 alloc'd at 0x........: malloc (vg_replace_malloc.c:...) by 0x........: main (wcpncpy.c:10) Source and destination overlap in wcpncpy(0x........, 0x........) - at 0x........: wcpncpy (vg_replace_strmem.c:2605) + at 0x........: wcpncpy (vg_replace_strmem.c:...) by 0x........: main (wcpncpy.c:35) Source and destination overlap in wcpncpy(0x........, 0x........) - at 0x........: wcpncpy (vg_replace_strmem.c:2605) + at 0x........: wcpncpy (vg_replace_strmem.c:...) by 0x........: main (wcpncpy.c:43) diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c index e584d0c01..7fb22fbc8 100644 --- a/shared/vg_replace_strmem.c +++ b/shared/vg_replace_strmem.c @@ -2603,6 +2603,9 @@ static inline void my_exit ( int x ) #if defined(VGO_linux) || defined(VGO_freebsd) || defined(VGO_solaris) WCPNCPY(VG_Z_LIBC_SONAME, wcpncpy) +#elif defined(VGO_darwin) + WCPNCPY(libsystemZucZddylib, wcpncpy) +#else #endif /*----------------------- wcscat ----------------------*/ diff --git a/tests/filter_stderr_basic.in b/tests/filter_stderr_basic.in index 81b8ccf83..49ccf766e 100644 --- a/tests/filter_stderr_basic.in +++ b/tests/filter_stderr_basic.in @@ -62,6 +62,7 @@ $SED "/sh: [1-9][0-9]*: \(Memory fault\|Alarm call\|Terminated\|Killed\|Abort\)/ # Translate intercepted glibc functions back to their canonical name perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(vg_replace_strmem.c:.*?\)/: memcpy \(vg_replace_strmem.c:...\)/" | $SED -e "s/: \(__GI_\|__\|\)\(memcmp\|memcpy\|strcpy\|strncpy\|strchr\|strrchr\)\(\|_sse4_1\|_sse42\|_sse2_unaligned\|_sse2\) (vg_replace_strmem.c:/: \2 (vg_replace_strmem.c:/" | +$SED -e "s/: wcpncpy \(vg_replace_strmem.c:.*?\)/: wcpncpy \(vg_replace_strmem.c:...\)/" | # Remove any ": dumping core" message as the user might have a # limit set that prevents the core dump