mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
73cc72729a
This patch moves the gdb/gnulib subdirectory to the top level. It adjusts the top-level build system to build gnulib when necessary, and changes gdb to use this. However, gdbserver still builds its own copy of gnulib, just from the new source location. A small hack was needed to ensure that gnulib is only built when gdb is enabled. The Makefile only provides an ordering -- the directory must be mentioned in configdirs to actually be compiled at all. Most of the patch is just a "git mv" of gnulib, though a few minor path adjustments were needed in some files there. Tested by the buildbot. ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * MAINTAINERS: Add gnulib. * gnulib: New directory, move from gdb/gnulib. * configure.ac (host_libs): Add gnulib. * configure: Rebuild. * Makefile.def (host_modules, dependencies): Add gnulib. * Makefile.in: Rebuild. gdb/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * gnulib: Move directory to top-level. * configure.ac: Don't configure gnulib. * configure: Rebuild. * common/common-defs.h: Use new path to gnulib. * Makefile.in (GNULIB_BUILDDIR): Now ../gnulib. (GNULIB_H): Remove. (INCGNU): Look in new gnulib location. (HFILES_NO_SRCDIR): Remove gnulib files. (SUBDIR, REQUIRED_SUBDIRS): Remove gnulib. (generated_files): Remove GNULIB_H. ($(LIBGNU), all-lib): Remove targets. (distclean): Don't mention GNULIB_BUILDDIR. ($(GNULIB_BUILDDIR)/Makefile): Remove target. gdb/gdbserver/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * configure.ac: Use new path to gnulib. * configure: Rebuild. * Makefile.in (INCGNU, $(GNULIB_BUILDDIR)/Makefile): Use new path to gnulib. gnulib/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * update-gnulib.sh: Adjust paths. * Makefile.in: Adjust paths. * configure.ac: Adjust paths. Use ACX_LARGEFILE. * configure: Rebuild.
75 lines
2.5 KiB
Plaintext
75 lines
2.5 KiB
Plaintext
# strtok_r.m4 serial 13
|
|
dnl Copyright (C) 2002-2004, 2006-2007, 2009-2016 Free Software Foundation,
|
|
dnl Inc.
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
AC_DEFUN([gl_FUNC_STRTOK_R],
|
|
[
|
|
dnl The strtok_r() declaration in lib/string.in.h uses 'restrict'.
|
|
AC_REQUIRE([AC_C_RESTRICT])
|
|
|
|
AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
|
|
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
|
|
AC_CHECK_FUNCS([strtok_r])
|
|
if test $ac_cv_func_strtok_r = yes; then
|
|
HAVE_STRTOK_R=1
|
|
dnl glibc 2.7 has a bug in strtok_r that causes a segmentation fault
|
|
dnl when the second argument to strtok_r is a constant string that has
|
|
dnl exactly one byte and compiling with optimization. This bug is, for
|
|
dnl example, present in the glibc 2.7-18 package in Debian "lenny".
|
|
dnl See <http://sources.redhat.com/bugzilla/show_bug.cgi?id=5614>.
|
|
AC_CACHE_CHECK([whether strtok_r works], [gl_cv_func_strtok_r_works],
|
|
[AC_RUN_IFELSE(
|
|
[AC_LANG_PROGRAM([[
|
|
#ifndef __OPTIMIZE__
|
|
# define __OPTIMIZE__ 1
|
|
#endif
|
|
#undef __OPTIMIZE_SIZE__
|
|
#undef __NO_INLINE__
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
]],
|
|
[[static const char dummy[] = "\177\01a";
|
|
char delimiters[] = "xxxxxxxx";
|
|
char *save_ptr = (char *) dummy;
|
|
strtok_r (delimiters, "x", &save_ptr);
|
|
strtok_r (NULL, "x", &save_ptr);
|
|
return 0;
|
|
]])
|
|
],
|
|
[gl_cv_func_strtok_r_works=yes],
|
|
[gl_cv_func_strtok_r_works=no],
|
|
[
|
|
changequote(,)dnl
|
|
case "$host_os" in
|
|
# Guess no on glibc systems.
|
|
*-gnu*) gl_cv_func_strtok_r_works="guessing no";;
|
|
*) gl_cv_func_strtok_r_works="guessing yes";;
|
|
esac
|
|
changequote([,])dnl
|
|
])
|
|
])
|
|
case "$gl_cv_func_strtok_r_works" in
|
|
*no)
|
|
dnl We could set REPLACE_STRTOK_R=1 here, but it's only the macro
|
|
dnl version in <bits/string2.h> which is wrong. The code compiled
|
|
dnl into libc is fine.
|
|
UNDEFINE_STRTOK_R=1
|
|
;;
|
|
esac
|
|
else
|
|
HAVE_STRTOK_R=0
|
|
fi
|
|
AC_CHECK_DECLS_ONCE([strtok_r])
|
|
if test $ac_cv_have_decl_strtok_r = no; then
|
|
HAVE_DECL_STRTOK_R=0
|
|
fi
|
|
])
|
|
|
|
# Prerequisites of lib/strtok_r.c.
|
|
AC_DEFUN([gl_PREREQ_STRTOK_R], [
|
|
:
|
|
])
|