From 27c75a9a906e4ae2b362a35501a88a3e70fe773e Mon Sep 17 00:00:00 2001
From: bellard
Date: Mon, 7 Apr 2003 21:35:21 +0000
Subject: update

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@85 c046a42c-6fe2-441c-8c8c-71466251a162
---
 Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e6d1dedc26..96810cae38 100644
--- a/Makefile
+++ b/Makefile
@@ -13,14 +13,20 @@ OP_CFLAGS+= -falign-functions=0
 else
 OP_CFLAGS+= -malign-functions=0
 endif
+# WARNING: this LDFLAGS is _very_ tricky : qemu is an ELF shared object
+# that the kernel ELF loader considers as an executable. I think this
+# is the simplest way to make it self virtualizable!
+LDFLAGS+=-Wl,-shared
 endif
 
 ifeq ($(ARCH),ppc)
 OP_CFLAGS=$(CFLAGS)
+LDFLAGS+=-Wl,-T,ppc.ld
 endif
 
 ifeq ($(ARCH),s390)
 OP_CFLAGS=$(CFLAGS)
+LDFLAGS+=-Wl,-T,s390.ld
 endif
 
 ifeq ($(GCC_MAJOR),3)
@@ -31,7 +37,6 @@ endif
 #########################################################
 
 DEFINES+=-D_GNU_SOURCE
-LDSCRIPT=$(ARCH).ld
 LIBS+=-lm
 
 # profiling code
@@ -51,7 +56,7 @@ LIBOBJS+=i386-dis.o dis-buf.o
 all: qemu qemu-doc.html
 
 qemu: $(OBJS)
-	$(CC) -Wl,-T,$(LDSCRIPT) $(LDFLAGS) -o $@ $^  $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ $^  $(LIBS)
 
 depend: $(SRCS)
 	$(CC) -MM $(CFLAGS) $^ 1>.depend
@@ -103,9 +108,9 @@ dyngen.c ioctls.h ops_template.h op_string.h  syscall_types.h\
 Makefile     elf.h       linux_bin.h       segment.h       thunk.c\
 elfload.c   main.c            signal.c        thunk.h\
 cpu-i386.h qemu.h op-i386.c opc-i386.h syscall-i386.h  translate-i386.c\
-dis-asm.h    gen-i386.h  op-i386.h         syscall.c\
+dis-asm.h    gen-i386.h  syscall.c\
 dis-buf.c    i386-dis.c  opreg_template.h  syscall_defs.h\
-i386.ld ppc.ld s390.ld exec-i386.h exec-i386.c configure \
+ppc.ld s390.ld exec-i386.h exec-i386.c configure \
 tests/Makefile\
 tests/test-i386.c tests/test-i386-shift.h tests/test-i386.h\
 tests/test-i386-muldiv.h tests/test-i386-code16.S\
-- 
cgit v1.2.3-55-g7522