From: David Woodhouse <dwmw2@infradead.org>
To: Arnaud Lacombe <lacombar@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
user-mode-linux-devel@lists.sourceforge.net
Subject: [PATCH 1/5] um: Use __i386__ in ifdef for vsyscall exports, not SUBARCH_i386
Date: Sun, 31 Jul 2011 00:02:02 +0100 [thread overview]
Message-ID: <1312066923.22074.53.camel@i7.infradead.org> (raw)
In-Reply-To: <1312066693.22074.50.camel@i7.infradead.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
arch/um/os-Linux/Makefile | 2 --
arch/um/os-Linux/user_syms.c | 2 +-
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
index b33f4df..78658a7 100644
--- a/arch/um/os-Linux/Makefile
+++ b/arch/um/os-Linux/Makefile
@@ -13,8 +13,6 @@ USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \
main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \
tty.o tls.o uaccess.o umid.o util.o
-CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)
-
HAVE_AIO_ABI := $(shell [ -r /usr/include/linux/aio_abi.h ] && \
echo -DHAVE_AIO_ABI )
CFLAGS_aio.o += $(HAVE_AIO_ABI)
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 45ffe46..9165513 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -45,7 +45,7 @@ EXPORT_SYMBOL(readdir64);
extern void truncate64(void) __attribute__((weak));
EXPORT_SYMBOL(truncate64);
-#ifdef SUBARCH_i386
+#ifdef __i386__
EXPORT_SYMBOL(vsyscall_ehdr);
EXPORT_SYMBOL(vsyscall_end);
#endif
--
1.7.6
next prev parent reply other threads:[~2011-07-30 23:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1312066693.22074.50.camel@i7.infradead.org>
2011-07-30 23:01 ` [PATCH 2/5] um: Remove gratuitous use of $(SUBARCH) in Makefile-i386 David Woodhouse
2011-07-30 23:02 ` David Woodhouse [this message]
2011-07-31 22:11 ` [PATCH 1/5] um: Use __i386__ in ifdef for vsyscall exports, not SUBARCH_i386 richard -rw- weinberger
2011-07-31 22:24 ` David Woodhouse
2011-07-31 22:48 ` Al Viro
2011-07-31 22:58 ` [uml-devel] " Al Viro
2011-07-31 23:13 ` David Woodhouse
2011-07-31 23:17 ` richard -rw- weinberger
2011-07-31 23:24 ` David Woodhouse
2011-08-01 4:32 ` Al Viro
2011-08-01 10:04 ` Geert Uytterhoeven
2011-08-01 10:40 ` richard -rw- weinberger
2011-08-01 17:23 ` Al Viro
2011-08-01 17:52 ` richard -rw- weinberger
2011-08-09 23:38 ` Al Viro
2011-08-10 4:04 ` Al Viro
2011-08-10 17:44 ` Al Viro
2011-08-11 4:23 ` Al Viro
2011-08-11 12:13 ` richard -rw- weinberger
2011-08-11 14:05 ` Al Viro
2011-07-31 23:09 ` [uml-devel] " David Woodhouse
2011-07-30 23:02 ` [PATCH 3/5] um: Always use -m32 when building for i386 David Woodhouse
2011-07-30 23:02 ` [PATCH 4/5] um: Do not define SUBARCH in CFLAGS David Woodhouse
2011-07-30 23:04 ` [PATCH 5/5] um: Fix SUBARCH=x86 build David Woodhouse
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=1312066923.22074.53.camel@i7.infradead.org \
--to=dwmw2@infradead.org \
--cc=hpa@zytor.com \
--cc=lacombar@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/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