diff --git a/jedi.inc b/jedi.inc
index 298ca8f..8a743f3 100644
--- a/jedi.inc
+++ b/jedi.inc
@@ -88,7 +88,7 @@
   CPUx86_64           Defined when target platform is native x86_64 (win64)
   CPU32               Defined when target is 32-bit
   CPU64               Defined when target is 64-bit
-  CPUASM              Defined when target assembler is available
+  CPUASM              **Deprecated** Defined when target assembler is available - Use ASSEMBLER instead
 
 - Visual library Directives
 
@@ -110,10 +110,12 @@
 
   Directive           Description
   ------------------------------------------------------------------------------
-  PUREPASCAL          Code is machine-independent (as opposed to assembler code)
+  ASSEMBLER           Assembler syntax is accepted
+  ASMX86              Assembler syntax is accepted for CPUX86
+  ASMX64              Assembler syntax is accepted for CPUX64
   Win32API            Code is specific for the Win32 API;
                       use instead of "{$IFNDEF CLR} {$IFDEF MSWINDOWS}" constructs
-
+  PUREPASCAL          **Deprecated** Code is machine-independent (as opposed to assembler code) - Should no longer be used
 
 - Delphi Versions
 
@@ -709,16 +711,10 @@
     {$ASMMODE Intel}
   {$IFEND}
   {$UNDEF BORLAND}
-  {$DEFINE CPUASM}
    // FPC defines CPU32, CPU64 and Unix automatically
 {$ENDIF}
 
 {$IFDEF ELEMENTS}
-  // Oxygene's assembly syntax is very different; Delphi/FPC asm blocks will not compile.
-  // PurePascal code sections should be used instead.
-  {$UNDEF CPUASM}
-  {$DEFINE PUREPASCAL}
-
   {$UNDEF BORLAND}
 {$ENDIF}
 
@@ -1934,19 +1930,6 @@
   {$DEFINE SUPPORTS_UNICODE}
 {$ENDIF CLR}
 
-{$IFDEF BORLAND}
-  {$IFNDEF CLR}
-    // The ASSEMBLER symbol appeared with Delphi 7
-    {$IFNDEF COMPILER7_UP}
-      {$DEFINE CPUASM}
-    {$ELSE}
-      {$IFDEF ASSEMBLER}
-        {$DEFINE CPUASM}
-      {$ENDIF ASSEMBLER}
-    {$ENDIF ~COMPILER7_UP}
-  {$ENDIF ~CLR}
-{$ENDIF BORLAND}
-
 {$IFDEF COMPILER1_UP}
   {$DEFINE SUPPORTS_CONSTPARAMS}
   {$DEFINE SUPPORTS_SINGLE}
@@ -2170,9 +2153,23 @@
 { Cross-platform related defines                                               }
 {------------------------------------------------------------------------------}
 
-{$IFNDEF CPUASM}
-  {$DEFINE PUREPASCAL}
-{$ENDIF ~CPUASM}
+{$IFDEF FPC}
+  {$DEFINE ASSEMBLER}
+{$ENDIF FPC}
+
+{$IFDEF BORLAND}
+  {$IFNDEF CLR}
+    // The ASSEMBLER symbol appeared with Delphi 7
+    {$IFNDEF COMPILER7_UP}
+      {$DEFINE ASSEMBLER}
+    {$ENDIF ~COMPILER7_UP}
+  {$ENDIF ~CLR}
+{$ENDIF BORLAND}
+
+{$IFDEF ASSEMBLER}
+  {$IFDEF CPU386} {$DEFINE ASMX86} {$ENDIF}
+  {$IFDEF CPUX64} {$DEFINE ASMX64} {$ENDIF}
+{$ENDIF ASSEMBLER}
 
 {$IFDEF WIN32}
   {$DEFINE MSWINDOWS} // predefined for D6+/BCB6+
@@ -2233,4 +2230,14 @@
 // for Delphi/BCB trial versions remove the point from the line below
 {.$UNDEF SUPPORTS_WEAKPACKAGEUNIT}
 
+{------------------------------------------------------------------------------}
+{ Deprecated defines for backward compatibility                                }
+{------------------------------------------------------------------------------}
+
+{$IFDEF ASSEMBLER}
+  {$DEFINE CPUASM}
+{$ELSE ASSEMBLER}
+  {$DEFINE PUREPASCAL}
+{$ENDIF ASSEMBLER}
+
 {$ENDIF ~JEDI_INC}