From a9c949e551484eba3bc54b30f86fc5f004dfe043 Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Sat, 8 Jun 2013 19:52:28 +0000
Subject: [PATCH] * the memory model const sets introduced in r24812 moved to
 i8086/cpuinfo.pas

git-svn-id: trunk@24816 -
---
 compiler/globtype.pas      | 5 -----
 compiler/i8086/cpuinfo.pas | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/globtype.pas b/compiler/globtype.pas
index 80159c7944..570bb891a7 100644
--- a/compiler/globtype.pas
+++ b/compiler/globtype.pas
@@ -671,11 +671,6 @@ interface
 
     type
       tx86memorymodel = (mm_tiny,mm_small,mm_medium,mm_compact,mm_large,mm_huge);
-    const
-      x86_near_code_models = [mm_tiny,mm_small,mm_compact];
-      x86_far_code_models = [mm_medium,mm_large,mm_huge];
-      x86_near_data_models = [mm_tiny,mm_small,mm_medium];
-      x86_far_data_models = [mm_compact,mm_large,mm_huge];
 
   { hide Sysutils.ExecuteProcess in units using this one after SysUtils}
   const
diff --git a/compiler/i8086/cpuinfo.pas b/compiler/i8086/cpuinfo.pas
index 7ff0f1a841..228d5b6d8f 100644
--- a/compiler/i8086/cpuinfo.pas
+++ b/compiler/i8086/cpuinfo.pas
@@ -125,6 +125,11 @@ Const
    level3optimizerswitches = genericlevel3optimizerswitches + level2optimizerswitches + [{,cs_opt_loopunroll}];
    level4optimizerswitches = genericlevel4optimizerswitches + level3optimizerswitches + [cs_useebp];
 
+   x86_near_code_models = [mm_tiny,mm_small,mm_compact];
+   x86_far_code_models = [mm_medium,mm_large,mm_huge];
+   x86_near_data_models = [mm_tiny,mm_small,mm_medium];
+   x86_far_data_models = [mm_compact,mm_large,mm_huge];
+
 Implementation
 
 end.