Switch mips1 to mips

boostorg · Dec 2, 2018 · 6edc818 · 6edc818
1 parent 7601e2a
commit 6edc818
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
@@ -231,7 +231,7 @@ alias asm_sources
      asm/ontop_mips32_o32_elf_gas.S
    : <abi>o32
      <address-model>32
-     <architecture>mips1
+     <architecture>mips
      <binary-format>elf
      <toolset>clang
    ;
@@ -242,7 +242,7 @@ alias asm_sources
      asm/ontop_mips32_o32_elf_gas.S
    : <abi>o32
      <address-model>32
-     <architecture>mips1
+     <architecture>mips
      <binary-format>elf
      <toolset>gcc
    ;
@@ -254,7 +254,7 @@ alias asm_sources
      asm/ontop_mips64_n64_elf_gas.S
    : <abi>n64
      <address-model>64
-     <architecture>mips1
+     <architecture>mips
      <binary-format>elf
      <toolset>clang
    ;
@@ -265,7 +265,7 @@ alias asm_sources
      asm/ontop_mips64_n64_elf_gas.S
    : <abi>n64
      <address-model>64
-     <architecture>mips1
+     <architecture>mips
      <binary-format>elf
      <toolset>gcc
    ;

diff --git a/build/architecture.jam b/build/architecture.jam
@@ -55,9 +55,9 @@ rule deduce-architecture ( properties * )
         {
             return <architecture>arm ;
         }
-        else if [ configure.builds /boost/architecture//mips1 : $(properties) : mips1 ]
+        else if [ configure.builds /boost/architecture//mips : $(properties) : mips ]
         {
-            return <architecture>mips1 ;
+            return <architecture>mips ;
         }
         else if [ configure.builds /boost/architecture//power : $(properties) : power ]
         {

diff --git a/doc/architectures.qbk b/doc/architectures.qbk
@@ -15,7 +15,7 @@ architectures:
     [[arm (aarch32)] [AAPCS|ELF]      [AAPCS|PE] [-]           [AAPCS|MACH-O]]
     [[arm (aarch64)] [AAPCS|ELF]      [-]        [-]           [AAPCS|MACH-O]]
     [[i386]          [SYSV|ELF]       [MS|PE]    [SYSV|MACH-O] [-]]
-    [[mips1]         [O32|ELF]        [-]        [-]           [-]]
+    [[mips]          [O32,N64|ELF]    [-]        [-]           [-]]
     [[ppc32]         [SYSV|ELF,XCOFF] [-]        [SYSV|MACH-O] [-]]
     [[ppc64]         [SYSV|ELF,XCOFF] [-]        [SYSV|MACH-O] [-]]
     [[sparc]         [-]              [-]        [-]           [-]]

diff --git a/doc/context.xml b/doc/context.xml
@@ -5117,12 +5117,12 @@
           <row>
             <entry>
               <para>
-                mips1
+                mips
               </para>
             </entry>
             <entry>
               <para>
-                O32|ELF
+                O32,N64|ELF
               </para>
             </entry>
             <entry>

diff --git a/doc/html/context/architectures.html b/doc/html/context/architectures.html
@@ -153,12 +153,12 @@
 <tr>
 <td>
               <p>
-                mips1
+                mips
               </p>
             </td>
 <td>
               <p>
-                O32|ELF
+                O32,N64|ELF
               </p>
             </td>
 <td>