added libgemu.a build

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 57d2ba1ba72ad84009eeaf889a5219120724bc4f..ea67590c3cb8165e830eeee0eb037a8b1706d2ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,62 @@
-ARCH=i386
-#ARCH=ppc
-HOST_CC=gcc
+include config.mak
 
-ifeq ($(ARCH),i386)
-CFLAGS=-Wall -O2 -g -fomit-frame-pointer
+CFLAGS=-Wall -O2 -g
 LDFLAGS=-g
 LIBS=
-CC=gcc
 DEFINES=-DHAVE_BYTESWAP_H
-OP_CFLAGS=$(CFLAGS) -malign-functions=0 -mpreferred-stack-boundary=2
+
+ifeq ($(ARCH),i386)
+CFLAGS+=-fomit-frame-pointer
+OP_CFLAGS=$(CFLAGS) -mpreferred-stack-boundary=2
+ifeq ($(GCC_MAJOR),3)
+OP_CFLAGS+= -falign-functions=0
+else
+OP_CFLAGS+= -malign-functions=0
+endif
 endif
 
 ifeq ($(ARCH),ppc)
-GCC_LIBS_DIR=/usr/netgem/tools/lib/gcc-lib/powerpc-linux/2.95.2
-DIST=/home/fbe/nsv/dist/hw/n6-dtt
-CC=powerpc-linux-gcc -msoft-float 
-CFLAGS=-Wall -pipe -O2 -mcpu=405 -mbig -nostdinc -g -I$(GCC_LIBS_DIR)/include -I$(DIST)/include
-LIBS_DIR=$(DIST)/lib
-CRT1=$(LIBS_DIR)/crt1.o
-CRTI=$(LIBS_DIR)/crti.o
-CRTN=$(LIBS_DIR)/crtn.o
-CRTBEGIN=$(GCC_LIBS_DIR)/crtbegin.o
-CRTEND=$(GCC_LIBS_DIR)/crtend.o
-LDFLAGS=-static -g -nostdlib $(CRT1) $(CRTI) $(CRTBEGIN) 
-LIBS=-L$(LIBS_DIR) -ltinyc -lgcc $(CRTEND) $(CRTN)
-DEFINES=-Dsocklen_t=int
 OP_CFLAGS=$(CFLAGS)
 endif
 
+ifeq ($(GCC_MAJOR),3)
+# very important to generate a return at the end of every operation
+OP_CFLAGS+=-fno-reorder-blocks -fno-optimize-sibling-calls
+endif
+
 #########################################################
 
 DEFINES+=-D_GNU_SOURCE
-DEFINES+=-DCONFIG_PREFIX=\"/usr/local\"
 LDSCRIPT=$(ARCH).ld
 LIBS+=-ldl -lm
-VERSION=0.1
 
-OBJS= elfload.o main.o thunk.o syscall.o
-OBJS+=translate-i386.o op-i386.o
+# profiling code
+ifdef TARGET_GPROF
+LDFLAGS+=-p
+main.o: CFLAGS+=-p
+endif
+
+OBJS= elfload.o main.o thunk.o syscall.o libgemu.a
+
+LIBOBJS+=translate-i386.o op-i386.o exec-i386.o
 # NOTE: the disassembler code is only needed for debugging
-OBJS+=i386-dis.o dis-buf.o
+LIBOBJS+=i386-dis.o dis-buf.o
 SRCS = $(OBJS:.o=.c)
 
 all: gemu
 
 gemu: $(OBJS)
-       $(CC) -Wl,-T,$(LDSCRIPT) $(LDFLAGS) -o $@ $^ $(LIBS)
+       $(CC) -Wl,-T,$(LDSCRIPT) $(LDFLAGS) -o $@ $^  $(LIBS)
 
 depend: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-# new i386 emulator
+# libgemu 
+
+libgemu.a: $(LIBOBJS)
+       rm -f $@
+       $(AR) rcs $@ $(LIBOBJS)
+
 dyngen: dyngen.c
        $(HOST_CC) -O2 -Wall -g $< -o $@
 
@@ -66,7 +72,14 @@ op-i386.o: op-i386.c opreg_template.h ops_template.h
        $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 
 clean:
-       rm -f *.o *~ gemu dyngen TAGS
+       $(MAKE) -C tests clean
+       rm -f *.o  *.a *~ gemu dyngen TAGS
+
+distclean: clean
+       rm -f config.mak config.h
+
+install: gemu
+       install -m755 -s gemu $(prefix)/bin
 
 # various test targets
 test speed: gemu
@@ -79,14 +92,15 @@ FILES= \
 COPYING.LIB  dyngen.c    ioctls.h          ops_template.h  syscall_types.h\
 Makefile     elf.h       linux_bin.h       segment.h       thunk.c\
 TODO         elfload.c   main.c            signal.c        thunk.h\
-cpu-i386.h   gemu.h      op-i386.c         syscall-i386.h  translate-i386.c\
+cpu-i386.h   gemu.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-buf.c    i386-dis.c  opreg_template.h  syscall_defs.h\
-i386.ld ppc.ld\
+i386.ld ppc.ld exec-i386.h exec-i386.c configure VERSION \
 tests/Makefile\
 tests/test-i386.c tests/test-i386-shift.h tests/test-i386.h\
-tests/test-i386-muldiv.h\
-tests/test2.c tests/hello.c tests/sha1.c
+tests/test-i386-muldiv.h tests/test-i386-code16.S\
+tests/hello.c tests/hello tests/sha1.c \
+tests/testsig.c tests/testclone.c tests/testthread.c 
 
 FILE=gemu-$(VERSION)