static link

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@423 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile.target b/Makefile.target
index 95ea88640477c7157db40f20852e5c97b8f4ae68..cb6a0cc60a874dcfa45e21098af76de6b923e5c7 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -39,7 +39,14 @@ OP_CFLAGS+= -falign-functions=0
 else
 OP_CFLAGS+= -malign-functions=0
 endif
+
 ifdef TARGET_GPROF
+USE_I386_LD=y
+endif
+ifdef CONFIG_STATIC
+USE_I386_LD=y
+endif
+ifdef USE_I386_LD
 LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386.ld
 else
 # WARNING: this LDFLAGS is _very_ tricky : qemu is an ELF shared object

diff --git a/linux-user/main.c b/linux-user/main.c
index 6df7b42c5e2c5e76ec725e8494411379e1224df0..5b751541ee35de522deb87cb647a26f5a57fc3f9 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -30,7 +30,7 @@
 
 static const char *interp_prefix = CONFIG_QEMU_PREFIX;
 
-#ifdef __i386__
+#if defined(__i386__) && !defined(CONFIG_STATIC)
 /* Force usage of an ELF interpreter even if it is an ELF shared
    object ! */
 const char interp[] __attribute__((section(".interp"))) = "/lib/ld-linux.so.2";