ChangeSet 1.2231.1.108, 2005/03/28 19:46:33-08:00, [EMAIL PROTECTED]
[PATCH] Uml: little build fixes
From: Al Viro <[EMAIL PROTECTED]>
Easier parts from "cross-build" (or "UML-kbuild") patch from Al Viro:
*) abuses of host cc/ld/objcopy/paths are gone
*) some #include path fixes
*) other little abuses fixed
*) remove LIBC_DIR var, ask gcc where libc.a is placed.
This creates no problem so can be merged very likely. Note: only tested
on
i386, give a run on x86-64.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
Cc: "Vadim Abrossimov" <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
arch/um/Makefile-x86_64 | 4 ----
arch/um/include/sysdep-i386/sigcontext.h | 2 +-
arch/um/include/sysdep-x86_64/sigcontext.h | 2 +-
arch/um/kernel/tt/Makefile | 6 ++----
arch/um/sys-i386/Makefile | 2 +-
fs/hppfs/Makefile | 10 ----------
include/asm-um/archparam-i386.h | 2 +-
7 files changed, 6 insertions(+), 22 deletions(-)
diff -Nru a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
--- a/arch/um/Makefile-x86_64 2005-03-28 21:30:14 -08:00
+++ b/arch/um/Makefile-x86_64 2005-03-28 21:30:14 -08:00
@@ -30,7 +30,3 @@
$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
CLEAN_FILES += $(SYS_HEADERS)
-
-LIBC_DIR := /usr/lib64
-
-export LIBC_DIR
diff -Nru a/arch/um/include/sysdep-i386/sigcontext.h
b/arch/um/include/sysdep-i386/sigcontext.h
--- a/arch/um/include/sysdep-i386/sigcontext.h 2005-03-28 21:30:14 -08:00
+++ b/arch/um/include/sysdep-i386/sigcontext.h 2005-03-28 21:30:14 -08:00
@@ -6,7 +6,7 @@
#ifndef __SYS_SIGCONTEXT_I386_H
#define __SYS_SIGCONTEXT_I386_H
-#include "sc.h"
+#include <sysdep/sc.h>
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
diff -Nru a/arch/um/include/sysdep-x86_64/sigcontext.h
b/arch/um/include/sysdep-x86_64/sigcontext.h
--- a/arch/um/include/sysdep-x86_64/sigcontext.h 2005-03-28 21:30:14
-08:00
+++ b/arch/um/include/sysdep-x86_64/sigcontext.h 2005-03-28 21:30:14
-08:00
@@ -7,7 +7,7 @@
#ifndef __SYSDEP_X86_64_SIGCONTEXT_H
#define __SYSDEP_X86_64_SIGCONTEXT_H
-#include "sc.h"
+#include <sysdep/sc.h>
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
diff -Nru a/arch/um/kernel/tt/Makefile b/arch/um/kernel/tt/Makefile
--- a/arch/um/kernel/tt/Makefile 2005-03-28 21:30:14 -08:00
+++ b/arch/um/kernel/tt/Makefile 2005-03-28 21:30:14 -08:00
@@ -24,9 +24,7 @@
$(obj)/unmap.o: $(src)/unmap.c
$(CC) $(UNMAP_CFLAGS) -c -o $@ $<
-LIBC_DIR ?= /usr/lib
-
$(obj)/unmap_fin.o : $(obj)/unmap.o
- ld -r -o $(obj)/unmap_tmp.o $< -lc -L$(LIBC_DIR)
- objcopy $(obj)/unmap_tmp.o $@ -G switcheroo
+ $(LD) -r -o $(obj)/unmap_tmp.o $< $(shell $(CC) -print-file-name=libc.a)
+ $(OBJCOPY) $(obj)/unmap_tmp.o $@ -G switcheroo
diff -Nru a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
--- a/arch/um/sys-i386/Makefile 2005-03-28 21:30:14 -08:00
+++ b/arch/um/sys-i386/Makefile 2005-03-28 21:30:14 -08:00
@@ -22,7 +22,7 @@
define make_link
-rm -f $1
- ln -sf $(TOPDIR)/arch/i386/$($(notdir $1)-dir)/$(notdir $1) $1
+ ln -sf $(srctree)/arch/i386/$($(notdir $1)-dir)/$(notdir $1) $1
endef
$(USER_OBJS) : %.o: %.c
diff -Nru a/fs/hppfs/Makefile b/fs/hppfs/Makefile
--- a/fs/hppfs/Makefile 2005-03-28 21:30:14 -08:00
+++ b/fs/hppfs/Makefile 2005-03-28 21:30:14 -08:00
@@ -7,13 +7,3 @@
obj-y =
obj-$(CONFIG_HPPFS) += hppfs.o
-
-clean:
-
-modules:
-
-fastdep:
-
-dep:
-
-archmrproper: clean
diff -Nru a/include/asm-um/archparam-i386.h b/include/asm-um/archparam-i386.h
--- a/include/asm-um/archparam-i386.h 2005-03-28 21:30:14 -08:00
+++ b/include/asm-um/archparam-i386.h 2005-03-28 21:30:14 -08:00
@@ -8,7 +8,7 @@
/********* Bits for asm-um/elf.h ************/
-#include "user.h"
+#include <asm/user.h>
extern char * elf_aux_platform;
#define ELF_PLATFORM (elf_aux_platform)
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
