Merge branch 'maint'

* maint:
  Update primary bootstrap
  sys_pre_expand: Eliminate bottleneck for modules with many functions

Conflicts:
	bootstrap/bin/start.boot
	bootstrap/bin/start_clean.boot
	bootstrap/lib/kernel/ebin/file.beam
	bootstrap/lib/kernel/ebin/hipe_unified_loader.beam

4 files changed, 70 insertions, 0 deletions

diff --git a/bootstrap/lib/compiler/ebin/beam_asm.beam b/bootstrap/lib/compiler/ebin/beam_asm.beam
index 4da4c26d92..7b1ee38ef8 100644
--- a/bootstrap/lib/compiler/ebin/beam_asm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_asm.beam
diff --git a/bootstrap/lib/compiler/ebin/compiler.app b/bootstrap/lib/compiler/ebin/compiler.app
new file mode 100644
index 0000000000..5170231c59
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/compiler.app
@@ -0,0 +1,69 @@
+% This is an -*- erlang -*- file.
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+
+{application, compiler,
+ [{description, "ERTS  CXC 138 10"},
+  {vsn, "4.8.1"},
+  {modules, [
+	     beam_asm,
+	     beam_block,
+	     beam_bool,
+	     beam_bsm,
+	     beam_clean,
+	     beam_dead,
+	     beam_dict,
+	     beam_disasm,
+	     beam_except,
+	     beam_flatten,
+	     beam_jump,
+	     beam_listing,
+	     beam_opcodes,
+	     beam_peep,
+	     beam_receive,
+	     beam_split,
+	     beam_trim,
+	     beam_type,
+	     beam_utils,
+	     beam_validator,
+	     cerl,
+	     cerl_clauses,
+	     cerl_inline,
+	     cerl_trees,
+	     compile,
+	     core_scan,
+	     core_lint,
+	     core_parse,
+	     core_pp,
+	     core_lib,
+	     erl_bifs,
+	     rec_env,
+	     sys_core_dsetel,
+	     sys_core_fold,
+	     sys_core_inline,
+	     sys_expand_pmod,
+	     sys_pre_attributes,
+	     sys_pre_expand,
+	     v3_codegen,
+	     v3_core,
+	     v3_kernel,
+	     v3_kernel_pp,
+	     v3_life
+	    ]},
+  {registered, []},
+  {applications, [kernel, stdlib]},
+  {env, []}]}.
diff --git a/bootstrap/lib/compiler/ebin/compiler.appup b/bootstrap/lib/compiler/ebin/compiler.appup
new file mode 100644
index 0000000000..887d074b16
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/compiler.appup
@@ -0,0 +1 @@
+{"4.8.1",[],[]}.
diff --git a/bootstrap/lib/compiler/ebin/sys_pre_expand.beam b/bootstrap/lib/compiler/ebin/sys_pre_expand.beam
index d716583b97..f7e9541e4c 100644
--- a/bootstrap/lib/compiler/ebin/sys_pre_expand.beam
+++ b/bootstrap/lib/compiler/ebin/sys_pre_expand.beam