From: Jeff Dike <jdike@addtoit.com>
To: akpm@osdl.org, Blaisorblade <blaisorblade_spam@yahoo.it>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] - UML - LFS 64-bit cleanups
Date: Sun, 14 Nov 2004 18:04:01 -0500 [thread overview]
Message-ID: <200411142304.iAEN41bV013356@ccure.user-mode-linux.org> (raw)
Add ARCH_USER_CFLAGS so the arches can modify USER_CFLAGS.
We now take __ARCH_WANT_OLD_STAT and __ARCH_WANT_STAT64 from the base arch
so that the LFS-64 code gets included or excluded automatically.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Index: 2.6.9/arch/um/Makefile
===================================================================
--- 2.6.9.orig/arch/um/Makefile 2004-11-14 15:31:26.000000000 -0500
+++ 2.6.9/arch/um/Makefile 2004-11-14 15:31:35.000000000 -0500
@@ -129,6 +129,7 @@
USER_CFLAGS := $(patsubst -Dsigprocmask=kernel_sigprocmask,,$(USER_CFLAGS))
USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \
$(MODE_INCLUDE)
+USER_CFLAGS += $(ARCH_USER_CFLAGS)
# To get a definition of F_SETSIG
USER_CFLAGS += -D_GNU_SOURCE
Index: 2.6.9/arch/um/Makefile-i386
===================================================================
--- 2.6.9.orig/arch/um/Makefile-i386 2004-11-14 15:31:26.000000000 -0500
+++ 2.6.9/arch/um/Makefile-i386 2004-11-14 15:31:35.000000000 -0500
@@ -11,6 +11,7 @@
endif
CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)
+ARCH_USER_CFLAGS :=
ifneq ($(CONFIG_GPROF),y)
ARCH_CFLAGS += -DUM_FASTCALL
Index: 2.6.9/arch/um/Makefile-x86_64
===================================================================
--- 2.6.9.orig/arch/um/Makefile-x86_64 2003-09-15 09:40:47.000000000 -0400
+++ 2.6.9/arch/um/Makefile-x86_64 2004-11-14 15:31:35.000000000 -0500
@@ -0,0 +1 @@
+ARCH_USER_CFLAGS := -D__x86_64__
Index: 2.6.9/include/asm-um/unistd.h
===================================================================
--- 2.6.9.orig/include/asm-um/unistd.h 2004-11-14 15:31:26.000000000 -0500
+++ 2.6.9/include/asm-um/unistd.h 2004-11-14 15:31:35.000000000 -0500
@@ -13,10 +13,9 @@
extern int um_execve(const char *file, char *const argv[], char *const env[]);
#ifdef __KERNEL__
+/* We get __ARCH_WANT_OLD_STAT and __ARCH_WANT_STAT64 from the base arch */
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_OLD_STAT
-#define __ARCH_WANT_STAT64
#define __ARCH_WANT_SYS_ALARM
#define __ARCH_WANT_SYS_GETHOSTNAME
#define __ARCH_WANT_SYS_PAUSE
reply other threads:[~2004-11-14 20:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200411142304.iAEN41bV013356@ccure.user-mode-linux.org \
--to=jdike@addtoit.com \
--cc=akpm@osdl.org \
--cc=blaisorblade_spam@yahoo.it \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®