From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5138 invoked by alias); 19 Apr 2012 10:25:27 -0000 Received: (qmail 5121 invoked by uid 22791); 19 Apr 2012 10:25:25 -0000 X-SWARE-Spam-Status: No, hits=-6.6 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 19 Apr 2012 10:24:46 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3JAOkKZ017525 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 19 Apr 2012 06:24:46 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3JAOjfr031471 for ; Thu, 19 Apr 2012 06:24:45 -0400 Subject: [PATCH] memmem removed from gdbserver's AC_CHECK_DECLS. To: gdb-patches@sourceware.org From: Pedro Alves Date: Thu, 19 Apr 2012 12:01:00 -0000 Message-ID: <20120419102444.16030.63019.stgit@brno.lan> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-04/txt/msg00619.txt.bz2 Building gdbserver for i686-pc-mingw32 with the future gnulib wrapper showed that both gdbserver and gnulib were checking for the memmem declaration, and defining HAVE_DECL_MEMMEM. i686-pc-mingw32-gcc -c -g -O2 -D__USE_MINGW_ACCESS -I../../../src/gdb/gdbserver/../gnulib -Ibuild-gnulib/gnulib -I../../../src/gdb/gdbserver/../../include -I. -I../../../src/gdb/gdbserver -I../../../src/gdb/gdbserver/../common -I../../../src/gdb/gdbserver/../regformats -Wall -Wdeclaration-after-statement -Wpointer-arith -Wformat-nonliteral -Wno-char-subscripts -Werror version.c In file included from ../../../src/gdb/gdbserver/server.h:24:0, from i386-avx.c:23: ./config.h:28:0: error: "HAVE_DECL_MEMMEM" redefined [-Werror] ../../../src/gdb/gdbserver/build-gnulib/config.h:45:0: note: this is the location of the previous definition The gdbserver check was made unnecessary when it started using gnulib. Applied. 2012-04-19 Pedro Alves * configure.ac: Remove AC_CHECK_DECLS check for memmem. * server.h (memmem): Remove declaration. * config.in: Regenerate. * configure: Regenerate. --- gdb/gdbserver/config.in | 4 ---- gdb/gdbserver/configure | 10 ---------- gdb/gdbserver/configure.ac | 2 +- gdb/gdbserver/server.h | 4 ---- 4 files changed, 1 insertions(+), 19 deletions(-) diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in index ffa4afb..26742ac 100644 --- a/gdb/gdbserver/config.in +++ b/gdb/gdbserver/config.in @@ -22,10 +22,6 @@ you don't. */ #undef HAVE_DECL_ADDR_NO_RANDOMIZE -/* Define to 1 if you have the declaration of `memmem', and to 0 if you don't. - */ -#undef HAVE_DECL_MEMMEM - /* Define to 1 if you have the declaration of `perror', and to 0 if you don't. */ #undef HAVE_DECL_PERROR diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 25d1812..cdd54f1 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -5139,16 +5139,6 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_PERROR $ac_have_decl _ACEOF -ac_fn_c_check_decl "$LINENO" "memmem" "ac_cv_have_decl_memmem" "$ac_includes_default" -if test "x$ac_cv_have_decl_memmem" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MEMMEM $ac_have_decl -_ACEOF ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default" if test "x$ac_cv_have_decl_vasprintf" = x""yes; then : ac_have_decl=1 diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index ac8223a..96a5f2d 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -167,7 +167,7 @@ AC_TRY_LINK([ [AC_MSG_RESULT(no)]) fi -AC_CHECK_DECLS([strerror, perror, memmem, vasprintf, vsnprintf]) +AC_CHECK_DECLS([strerror, perror, vasprintf, vsnprintf]) AC_CHECK_TYPES(socklen_t, [], [], [#include diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index a419c36..49f94d0 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -59,10 +59,6 @@ extern void perror (const char *); #endif #endif -#if !HAVE_DECL_MEMMEM -extern void *memmem (const void *, size_t , const void *, size_t); -#endif - #if !HAVE_DECL_VASPRINTF extern int vasprintf(char **strp, const char *fmt, va_list ap); #endif