From 90c7e6752986f3c9a5d4debe6250661a77a3f409 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Wed, 19 Oct 2005 08:40:03 +0000
Subject: [PATCH] Merged revisions 1487 via svnmerge from
 http://peter@svn.freepascal.org/svn/fpc/trunk

r1487 (peter)
  * $W switch sets the localswitch cs_generate_stackframes that can be
    used in the future

git-svn-id: branches/fixes_2_0@1516 -
---
 .gitattributes         |  1 +
 compiler/globtype.pas  |  2 +-
 compiler/switches.pas  | 20 ++------------------
 tests/webtbs/tw4332.pp |  9 +++++++++
 4 files changed, 13 insertions(+), 19 deletions(-)
 create mode 100755 tests/webtbs/tw4332.pp

diff --git a/.gitattributes b/.gitattributes
index 19394ee696..4d5e1f2362 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6056,6 +6056,7 @@ tests/webtbs/tw4277.pp svneol=native#text/plain
 tests/webtbs/tw4290.pp svneol=native#text/plain
 tests/webtbs/tw4294.pp svneol=native#text/plain
 tests/webtbs/tw4308.pp svneol=native#text/plain
+tests/webtbs/tw4332.pp svneol=native#text/plain
 tests/webtbs/tw4336.pp svneol=native#text/plain
 tests/webtbs/tw4350.pp svneol=native#text/plain
 tests/webtbs/tw4352.pp svneol=native#text/plain
diff --git a/compiler/globtype.pas b/compiler/globtype.pas
index 44fecddf4d..8415100aaf 100644
--- a/compiler/globtype.pas
+++ b/compiler/globtype.pas
@@ -79,7 +79,7 @@ than 255 characters. That's why using Ansi Strings}
          cs_check_overflow,cs_check_range,cs_check_object,
          cs_check_io,cs_check_stack,
          cs_checkpointer,
-         cs_omitstackframe,cs_do_assertion,cs_generate_rtti,
+         cs_generate_stackframes,cs_do_assertion,cs_generate_rtti,
          cs_full_boolean_eval,cs_typed_const_writable,cs_allow_enum_calc,
          { mmx }
          cs_mmx,cs_mmx_saturation,
diff --git a/compiler/switches.pas b/compiler/switches.pas
index 560adfc3e0..0269151d11 100644
--- a/compiler/switches.pas
+++ b/compiler/switches.pas
@@ -59,11 +59,7 @@ const
    {I} (typesw:localsw; setsw:ord(cs_check_io)),
    {J} (typesw:localsw; setsw:ord(cs_typed_const_writable)),
    {K} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
-{$ifdef supportbrowser}
    {L} (typesw:modulesw; setsw:ord(cs_local_browser)),
-{$else supportbrowser}
-   {L} (typesw:modulesw; setsw:ord(cs_localnone)),
-{$endif supportbrowser}
    {M} (typesw:localsw; setsw:ord(cs_generate_rtti)),
    {N} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
    {O} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
@@ -74,13 +70,9 @@ const
    {T} (typesw:localsw; setsw:ord(cs_typed_addresses)),
    {U} (typesw:illegalsw; setsw:ord(cs_localnone)),
    {V} (typesw:localsw; setsw:ord(cs_strict_var_strings)),
-   {W} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
+   {W} (typesw:localsw; setsw:ord(cs_generate_stackframes)),
    {X} (typesw:modulesw; setsw:ord(cs_extsyntax)),
-{$ifdef supportbrowser}
    {Y} (typesw:modulesw; setsw:ord(cs_browser)),
-{$else supportbrowser}
-   {Y} (typesw:modulesw; setsw:ord(cs_localnone)),
-{$endif supportbrowser}
    {Z} (typesw:illegalsw; setsw:ord(cs_localnone))
     );
 
@@ -97,11 +89,7 @@ const
    {I} (typesw:localsw; setsw:ord(cs_check_io)),
    {J} (typesw:localsw; setsw:ord(cs_external_var)),
    {K} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
-{$ifdef supportbrowser}
    {L} (typesw:modulesw; setsw:ord(cs_local_browser)),
-{$else supportbrowser}
-   {L} (typesw:modulesw; setsw:ord(cs_localnone)),
-{$endif supportbrowser}
    {M} (typesw:localsw; setsw:ord(cs_generate_rtti)),
    {N} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
    {O} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
@@ -112,13 +100,9 @@ const
    {T} (typesw:localsw; setsw:ord(cs_typed_addresses)),
    {U} (typesw:illegalsw; setsw:ord(cs_localnone)),
    {V} (typesw:localsw; setsw:ord(cs_strict_var_strings)),
-   {W} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
+   {W} (typesw:localsw; setsw:ord(cs_generate_stackframes)),
    {X} (typesw:modulesw; setsw:ord(cs_extsyntax)),
-{$ifdef supportbrowser}
    {Y} (typesw:modulesw; setsw:ord(cs_browser)),
-{$else supportbrowser}
-   {Y} (typesw:modulesw; setsw:ord(cs_localnone)),
-{$endif supportbrowser}
    {Z} (typesw:localsw; setsw:ord(cs_externally_visible))
     );
 
diff --git a/tests/webtbs/tw4332.pp b/tests/webtbs/tw4332.pp
new file mode 100755
index 0000000000..20d76f50f1
--- /dev/null
+++ b/tests/webtbs/tw4332.pp
@@ -0,0 +1,9 @@
+{ %opt=-Sew }
+
+{$W+}
+{$W-}
+{$STACKFRAMES ON}
+{$STACKFRAMES OFF}
+
+begin
+end.