4 files changed, 22 insertions, 1 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 02082e57c6..8502ceadd2 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -587,6 +587,13 @@
         <p>Enables auto load tracing, displaying info while loading
           code.</p>
       </item>
+      <tag><c><![CDATA[+L]]></c></tag>
+      <item>
+        <p>Don't load information about source filenames and line numbers.
+	  This will save some memory, but exceptions will not contain
+	  information about the filenames and line numbers.
+          </p>
+      </item>
       <tag><marker id="erts_alloc"><c><![CDATA[+MFlag Value]]></c></marker></tag>
       <item>
         <p>Memory allocator specific flags, see
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index e15362bc1c..fad81e24d6 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -1397,6 +1397,15 @@ read_line_table(LoaderState* stp)
     BeamInstr tag;
 
     /*
+     * If the emulator flag ignoring the line information was given,
+     * return immediately.
+     */
+
+    if (erts_no_line_info) {
+	return 1;
+    }
+
+    /*
      * Check version of line table.
      */
 
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 5f3f653e99..286fe9ff1e 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -127,6 +127,8 @@ int erts_modified_timing_level;
 
 int erts_no_crash_dump = 0;	/* Use -d to suppress crash dump. */
 
+int erts_no_line_info = 0;	/* -L: Don't load line information */
+
 /*
  * Other global variables.
  */
@@ -936,7 +938,9 @@ erl_start(int argc, char **argv)
 	case 'l':
 	    display_loads++;
 	    break;
-
+	case 'L':
+	    erts_no_line_info = 1;
+	    break;
 	case 'v':
 #ifdef DEBUG
 	    if (argv[i][2] == '\0') {
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 5588257eae..a967aa0e3e 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1087,6 +1087,7 @@ extern ErtsModifiedTimings erts_modified_timings[];
 #define ERTS_MODIFIED_TIMING_INPUT_REDS \
   (erts_modified_timings[erts_modified_timing_level].input_reds)
 
+extern int erts_no_line_info;
 extern Eterm erts_error_logger_warnings;
 extern int erts_initialized;
 extern int erts_compat_rel;