Commit eaa728eec15d41158152fcf1308986e09f3e8f45
1 parent
6f7044fa
consistent naming for i386 TCG helper file
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4603 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
3 additions
and
37 deletions
Too many changes to show.
To preserve performance only 1 of 4 files are displayed.
Makefile.target
| @@ -201,45 +201,17 @@ else | @@ -201,45 +201,17 @@ else | ||
| 201 | LIBOBJS+=fpu/softfloat-native.o | 201 | LIBOBJS+=fpu/softfloat-native.o |
| 202 | endif | 202 | endif |
| 203 | CPPFLAGS+=-I$(SRC_PATH)/fpu | 203 | CPPFLAGS+=-I$(SRC_PATH)/fpu |
| 204 | - | ||
| 205 | -ifeq ($(TARGET_ARCH), i386) | ||
| 206 | -LIBOBJS+=helper.o helper2.o | ||
| 207 | -endif | ||
| 208 | - | ||
| 209 | -ifeq ($(TARGET_ARCH), x86_64) | ||
| 210 | -LIBOBJS+=helper.o helper2.o | ||
| 211 | -endif | ||
| 212 | - | ||
| 213 | -ifeq ($(TARGET_BASE_ARCH), ppc) | ||
| 214 | -LIBOBJS+= op_helper.o helper.o | ||
| 215 | -endif | ||
| 216 | - | ||
| 217 | -ifeq ($(TARGET_BASE_ARCH), mips) | ||
| 218 | -LIBOBJS+= op_helper.o helper.o | ||
| 219 | -endif | ||
| 220 | - | ||
| 221 | -ifeq ($(TARGET_BASE_ARCH), sparc) | ||
| 222 | LIBOBJS+= op_helper.o helper.o | 204 | LIBOBJS+= op_helper.o helper.o |
| 223 | -endif | ||
| 224 | 205 | ||
| 225 | ifeq ($(TARGET_BASE_ARCH), arm) | 206 | ifeq ($(TARGET_BASE_ARCH), arm) |
| 226 | -LIBOBJS+= op_helper.o helper.o neon_helper.o iwmmxt_helper.o | ||
| 227 | -endif | ||
| 228 | - | ||
| 229 | -ifeq ($(TARGET_BASE_ARCH), sh4) | ||
| 230 | -LIBOBJS+= op_helper.o helper.o | ||
| 231 | -endif | ||
| 232 | - | ||
| 233 | -ifeq ($(TARGET_BASE_ARCH), m68k) | ||
| 234 | -LIBOBJS+= op_helper.o helper.o | 207 | +LIBOBJS+= neon_helper.o iwmmxt_helper.o |
| 235 | endif | 208 | endif |
| 236 | 209 | ||
| 237 | ifeq ($(TARGET_BASE_ARCH), alpha) | 210 | ifeq ($(TARGET_BASE_ARCH), alpha) |
| 238 | -LIBOBJS+= op_helper.o helper.o alpha_palcode.o | 211 | +LIBOBJS+= alpha_palcode.o |
| 239 | endif | 212 | endif |
| 240 | 213 | ||
| 241 | ifeq ($(TARGET_BASE_ARCH), cris) | 214 | ifeq ($(TARGET_BASE_ARCH), cris) |
| 242 | -LIBOBJS+= op_helper.o helper.o | ||
| 243 | LIBOBJS+= cris-dis.o | 215 | LIBOBJS+= cris-dis.o |
| 244 | 216 | ||
| 245 | ifndef CONFIG_USER_ONLY | 217 | ifndef CONFIG_USER_ONLY |
| @@ -323,14 +295,8 @@ machine.o: machine.c | @@ -323,14 +295,8 @@ machine.o: machine.c | ||
| 323 | 295 | ||
| 324 | # HELPER_CFLAGS is used for all the code compiled with static register | 296 | # HELPER_CFLAGS is used for all the code compiled with static register |
| 325 | # variables | 297 | # variables |
| 326 | -ifeq ($(TARGET_BASE_ARCH), i386) | ||
| 327 | -# XXX: rename helper.c to op_helper.c | ||
| 328 | -helper.o: helper.c | ||
| 329 | - $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(I386_CFLAGS) -c -o $@ $< | ||
| 330 | -else | ||
| 331 | op_helper.o: op_helper.c | 298 | op_helper.o: op_helper.c |
| 332 | - $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< | ||
| 333 | -endif | 299 | + $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(I386_CFLAGS) -c -o $@ $< |
| 334 | 300 | ||
| 335 | cpu-exec.o: cpu-exec.c $(OPC_H) | 301 | cpu-exec.o: cpu-exec.c $(OPC_H) |
| 336 | $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< | 302 | $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |