* Compiler directives {$...} are allowed in ARM inline assembler. It fixes tb0142.pp and tb0193.pp.

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@5664 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 14 insertions, 3 deletions

diff --git a/compiler/scanner.pas b/compiler/scanner.pas
index 7de1663dca..c7ee469975 100644
--- a/compiler/scanner.pas
+++ b/compiler/scanner.pas
@@ -3933,12 +3933,23 @@ exit_label:
            end;
          repeat
            case c of
-{$ifndef arm}
              // the { ... } is used in ARM assembler to define register sets,  so we can't used
-             // it as comment, either (* ... *), /* ... */ or // ... should be used instead
+             // it as comment, either (* ... *), /* ... */ or // ... should be used instead.
+             // But compiler directives {$...} are allowed in ARM assembler.
              '{' :
-               skipcomment;
+               begin
+{$ifdef arm}
+                 readchar;
+                 dec(inputpointer);
+                 if c<>'$' then
+                   begin
+                     asmgetchar:='{';
+                     exit;
+                   end
+                 else
 {$endif arm}
+                   skipcomment;
+               end;
              #10,#13 :
                begin
                  linebreak;