From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1VkqOl-0002K0-2O for ltp-list@lists.sourceforge.net; Mon, 25 Nov 2013 07:15:59 +0000 Received: from [222.73.24.84] (helo=song.cn.fujitsu.com) by sog-mx-3.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1VkqOj-000796-BT for ltp-list@lists.sourceforge.net; Mon, 25 Nov 2013 07:15:59 +0000 Message-ID: <5292F8E3.4000903@cn.fujitsu.com> Date: Mon, 25 Nov 2013 15:14:43 +0800 From: Wanlong Gao MIME-Version: 1.0 References: <1385130059-12150-1-git-send-email-markos.chandras@imgtec.com> In-Reply-To: <1385130059-12150-1-git-send-email-markos.chandras@imgtec.com> Subject: Re: [LTP] [PATCH] ptrace: Fix build problems with glibc-2.18 Reply-To: gaowanlong@cn.fujitsu.com List-Id: Linux Test Project General Discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-list-bounces@lists.sourceforge.net To: Markos Chandras Cc: ltp-list@lists.sourceforge.net On 11/22/2013 10:20 PM, Markos Chandras wrote: > Since glibc-2.18, the struct ptrace_peeksiginfo_args is > also defined in sys/ptrace.h and conflicts with the definition > from the Linux kernel in linux/ptrace.h. We fix this by not > including the linux/ptrace.h header if the sys/ptrace.h header > defines the said struct. Fixes > https://github.com/linux-test-project/ltp/issues/6 > > Signed-off-by: Markos Chandras > --- > Build tested on glibc-2.17 and glibc-2.18 systems > --- > configure.ac | 4 ++++ > include/config.h.default | 3 +++ > testcases/kernel/syscalls/ptrace/ptrace.h | 4 +++- > 3 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index 4846afd..d427276 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -48,6 +48,10 @@ AC_CHECK_HEADERS([ \ > sys/prctl.h \ > ]) > > +# glibc-2.18 defines ptrace_peeksiginfo_args in sys/ptrace.h which > +# conflicts with the one from linux kernel in linux/ptrace.h > +AC_CHECK_TYPES([struct ptrace_peeksiginfo_args],,,[#include ]) We generally place this like checks to m4/*. > + > # Tools knobs > > # Expect > diff --git a/include/config.h.default b/include/config.h.default > index 96e25c4..f226333 100644 > --- a/include/config.h.default > +++ b/include/config.h.default > @@ -167,6 +167,9 @@ > /* Define to 1 if the system has the type `struct modify_ldt_ldt_s'. */ > #undef HAVE_STRUCT_MODIFY_LDT_LDT_S > > +/* Define to 1 if the system has the type `struct ptrace_peeksiginfo_args'. */ > +#undef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARG Missed an "S" here? Thanks, Wanlong Gao > + > /* Define to 1 if `signo' is member of `struct signalfd_siginfo'. */ > #undef HAVE_STRUCT_SIGNALFD_SIGINFO_SIGNO > > diff --git a/testcases/kernel/syscalls/ptrace/ptrace.h b/testcases/kernel/syscalls/ptrace/ptrace.h > index f0767d7..4a43f01 100644 > --- a/testcases/kernel/syscalls/ptrace/ptrace.h > +++ b/testcases/kernel/syscalls/ptrace/ptrace.h > @@ -19,7 +19,9 @@ > # include > #endif > #ifdef HAVE_LINUX_PTRACE_H > -# include > +# ifndef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS > +# include > +# endif > #endif > #undef FU_ia64_fpreg > #undef FU_pt_all_user_regs > ------------------------------------------------------------------------------ Shape the Mobile Experience: Free Subscription Software experts and developers: Be at the forefront of tech innovation. Intel(R) Software Adrenaline delivers strategic insight and game-changing conversations that shape the rapidly evolving mobile landscape. Sign up now. http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list