Commit f72b519c86b0700473155194a39edf937007eab8
1 parent
07ce05ea
added osdep.o and nwfpe
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@615 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
17 additions
and
3 deletions
Makefile.target
| @@ -145,10 +145,15 @@ LDFLAGS+=-p | @@ -145,10 +145,15 @@ LDFLAGS+=-p | ||
| 145 | main.o: CFLAGS+=-p | 145 | main.o: CFLAGS+=-p |
| 146 | endif | 146 | endif |
| 147 | 147 | ||
| 148 | -OBJS= elfload.o main.o syscall.o mmap.o signal.o path.o | 148 | +OBJS= elfload.o main.o syscall.o mmap.o signal.o path.o osdep.o |
| 149 | ifeq ($(TARGET_ARCH), i386) | 149 | ifeq ($(TARGET_ARCH), i386) |
| 150 | OBJS+= vm86.o | 150 | OBJS+= vm86.o |
| 151 | endif | 151 | endif |
| 152 | +ifeq ($(TARGET_ARCH), arm) | ||
| 153 | +OBJS+=nwfpe/softfloat.o nwfpe/fpa11.o nwfpe/fpa11_cpdo.o \ | ||
| 154 | +nwfpe/fpa11_cpdt.o nwfpe/fpa11_cprt.o nwfpe/fpopcode.o nwfpe/single_cpdo.o \ | ||
| 155 | + nwfpe/double_cpdo.o nwfpe/extended_cpdo.o | ||
| 156 | +endif | ||
| 152 | SRCS:= $(OBJS:.o=.c) | 157 | SRCS:= $(OBJS:.o=.c) |
| 153 | OBJS+= libqemu.a | 158 | OBJS+= libqemu.a |
| 154 | 159 | ||
| @@ -158,6 +163,9 @@ LIBOBJS=thunk.o exec.o translate-all.o cpu-exec.o gdbstub.o \ | @@ -158,6 +163,9 @@ LIBOBJS=thunk.o exec.o translate-all.o cpu-exec.o gdbstub.o \ | ||
| 158 | 163 | ||
| 159 | ifeq ($(TARGET_ARCH), i386) | 164 | ifeq ($(TARGET_ARCH), i386) |
| 160 | LIBOBJS+=helper.o helper2.o | 165 | LIBOBJS+=helper.o helper2.o |
| 166 | +ifeq ($(ARCH), i386) | ||
| 167 | +LIBOBJS+=translate-copy.o | ||
| 168 | +endif | ||
| 161 | endif | 169 | endif |
| 162 | 170 | ||
| 163 | ifeq ($(TARGET_ARCH), ppc) | 171 | ifeq ($(TARGET_ARCH), ppc) |
| @@ -197,7 +205,10 @@ ifeq ($(ARCH),alpha) | @@ -197,7 +205,10 @@ ifeq ($(ARCH),alpha) | ||
| 197 | endif | 205 | endif |
| 198 | 206 | ||
| 199 | # must use static linking to avoid leaving stuff in virtual address space | 207 | # must use static linking to avoid leaving stuff in virtual address space |
| 200 | -VL_OBJS=vl.o block.o ide.o vga.o sb16.o dma.o oss.o fdc.o | 208 | +VL_OBJS=vl.o block.o ide.o vga.o sb16.o dma.o oss.o fdc.o osdep.o |
| 209 | +ifeq ($(TARGET_ARCH), i386) | ||
| 210 | +VL_OBJS+=linux_boot.o | ||
| 211 | +endif | ||
| 201 | ifeq ($(TARGET_ARCH), ppc) | 212 | ifeq ($(TARGET_ARCH), ppc) |
| 202 | VL_OBJS+= hw.o | 213 | VL_OBJS+= hw.o |
| 203 | endif | 214 | endif |
| @@ -271,8 +282,11 @@ endif | @@ -271,8 +282,11 @@ endif | ||
| 271 | %.o: %.c | 282 | %.o: %.c |
| 272 | $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< | 283 | $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< |
| 273 | 284 | ||
| 285 | +%.o: %.S | ||
| 286 | + $(CC) $(DEFINES) -c -o $@ $< | ||
| 287 | + | ||
| 274 | clean: | 288 | clean: |
| 275 | - rm -f *.o *.a *~ $(PROGS) gen-op.h opc.h op.h | 289 | + rm -f *.o *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe/*.o |
| 276 | 290 | ||
| 277 | install: all | 291 | install: all |
| 278 | install -m 755 -s $(PROGS) $(prefix)/bin | 292 | install -m 755 -s $(PROGS) $(prefix)/bin |