diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch')
-rw-r--r-- | recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch new file mode 100644 index 0000000..a63506b --- /dev/null +++ b/recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make b/hotspot/make/linux/makefiles/zeroshark.make | ||
2 | index 4cf1826..4c0105b 100644 | ||
3 | --- openjdk/hotspot/make/linux/makefiles/zeroshark.make | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/zeroshark.make | ||
5 | @@ -32,26 +32,27 @@ Obj_Files += cppInterpreter_arm.o | ||
6 | Obj_Files += thumb2.o | ||
7 | |||
8 | CFLAGS += -DHOTSPOT_ASM | ||
9 | +CCFLAGS += -DHOTSPOT_ASM | ||
10 | |||
11 | cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s | ||
12 | thumb2.o: offsets_arm.s | ||
13 | |||
14 | offsets_arm.s: mkoffsets | ||
15 | @echo Generating assembler offsets | ||
16 | - ./mkoffsets > $@ | ||
17 | + $(QEMU) ./mkoffsets > $@ | ||
18 | |||
19 | bytecodes_arm.s: bytecodes_arm.def mkbc | ||
20 | @echo Generatine ARM assembler bytecode sequences | ||
21 | - $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) | ||
22 | + $(CC_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE) | ||
23 | |||
24 | mkbc: $(GAMMADIR)/tools/mkbc.c | ||
25 | @echo Compiling mkbc tool | ||
26 | - $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) | ||
27 | + $(CC_COMPILE) -static -o $@ $< $(COMPILE_DONE) | ||
28 | |||
29 | mkoffsets: asm_helper.cpp | ||
30 | @echo Compiling offset generator | ||
31 | $(QUIETLY) $(REMOVE_TARGET) | ||
32 | - $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
33 | + $(CC_COMPILE) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
34 | |||
35 | endif | ||
36 | |||