Browse Source

+ UNICODESTRINGS feature flag

git-svn-id: trunk@27026 -
florian 11 years ago
parent
commit
7eace968e7
2 changed files with 11 additions and 3 deletions
  1. 5 3
      compiler/globtype.pas
  2. 6 0
      rtl/inc/systemh.inc

+ 5 - 3
compiler/globtype.pas

@@ -253,7 +253,8 @@ interface
          f_heap,f_init_final,f_rtti,f_classes,f_exceptions,f_exitcode,
          f_heap,f_init_final,f_rtti,f_classes,f_exceptions,f_exitcode,
          f_ansistrings,f_widestrings,f_textio,f_consoleio,f_fileio,
          f_ansistrings,f_widestrings,f_textio,f_consoleio,f_fileio,
          f_random,f_variants,f_objects,f_dynarrays,f_threading,f_commandargs,
          f_random,f_variants,f_objects,f_dynarrays,f_threading,f_commandargs,
-         f_processes,f_stackcheck,f_dynlibs,f_softfpu,f_objectivec1,f_resources
+         f_processes,f_stackcheck,f_dynlibs,f_softfpu,f_objectivec1,f_resources,
+         f_unicodestring
        );
        );
        tfeatures = set of tfeature;
        tfeatures = set of tfeature;
 
 
@@ -344,11 +345,12 @@ interface
        }
        }
        WPOptimizationsNeedingAllUnitInfo = [cs_wpo_devirtualize_calls,cs_wpo_optimize_vmts];
        WPOptimizationsNeedingAllUnitInfo = [cs_wpo_devirtualize_calls,cs_wpo_optimize_vmts];
 
 
-       featurestr : array[tfeature] of string[12] = (
+       featurestr : array[tfeature] of string[14] = (
          'HEAP','INITFINAL','RTTI','CLASSES','EXCEPTIONS','EXITCODE',
          'HEAP','INITFINAL','RTTI','CLASSES','EXCEPTIONS','EXITCODE',
          'ANSISTRINGS','WIDESTRINGS','TEXTIO','CONSOLEIO','FILEIO',
          'ANSISTRINGS','WIDESTRINGS','TEXTIO','CONSOLEIO','FILEIO',
          'RANDOM','VARIANTS','OBJECTS','DYNARRAYS','THREADING','COMMANDARGS',
          'RANDOM','VARIANTS','OBJECTS','DYNARRAYS','THREADING','COMMANDARGS',
-         'PROCESSES','STACKCHECK','DYNLIBS','SOFTFPU','OBJECTIVEC1','RESOURCES'
+         'PROCESSES','STACKCHECK','DYNLIBS','SOFTFPU','OBJECTIVEC1','RESOURCES',
+         'UNICODESTRINGS'
        );
        );
 
 
     type
     type

+ 6 - 0
rtl/inc/systemh.inc

@@ -78,8 +78,14 @@
 {$define FPC_HAS_FEATURE_STACKCHECK}
 {$define FPC_HAS_FEATURE_STACKCHECK}
 {$define FPC_HAS_FEATURE_DYNLIBS}
 {$define FPC_HAS_FEATURE_DYNLIBS}
 {$define FPC_HAS_FEATURE_OBJECTIVEC1}
 {$define FPC_HAS_FEATURE_OBJECTIVEC1}
+{$define FPC_HAS_FEATURE_UNICODESTRINGS}
 {$endif FPC_HAS_FEATURE_SUPPORT}
 {$endif FPC_HAS_FEATURE_SUPPORT}
 
 
+{ bootstrapping, the starting compiler cannot be a downstripped compiler without unicodestring support }
+{$ifdef VER2_6}
+{$define FPC_HAS_FEATURE_UNICODESTRINGS}
+{$endif VER2_6}
+
 {****************************************************************************
 {****************************************************************************
                          Global Types and Constants
                          Global Types and Constants
 ****************************************************************************}
 ****************************************************************************}