make_tables: Remove broken automatic BIF aliasing

The make_tables script still contains a broken implementation
of a mechanism to automatically give a BIF an additional
(for example, was used for erlang:'++'/2 and erlang:append/2).
When that featured broke, it was worked around by adding
additional entries to bif.tab. There is therefore no reason
to mend the feature.

2 files changed, 5 insertions, 27 deletions

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 2212aed5e0..7c9b29b146 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -564,7 +564,6 @@ $(TARGET)/erl_bif_wrap.c \
 $(TARGET)/erl_bif_list.h \
 $(TARGET)/erl_atom_table.c \
 $(TARGET)/erl_atom_table.h \
-$(TARGET)/erl_pbifs.c \
 	: $(TARGET)/TABLES-GENERATED
 $(TARGET)/TABLES-GENERATED: $(ATOMS) $(BIFS) utils/make_tables
 	$(gen_verbose)LANG=C $(PERL) utils/make_tables -src $(TARGET) -include $(TARGET)\
@@ -744,7 +743,7 @@ EMU_OBJS = \
 	$(OBJDIR)/beam_ranges.o
 
 RUN_OBJS = \
-	$(OBJDIR)/erl_pbifs.o		$(OBJDIR)/benchmark.o \
+	$(OBJDIR)/benchmark.o \
 	$(OBJDIR)/erl_alloc.o		$(OBJDIR)/erl_mtrace.o \
 	$(OBJDIR)/erl_alloc_util.o	$(OBJDIR)/erl_goodfit_alloc.o \
 	$(OBJDIR)/erl_bestfit_alloc.o	$(OBJDIR)/erl_afit_alloc.o \
diff --git a/erts/emulator/utils/make_tables b/erts/emulator/utils/make_tables
index c158778f43..82c8c299f4 100755
--- a/erts/emulator/utils/make_tables
+++ b/erts/emulator/utils/make_tables
@@ -36,7 +36,6 @@ use File::Basename;
 #    <-src>/erl_am.c
 #    <-src>/erl_bif_table.c
 #    <-src>/erl_bif_wrap.c
-#    <-src>/erl_pbifs.c
 #    <-include>/erl_atom_table.h
 #    <-include>/erl_bif_table.h
 #
@@ -54,8 +53,6 @@ my %aliases;
 my $auto_alias_num = 0;
 
 my @bif;
-my @implementation;
-my @pbif;
 
 while (@ARGV && $ARGV[0] =~ /^-(\w+)/) {
     my $opt = shift;
@@ -80,7 +77,10 @@ while (<>) {
     if ($type eq 'atom') {
 	save_atoms(@args);
     } elsif ($type eq 'bif' or $type eq 'ubif') {
-	my($bif,$alias,$alias2) = (@args);
+	if (@args > 2) {
+	    error("$type only allows two arguments");
+	}
+	my($bif,$alias) = (@args);
 	$bif =~ m@^([a-z_.'0-9]+):(.*)/(\d)$@ or error("invalid BIF");
 	my($mod,$name,$arity) = ($1,$2,$3);
 	save_atoms($mod, $name);
@@ -94,8 +94,6 @@ while (<>) {
 	$wrapper = $alias if $type eq 'ubif';
 	push(@bif, ["am_$atom_alias{$mod}","am_$atom_alias{$name}",$arity,
 		    $alias,$wrapper]);
-        push(@pbif, $bif =~ m/^'/ && $alias =~ m/^ebif_/);
-        push(@implementation, $alias2);
     } else {
 	error("invalid line");
     }
@@ -228,25 +226,6 @@ for ($i = 0; $i < @bif; $i++) {
 # Generate the package bif file.
 #
 
-open_file("$src/erl_pbifs.c");
-my $i;
-includes("export.h", "sys.h", "erl_vm.h", "global.h", "erl_process.h", "bif.h",
-	 "erl_bif_table.h", "erl_atom_table.h");
-for ($i = 0; $i < @bif; $i++) {
-    my $arity = $bif[$i]->[2];
-    my $func = $bif[$i]->[3];
-    my $arg;
-    next unless $pbif[$i];
-    next unless $func =~ m/^ebif_(.*)/;
-    my $orig_func = $1;
-    $orig_func = $implementation[$i] if $implementation[$i];
-    print "Eterm\n";
-    print "$func(Process* p, Eterm* BIF__ARGS)\n";
-    print "{\n";
-    print "    return $orig_func(p, BIF__ARGS);\n";
-    print "}\n\n";
-}
-
 sub open_file {			# or die
     my($name) = @_;