On Wed, 21 Oct 2015, Henrik Austad wrote: > From: Henrik Austad <henrik@xxxxxxxxx> > > Bionic is the libc implementation used in Android and should not be > confused with the architecture. > > Cc: John Kacur <jkacur@xxxxxxxxxx> > Signed-off-by: Henrik Austad <haustad@xxxxxxxxx> > --- > Makefile | 3 +-- > src/arch/android/Makefile | 22 ++++++++++++++++++++++ > src/arch/bionic/Makefile | 22 ---------------------- > 3 files changed, 23 insertions(+), 24 deletions(-) > create mode 100644 src/arch/android/Makefile > delete mode 100644 src/arch/bionic/Makefile > > diff --git a/Makefile b/Makefile > index 703333fe1b42..86a5c4b211a0 100644 > --- a/Makefile > +++ b/Makefile > @@ -69,8 +69,7 @@ ifdef HAVE_PARSE_CPUSTRING_ALL > endif > endif > > -# Include any arch specific makefiles here. > -include src/arch/bionic/Makefile > +include src/arch/android/Makefile > > VPATH = src/cyclictest: > VPATH += src/signaltest: > diff --git a/src/arch/android/Makefile b/src/arch/android/Makefile > new file mode 100644 > index 000000000000..e25f67203e5a > --- /dev/null > +++ b/src/arch/android/Makefile > @@ -0,0 +1,22 @@ > + > +# Bionic (android) does not have: > +# - pthread barriers > +# - pthread_[gs]etaffinity > +# > +# Typically see something like "aarch64-linux-android" > +ifeq (android,$(ostype)) > + USE_BIONIC := 1 > + CFLAGS += -DPTHREAD_BIONIC > + > + LDFLAGS += -pie > +# -lrt and -lpthread is in standard bionic library, no standalone library > + LIBS := $(filter-out -lrt,$(LIBS)) > + LIBS := $(filter-out -lpthread,$(LIBS)) > + > +# BIONIC does not support PI, barriers and has different files in > +# include/. This means that currently, only these binaries will compile > +# and link properly: > +# - cyclictest > +# - hackbench > + sources := cyclictest.c hackbench.c > +endif > diff --git a/src/arch/bionic/Makefile b/src/arch/bionic/Makefile > deleted file mode 100644 > index e25f67203e5a..000000000000 > --- a/src/arch/bionic/Makefile > +++ /dev/null > @@ -1,22 +0,0 @@ > - > -# Bionic (android) does not have: > -# - pthread barriers > -# - pthread_[gs]etaffinity > -# > -# Typically see something like "aarch64-linux-android" > -ifeq (android,$(ostype)) > - USE_BIONIC := 1 > - CFLAGS += -DPTHREAD_BIONIC > - > - LDFLAGS += -pie > -# -lrt and -lpthread is in standard bionic library, no standalone library > - LIBS := $(filter-out -lrt,$(LIBS)) > - LIBS := $(filter-out -lpthread,$(LIBS)) > - > -# BIONIC does not support PI, barriers and has different files in > -# include/. This means that currently, only these binaries will compile > -# and link properly: > -# - cyclictest > -# - hackbench > - sources := cyclictest.c hackbench.c > -endif > -- > 1.9.1 > > -- Thanks Signed-off-by: John Kacur <jkacur@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
