From: Henrik Austad <haustad@cisco.com>
To: linux-rt-users@vger.kernel.org
Cc: John Kacur <jkacur@redhat.com>, Henrik Austad <henrik@austad.us>,
Henrik Austad <haustad@cisco.com>
Subject: [PATCH v2 2/4] Android: rename arch from bionic to android
Date: Wed, 21 Oct 2015 21:00:09 +0200 [thread overview]
Message-ID: <1445454011-18839-3-git-send-email-haustad@cisco.com> (raw)
In-Reply-To: <1445454011-18839-1-git-send-email-haustad@cisco.com>
From: Henrik Austad <henrik@austad.us>
Bionic is the libc implementation used in Android and should not be
confused with the architecture.
Cc: John Kacur <jkacur@redhat.com>
Signed-off-by: Henrik Austad <haustad@cisco.com>
---
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))
next prev parent reply other threads:[~2015-10-21 19:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-21 19:00 [PATCH v2 0/4] Android: clean-up patches Henrik Austad
2015-10-21 19:00 ` [PATCH v2 1/4] Android: clean up the bypass ifdeffery Henrik Austad
2015-10-22 8:30 ` John Kacur
2015-10-21 19:00 ` Henrik Austad [this message]
2015-10-22 8:36 ` [PATCH v2 2/4] Android: rename arch from bionic to android John Kacur
2015-10-21 19:00 ` [PATCH v2 3/4] Android: Expand match for android in ostype Henrik Austad
2015-10-22 8:43 ` John Kacur
2015-10-21 19:00 ` [PATCH v2 4/4] rt-sched.h: do not unconditionally define syscall-numbers Henrik Austad
2015-10-22 9:43 ` John Kacur
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445454011-18839-3-git-send-email-haustad@cisco.com \
--to=haustad@cisco.com \
--cc=henrik@austad.us \
--cc=jkacur@redhat.com \
--cc=linux-rt-users@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).