Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge up to a510d51a78f14fbb8416037a587ce1bfc6016d24 from upstream #1215

Merged
merged 14 commits into from
Jan 31, 2025
Merged

Merge up to a510d51a78f14fbb8416037a587ce1bfc6016d24 from upstream #1215

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
83e0293
Add Linux SPI device SWD adapter support
Dec 11, 2024
41f7d18
target: armv7m: add support of per register data_type
borneoa Dec 30, 2024
8e89a8a
target: cortex_m: add support of ARMv8.1-M register 'vpr'
borneoa Dec 30, 2024
3099547
OpenOCD: fix code indentation
borneoa Sep 16, 2024
77f9da7
flash/nor/kinetis: fix assertion during flash write
tom-van Jan 17, 2025
0b97973
vdebug: Fix socket comparison warning on Windows
MarekVCodasip Jan 13, 2025
778d2dc
helper/options: drop redundant argument checks
en-sc Jan 17, 2025
345473f
helper/options: handle errors in `-l`
en-sc Dec 17, 2024
ac18b8c
configure: make more robust the check for elf 64
borneoa Nov 17, 2024
8038e2f
configure: allow --enable-malloc-logging only with glibc
borneoa Nov 17, 2024
fceccde
helper/log: Fix build using _DEBUG_FREE_SPACE_
borneoa Feb 20, 2024
77c904f
Deprecate jimtcl Git submodule
zapb-0 Jul 2, 2024
a510d51
bootstrap: Do not set up Git submodules by default
zapb-0 Jun 26, 2024
309c25f
Merge up to a510d51a78f14fbb8416037a587ce1bfc6016d24 from upstream
en-sc Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
configure: allow --enable-malloc-logging only with glibc 
The feature for 'malloc-logging' uses functionalities that are
available only in GNU libc.

Detect in 'configure' if OpenOCD is being compiled with glibc.
Set the macro '_DEBUG_FREE_SPACE_' only in case of glibc.

Change-Id: I43e9b87c7ad47171cfe3e7c1e5f96f11e19f98d0
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8592
Tested-by: jenkins
  • Loading branch information
@borneoa
borneoa committed Jan 25, 2025
commit 8038e2f7548792a090bdd255ec6bfbf4128fead7
7 changes: 6 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ AC_CHECK_TYPE([Elf64_Ehdr],
AC_DEFINE([HAVE_ELF64], [1], [Define to 1 if the system has the type 'Elf64_Ehdr'.]),
[], [[#include <elf.h>]])

AC_MSG_CHECKING([for glibc])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <features.h>]], [[int v = __GLIBC__;return 0;]])],
[have_glibc=yes], [have_glibc=no])
AC_MSG_RESULT($have_glibc)

AC_CHECK_HEADERS([fcntl.h])
AC_CHECK_HEADERS([malloc.h])
AC_CHECK_HEADERS([netdb.h])
Expand Down Expand Up @@ -262,7 +267,7 @@ AC_ARG_ENABLE([malloc_logging],

AC_MSG_CHECKING([whether to enable malloc free space logging]);
AC_MSG_RESULT([$debug_malloc])
AS_IF([test "x$debug_malloc" = "xyes"], [
AS_IF([test "x$debug_malloc" = "xyes" -a "x$have_glibc" = "xyes"], [
AC_DEFINE([_DEBUG_FREE_SPACE_],[1], [Include malloc free space in logging])
])

Expand Down