erlang: fix some build states

Fix builds when the java option is disabled (the default) and when
erlang-hipe is disabled (the default for some platforms/architectures).

2 files changed, 3 insertions, 269 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index ea89a0e4a52..dcb6589021c 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.104 2021/02/25 15:32:16 triaxx Exp $
+# $NetBSD: Makefile,v 1.105 2021/05/09 00:02:37 gutteridge Exp $
 
 DISTNAME=	erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
 PKGNAME=	${DISTNAME:S/OTP-/erlang-/}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=erlang/}
 GITHUB_PROJECT=	otp
diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST
index c5d02037e18..8b945751be2 100644
--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2021/05/08 20:02:52 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.50 2021/05/09 00:02:37 gutteridge Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -1028,67 +1028,20 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_pmatch.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_prettypr.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_to_icode.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_typean.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/elf_format.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_bif_types.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_types.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.app
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.appup
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_adj_list.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_liveness.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_sse2_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_specific_sse2.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_specific_x87.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_spill_restore.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_sse2.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_subst.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_x87.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_liveness_gpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_subst.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_bb.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_bb_weights.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_beam_to_icode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_coalescing_regalloc.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_consttab.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_data_pp.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_digraph.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dominators.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dot.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dsets.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gen_cfg.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gensym.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_graph_coloring_regalloc.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode2rtl.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_bincomp.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_call_elim.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_callgraph.beam
@@ -1097,7 +1050,6 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_coordinator.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ebb.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_exceptions.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_heap_test.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_inline_bifs.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_instruction_counter.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_liveness.beam
@@ -1111,127 +1063,8 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_const_prop.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_copy_prop.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_struct_reuse.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_type.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig_moves.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_jit.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_liveness.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_merge.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ls_regalloc.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_moves.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_node_sets.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_optimistic_regalloc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_pack_constants.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_liveness_all.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_liveness_fpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_liveness_gpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_postconditions_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_specific_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_subst.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_profile.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_range_split.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_reg_worklists.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_regalloc_loop.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_regalloc_prepass.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_restore_reuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arch.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arith_32.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arith_64.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_binary.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_binary_construct.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_binary_match.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_cleanup_const.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_exceptions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_lcm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_liveness.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_mk_switch.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_primops.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssa.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssa_avail_expr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssa_const_prop.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssapre.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_symbolic.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_amd64.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_arm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_llvm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_ppc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_sparc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_x86.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_varmap.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_verify_gcsafe.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sdi.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_segment_trees.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_liveness_all.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_liveness_fpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_liveness_gpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_postconditions_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_specific_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_subst.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillcost.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_color.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_scan.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_tagscheme.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_temp_map.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_timing.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_vectors.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_liveness.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_postpass.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_specific_x87.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_spill_restore.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_subst.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_x87.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/flow/cfg.inc
 lib/erlang/lib/hipe-${VERSION.hipe}/flow/ebb.inc
 lib/erlang/lib/hipe-${VERSION.hipe}/flow/hipe_bb.erl
@@ -1249,7 +1082,6 @@ lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_coordinator.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ebb.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_exceptions.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_fp.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_heap_test.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_inline_bifs.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_instruction_counter.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_liveness.erl
@@ -1265,55 +1097,15 @@ lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_copy_prop.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_struct_reuse.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf32_format.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf64_format.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf_format.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf_format.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_arch.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_liveness.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_main.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_merge.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_rtl_to_llvm.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.hrl
 lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe_main.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_consttab.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_data_pp.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_gensym.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_pack_constants.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_sdi.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_sdi.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_segment_trees.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_icode2rtl.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_literals.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_arch.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_arith_32.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_arith_64.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_binary.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_binary_construct.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_binary_match.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_cfg.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_cleanup_const.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_exceptions.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_lcm.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_liveness.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_mk_switch.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_primops.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssa.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssa_avail_expr.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssa_const_prop.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssapre.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_symbolic.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_varmap.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_verify_gcsafe.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_tagscheme.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_digraph.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_dot.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_dsets.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_timing.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_vectors.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/vsn.mk
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_chunk.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_request.beam
@@ -1589,65 +1381,6 @@ lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_service.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_tftp_wrapper.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_trace.erl
-lib/erlang/lib/jinterface-${VERSION.jinterface}/ebin/jinterface.app
-lib/erlang/lib/jinterface-${VERSION.jinterface}/ebin/jinterface.appup
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/AbstractConnection.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/AbstractNode.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/GenericQueue.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/Link.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/Links.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpAuthException.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpConnection.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpCookedConnection.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpEpmd.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangAtom.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangBinary.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangBitstr.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangBoolean.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangByte.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangChar.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangDecodeException.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangDouble.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangException.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangExit.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangExternalFun.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangFloat.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangFun.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangInt.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangList.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangLong.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangMap.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangObject.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangPort.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangRangeException.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangRef.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangShort.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangString.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangTuple.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangUInt.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangUShort.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpException.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpExternal.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpInputStream.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpLocalNode.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpMD5.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpMbox.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpMsg.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpNode.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpNodeStatus.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpPeer.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpSelf.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpServer.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpServerSocketTransport.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpServerTransport.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpSocketTransport.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpSocketTransportFactory.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpSystem.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpTransport.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpTransportFactory.java
-lib/erlang/lib/jinterface-${VERSION.jinterface}/priv/OtpErlang.jar
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/application.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/application_controller.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/application_master.beam