diff --git a/compiler/globals.pas b/compiler/globals.pas
index 31aa63bcb7..338531fcdb 100644
--- a/compiler/globals.pas
+++ b/compiler/globals.pas
@@ -323,9 +323,7 @@ interface
      { Memory sizes }
        heapsize,
        maxheapsize,
-       stacksize,
-       jmp_buf_size,
-       jmp_buf_align : longint;
+       stacksize   : longint;
 
 {$Ifdef EXTDEBUG}
      { parameter switches }
@@ -1407,11 +1405,6 @@ implementation
           in options or init_parser }
         stacksize:=0;
         { not initialized yet }
-{$ifndef jvm}
-        jmp_buf_size:=-1;
-{$else}
-        jmp_buf_size:=0;
-{$endif}
         apptype:=app_cui;
 
         { Init values }
diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas
index 544d560116..263a382de1 100644
--- a/compiler/ncgutil.pas
+++ b/compiler/ncgutil.pas
@@ -393,9 +393,8 @@ implementation
           the TExceptAddr record from the system unit (like we do for jmp_buf_size),
           without moving TExceptAddr to the interface part? }
         except_buf_size:=voidpointertype.size*2+sizeof(pint);
-        get_jumpbuf_size;
         tg.GetTemp(list,except_buf_size,sizeof(pint),tt_persistent,t.envbuf);
-        tg.GetTemp(list,jmp_buf_size,jmp_buf_align,tt_persistent,t.jmpbuf);
+        tg.gethltemp(list,rec_jmp_buf,rec_jmp_buf.size,tt_persistent,t.jmpbuf);
         tg.GetTemp(list,sizeof(pint),sizeof(pint),tt_persistent,t.reasonbuf);
       end;
 
diff --git a/compiler/nflw.pas b/compiler/nflw.pas
index c76b171fc2..bdee59882a 100644
--- a/compiler/nflw.pas
+++ b/compiler/nflw.pas
@@ -2068,7 +2068,7 @@ implementation
 
         include(current_procinfo.flags,pi_do_call);
         include(current_procinfo.flags,pi_uses_exceptions);
-        inc(current_procinfo.estimatedtempsize,get_jumpbuf_size*2);
+        inc(current_procinfo.estimatedtempsize,rec_jmp_buf.size*2);
       end;
 
 
@@ -2141,7 +2141,7 @@ implementation
         if not(implicitframe) then
           include(current_procinfo.flags,pi_uses_exceptions);
 
-        inc(current_procinfo.estimatedtempsize,get_jumpbuf_size);
+        inc(current_procinfo.estimatedtempsize,rec_jmp_buf.size);
       end;
 
 
diff --git a/compiler/symtable.pas b/compiler/symtable.pas
index 7fbc181236..9c1f93c062 100644
--- a/compiler/symtable.pas
+++ b/compiler/symtable.pas
@@ -283,7 +283,6 @@ interface
     procedure hidesym(sym:TSymEntry);
     procedure duplicatesym(var hashedid:THashedIDString;dupsym,origsym:TSymEntry);
     function handle_generic_dummysym(sym:TSymEntry;var symoptions:tsymoptions):boolean;
-    function get_jumpbuf_size : longint;
 
 {*** Search ***}
     procedure addsymref(sym:tsym);
@@ -2506,19 +2505,6 @@ implementation
       end;
 
 
-    function get_jumpbuf_size : longint;
-      var
-        srsym : ttypesym;
-      begin
-        if jmp_buf_size=-1 then
-          begin
-            srsym:=search_system_type('JMP_BUF');
-            jmp_buf_size:=srsym.typedef.size;
-            jmp_buf_align:=srsym.typedef.alignment;
-          end;
-        result:=jmp_buf_size;
-      end;
-
 {*****************************************************************************
                                   Search
 *****************************************************************************}