summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-30 21:38:23 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-30 21:38:23 +0100
commit70ddda0f41b3b13a5a3b5179447712f7af8fb574 (patch)
tree1b2e10e735f1d3314aea45c18f4b6abac7f61ca0
parent31a3c83057fa5b563aa480e31ab975ceaed9abff (diff)
Move -D__ASSEMBLY__ to general AM_CCASFLAGS
Since it is used not only by linux bits. * linux/Makefrag.am (liblinux_a_CCASFLAGS): Remove -D__ASSEMBLY__ * Makefile.am (AM_CCASFLAGS): Add -D__ASSEMBLY__
-rw-r--r--Makefile.am3
-rw-r--r--linux/Makefrag.am2
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 349e0d5c..11312a1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,9 @@ AM_CPPFLAGS += \
AM_CFLAGS += \
-fno-builtin-log
+AM_CCASFLAGS += \
+ -D__ASSEMBLY__
+
# Yes, this makes the eyes hurt. But perhaps someone will finally take care of
# all that scruffy Mach code... Also see <http://savannah.gnu.org/task/?5726>.
AM_CFLAGS += \
diff --git a/linux/Makefrag.am b/linux/Makefrag.am
index 1b690108..38718a3f 100644
--- a/linux/Makefrag.am
+++ b/linux/Makefrag.am
@@ -43,7 +43,7 @@ liblinux_a_CFLAGS += \
# TODO. Do we really need `-traditional'?
liblinux_a_CCASFLAGS = $(AM_CCASFLAGS) \
- -D__ASSEMBLY__ -traditional \
+ -traditional \
$(liblinux_a_CPPFLAGS)
liblinux_a_SOURCES = \