Skip to content

Commit

Permalink
compiler: Don't support the r11 option
Browse files Browse the repository at this point in the history
The r11 option was used to generate BEAM modules that could
loaded both on both R11 and R12/R13 to facilitate testing
that R11 and R13 nodes could communicate with each other.

Since R14 is only required to be compatible with R12 and
R13 nodes, the r11 option is no longer needed.
  • Loading branch information
bjorng committed Mar 22, 2010
1 parent 2090739 commit eeff53b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 25 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -118,7 +118,6 @@ a.out.dSYM/
/lib/compiler/src/beam_opcodes.hrl
/lib/compiler/src/core_parse.erl

/lib/compiler/test/*_r11_SUITE.erl
/lib/compiler/test/*_no_opt_SUITE.erl
/lib/compiler/test/*_post_opt_SUITE.erl

Expand Down
2 changes: 0 additions & 2 deletions lib/compiler/src/compile.erl
Expand Up @@ -162,8 +162,6 @@ expand_opt(report, Os) ->
[report_errors,report_warnings|Os];
expand_opt(return, Os) ->
[return_errors,return_warnings|Os];
expand_opt(r11, Os) ->
[no_stack_trimming,no_binaries,no_constant_pool|Os];
expand_opt({debug_info_key,_}=O, Os) ->
[encrypt_debug_info,O|Os];
expand_opt(no_binaries=O, Os) ->
Expand Down
22 changes: 2 additions & 20 deletions lib/compiler/test/Makefile
Expand Up @@ -53,17 +53,6 @@ NO_OPT= \
record \
trycatch

R11= \
andor \
apply \
float \
fun \
match \
num_bif \
receive \
record \
trycatch

CORE_MODULES = \
bs_shadowed_size_var \
nested_call_in_case
Expand All @@ -73,8 +62,6 @@ NO_OPT_MODULES= $(NO_OPT:%=%_no_opt_SUITE)
NO_OPT_ERL_FILES= $(NO_OPT_MODULES:%=%.erl)
POST_OPT_MODULES= $(NO_OPT:%=%_post_opt_SUITE)
POST_OPT_ERL_FILES= $(POST_OPT_MODULES:%=%.erl)
R11_MODULES= $(R11:%=%_r11_SUITE)
R11_ERL_FILES= $(R11_MODULES:%=%.erl)

ERL_FILES= $(MODULES:%=%.erl)

Expand Down Expand Up @@ -103,15 +90,13 @@ EBIN = .
# Targets
# ----------------------------------------------------

make_emakefile: $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) $(R11_ERL_FILES)
make_emakefile: $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES)
$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
> $(EMAKEFILE)
$(ERL_TOP)/make/make_emakefile +no_copt +no_postopt $(ERL_COMPILE_FLAGS) \
-o$(EBIN) $(NO_OPT_MODULES) >> $(EMAKEFILE)
$(ERL_TOP)/make/make_emakefile +no_copt $(ERL_COMPILE_FLAGS) \
-o$(EBIN) $(POST_OPT_MODULES) >> $(EMAKEFILE)
$(ERL_TOP)/make/make_emakefile +r11 $(ERL_COMPILE_FLAGS) \
-o$(EBIN) $(R11_MODULES) >> $(EMAKEFILE)

tests debug opt: make_emakefile
erl $(ERL_MAKE_FLAGS) -make
Expand All @@ -133,9 +118,6 @@ docs:
%_post_opt_SUITE.erl: %_SUITE.erl
sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@

%_r11_SUITE.erl: %_SUITE.erl
sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@

# ----------------------------------------------------
# Release Target
# ----------------------------------------------------
Expand All @@ -148,7 +130,7 @@ release_tests_spec: make_emakefile
$(INSTALL_DATA) compiler.dynspec compiler.cover \
$(EMAKEFILE) $(ERL_FILES) $(CORE_FILES) $(RELSYSDIR)
$(INSTALL_DATA) $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) \
$(R11_ERL_FILES) $(RELSYSDIR)
$(RELSYSDIR)
chmod -f -R u+w $(RELSYSDIR)
@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)

Expand Down
3 changes: 1 addition & 2 deletions lib/compiler/test/test_lib.erl
Expand Up @@ -70,6 +70,5 @@ opt_opts(Mod) ->
get_data_dir(Config) ->
Data0 = ?config(data_dir, Config),
{ok,Data1,_} = regexp:sub(Data0, "_no_opt_SUITE", "_SUITE"),
{ok,Data2,_} = regexp:sub(Data1, "_post_opt_SUITE", "_SUITE"),
{ok,Data,_} = regexp:sub(Data2, "_r11_SUITE", "_SUITE"),
{ok,Data,_} = regexp:sub(Data1, "_post_opt_SUITE", "_SUITE"),
Data.

0 comments on commit eeff53b

Please sign in to comment.