diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2015-08-17 09:32:24 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-08-18 18:54:06 -0300 |
commit | 5cdef85d4a3e06c0ce680a3bb115f4f060adc949 (patch) | |
tree | b674e668843f1042ff3ee66f01887e52a1d162c8 /recipes-core/openjdk/openjdk-7-75b13/icedtea-zero-hotspotfix.patch | |
parent | fb083e7988460eba5d38a2f0eac21cf6114518ae (diff) | |
download | meta-java-5cdef85d4a3e06c0ce680a3bb115f4f060adc949.tar.gz |
openjdk-7: remove IcedTea 2.5.4, OpenJDK 7u75b13
OpenJDK 7 was previously updated to IcedTea 2.6.1, 7u85b01. Therefore
the old version is removed now.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-75b13/icedtea-zero-hotspotfix.patch')
-rw-r--r-- | recipes-core/openjdk/openjdk-7-75b13/icedtea-zero-hotspotfix.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/recipes-core/openjdk/openjdk-7-75b13/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-zero-hotspotfix.patch deleted file mode 100644 index e97e4fc..0000000 --- a/recipes-core/openjdk/openjdk-7-75b13/icedtea-zero-hotspotfix.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make | ||
2 | index c2a1484..156bdd0 100644 | ||
3 | --- openjdk/hotspot/make/linux/makefiles/zeroshark.make | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/zeroshark.make | ||
5 | @@ -33,26 +33,27 @@ | ||
6 | Obj_Files += arm32JIT.o | ||
7 | |||
8 | CFLAGS += -DHOTSPOT_ASM | ||
9 | +CCFLAGS += -DHOTSPOT_ASM | ||
10 | |||
11 | cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s | ||
12 | arm32JIT.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 Generating ARM assembler bytecode sequences | ||
21 | - $(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) | ||
22 | + $(CXX_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 -fuse-ld=bfd -o $@ $< $(COMPILE_DONE) | ||
28 | |||
29 | mkoffsets: asm_helper.cpp | ||
30 | @echo Compiling offset generator | ||
31 | $(QUIETLY) $(REMOVE_TARGET) | ||
32 | - $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
33 | + $(CXX_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
34 | |||
35 | endif | ||
36 | endif | ||