Revert "sphinx: use proper lexers for target macros"

This reverts commit c0eb1a3b7c944dd7cd5a4056a817a25aa8ce2569.

diff --git a/gcc/doc/gccint/target-macros/tm.rst.in b/gcc/doc/gccint/target-macros/tm.rst.in
index 44f3a3b2222d7691ecb3fb6ca8fa5a3de0ab867f..17fc9e1b0aaefde4c70d45b039b556d10a87d128 100644 (file)
--- a/gcc/doc/gccint/target-macros/tm.rst.in
+++ b/gcc/doc/gccint/target-macros/tm.rst.in
@@ -1332,7 +1332,7 @@
   
   Given below example:
   
-  .. code-block:: gas
+  .. code-block:: c++
   
         ldr r10, [r1, 4]
         add r4, r4, r10
@@ -1349,7 +1349,7 @@
   this scheduling fusion pass works.  This hook calculates priority for each
   instruction based on its fustion type, like:
   
-  .. code-block:: gas
+  .. code-block:: c++
   
         ldr r10, [r1, 4]  ; fusion_pri=99,  pri=96
         add r4, r4, r10   ; fusion_pri=100, pri=100
@@ -1364,7 +1364,7 @@
   to the priorities.  As a result, instructions of same fusion type will be
   pushed together in instruction flow, like:
   
-  .. code-block:: gas
+  .. code-block:: c++
   
         ldr r11, [r1, 0]
         ldr r10, [r1, 4]
@@ -3876,13 +3876,13 @@
   contain UNSPECs or UNSPEC_VOLATILEs.  The DWARF 2 call frame debugging
   info engine will invoke it on insns of the form
   
-  .. code-block::
+  .. code-block:: c++
   
     (set (reg) (unspec [...] UNSPEC_INDEX))
   
   and
   
-  .. code-block::
+  .. code-block:: c++
   
     (set (reg) (unspec_volatile [...] UNSPECV_INDEX)).
   
@@ -3900,7 +3900,7 @@
   register :samp:`{R}` and set :samp:`*{factor}` and :samp:`*{offset}` such
   that the value of the indeterminate is:
   
-  .. code-block::
+  .. code-block:: c++
   
     value_of(R) / factor - offset
   

diff --git a/gcc/target.def b/gcc/target.def
index aed1c1d3e227ac6eb1bf1fab2e1641bcaac574d9..7751b7fe7b14019756d31db32f567b7ae08e2577 100644 (file)
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -1552,7 +1552,7 @@ instructions.\n\
 \n\
 Given below example:\n\
 \n\
-.. code-block:: gas\n\
+.. code-block:: c++\n\
 \n\
       ldr r10, [r1, 4]\n\
       add r4, r4, r10\n\
@@ -1569,7 +1569,7 @@ loads are actually next to each other in instruction flow.  That's where\n\
 this scheduling fusion pass works.  This hook calculates priority for each\n\
 instruction based on its fustion type, like:\n\
 \n\
-.. code-block:: gas\n\
+.. code-block:: c++\n\
 \n\
       ldr r10, [r1, 4]  ; fusion_pri=99,  pri=96\n\
       add r4, r4, r10   ; fusion_pri=100, pri=100\n\
@@ -1584,7 +1584,7 @@ Scheduling fusion pass then sorts all ready to issue instructions according\n\
 to the priorities.  As a result, instructions of same fusion type will be\n\
 pushed together in instruction flow, like:\n\
 \n\
-.. code-block:: gas\n\
+.. code-block:: c++\n\
 \n\
       ldr r11, [r1, 0]\n\
       ldr r10, [r1, 4]\n\
@@ -4262,13 +4262,13 @@ DEFHOOK
 contain UNSPECs or UNSPEC_VOLATILEs.  The DWARF 2 call frame debugging\n\
 info engine will invoke it on insns of the form\n\
 \n\
-.. code-block::\n\
+.. code-block:: c++\n\
 \n\
   (set (reg) (unspec [...] UNSPEC_INDEX))\n\
 \n\
 and\n\
 \n\
-.. code-block::\n\
+.. code-block:: c++\n\
 \n\
   (set (reg) (unspec_volatile [...] UNSPECV_INDEX)).\n\
 \n\
@@ -4284,7 +4284,7 @@ expression, with :samp:`{i}` counting from 1.  Return the number of a DWARF\n\
 register :samp:`{R}` and set :samp:`*{factor}` and :samp:`*{offset}` such\n\
 that the value of the indeterminate is:\n\
 \n\
-.. code-block::\n\
+.. code-block:: c++\n\
 \n\
   value_of(R) / factor - offset\n\
 \n\