From mboxrd@z Thu Jan 1 00:00:00 1970 From: Henrik Austad Subject: Re: [PATCH 3/4] Android: clean up the bypass ifdeffery Date: Wed, 7 Oct 2015 13:14:24 +0200 Message-ID: <20151007111424.GA21765@laethe.rd.cisco.com> References: <1444122503-8112-1-git-send-email-haustad@cisco.com> <1444122503-8112-3-git-send-email-haustad@cisco.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-rt-users@vger.kernel.org, Clark Williams To: John Kacur Return-path: Received: from aer-iport-2.cisco.com ([173.38.203.52]:18693 "EHLO aer-iport-2.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753727AbbJGLRf (ORCPT ); Wed, 7 Oct 2015 07:17:35 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-rt-users-owner@vger.kernel.org List-ID: On Wed, Oct 07, 2015 at 12:34:11PM +0200, John Kacur wrote: > > > On Tue, 6 Oct 2015, Henrik Austad wrote: > > > 88af643971b9 (android: adjust target for android) introduced some really > > ugly ifdefs to avoid calling into pthread_barrier_wait and > > pthread_barrier_init. > > > > This patch attempts to coalesce this into a single place and let the > > compiler handle the linking so that cyclictest.c is untouched by evil > > ifdefs. > > > > Compiled and tested on: > > - x86_64 (v3.13 kernel) > > - tilegx (v3.10 kernel) > > - arm64 android (v3.10 kernel) > > > > Signed-off-by: Henrik Austad > > Cc: Clark Williams > > Cc: John Kacur > > --- > > Makefile | 2 +- > > include/bionic.h | 32 ++++++++++++++++++++++++++++++++ > > src/arch/bionic/Makefile | 4 +--- > > src/cyclictest/cyclictest.c | 25 +++---------------------- > > 4 files changed, 37 insertions(+), 26 deletions(-) > > create mode 100644 include/bionic.h > > > > diff --git a/Makefile b/Makefile > > index 2d20ea4..24ef8fe 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -22,7 +22,7 @@ bindir ?= $(prefix)/bin > > mandir ?= $(prefix)/share/man > > srcdir ?= $(prefix)/src > > > > -CFLAGS ?= -Wall -Wno-nonnull > > +CFLAGS ?= -Wall -Wno-nonnull -Iinclude/ > > CPPFLAGS += -D_GNU_SOURCE -Isrc/include > > We already have an include dir. Why aren't you using it? > If you think it would be cleaner to create your own include dir, you at > least have to put it some where in the src dir You're right! moving it to src/include/ now, do you want a new patch right away, or shall I wait for v0.96-devel before submitting? -- Henrik Austad TIPBU Eng Cisco Systems Norway