[Mips] Add ABI and ARCH flags to the object files.

No functional changes.

llvm-svn: 220931

28 files changed, 51 insertions, 36 deletions

diff --git a/lld/test/elf/Mips/dt-textrel.test b/lld/test/elf/Mips/dt-textrel.test
index 094f1797fb1..ca854dff8e5 100644
--- a/lld/test/elf/Mips/dt-textrel.test
+++ b/lld/test/elf/Mips/dt-textrel.test
@@ -16,7 +16,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
diff --git a/lld/test/elf/Mips/dynlib-fileheader.test b/lld/test/elf/Mips/dynlib-fileheader.test
index 94e201b617b..5dd9d6a64a7 100644
--- a/lld/test/elf/Mips/dynlib-fileheader.test
+++ b/lld/test/elf/Mips/dynlib-fileheader.test
@@ -45,8 +45,8 @@ FileHeader:
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_MIPS
-  Flags:           [ EF_MIPS_PIC, EF_MIPS_CPIC,
-                     EF_MIPS_ABI_O32, EF_MIPS_ARCH_32 ]
+  Flags:           [ EF_MIPS_NOREORDER, EF_MIPS_PIC, EF_MIPS_CPIC,
+                     EF_MIPS_ABI_O32, EF_MIPS_ARCH_32R2 ]
 Sections:
   - Name:            .text
     Type:            SHT_PROGBITS
diff --git a/lld/test/elf/Mips/dynsym-table-1.test b/lld/test/elf/Mips/dynsym-table-1.test
index 819ddc7a33c..19f5889f39c 100644
--- a/lld/test/elf/Mips/dynsym-table-1.test
+++ b/lld/test/elf/Mips/dynsym-table-1.test
@@ -46,6 +46,8 @@ FileHeader:
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_MIPS
+  Flags:           [EF_MIPS_PIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
+
 Sections:
   - Name:            .text
     Type:            SHT_PROGBITS
@@ -66,6 +68,8 @@ FileHeader:
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_MIPS
+  Flags:           [EF_MIPS_PIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
+
 Sections:
   - Name:            .text
     Type:            SHT_PROGBITS
@@ -96,6 +100,8 @@ FileHeader:
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_MIPS
+  Flags:           [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
+
 Sections:
   - Name:            .text
     Type:            SHT_PROGBITS
diff --git a/lld/test/elf/Mips/dynsym-table-2.test b/lld/test/elf/Mips/dynsym-table-2.test
index 91c59ebd9a0..538aa758910 100644
--- a/lld/test/elf/Mips/dynsym-table-2.test
+++ b/lld/test/elf/Mips/dynsym-table-2.test
@@ -51,6 +51,8 @@ FileHeader:
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_MIPS
+  Flags:           [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
+
 Sections:
   - Name:            .text
     Type:            SHT_PROGBITS
@@ -76,6 +78,8 @@ FileHeader:
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_MIPS
+  Flags:           [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
+
 Sections:
   - Name:            .text
     Type:            SHT_PROGBITS
diff --git a/lld/test/elf/Mips/exe-dynamic.test b/lld/test/elf/Mips/exe-dynamic.test
index e659fb41761..766b41f520a 100644
--- a/lld/test/elf/Mips/exe-dynamic.test
+++ b/lld/test/elf/Mips/exe-dynamic.test
@@ -44,7 +44,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
diff --git a/lld/test/elf/Mips/exe-fileheader.test b/lld/test/elf/Mips/exe-fileheader.test
index 06f82354efe..086d43559fa 100644
--- a/lld/test/elf/Mips/exe-fileheader.test
+++ b/lld/test/elf/Mips/exe-fileheader.test
@@ -50,7 +50,8 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_NOREORDER, EF_MIPS_PIC, EF_MIPS_CPIC,
+            EF_MIPS_ABI_O32, EF_MIPS_ARCH_32R2]
 
 Sections:
 - Name:         .text
@@ -74,7 +75,7 @@ FileHeader:
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_MIPS
-  Flags:           [ EF_MIPS_PIC, EF_MIPS_CPIC,
+  Flags:           [ EF_MIPS_NOREORDER, EF_MIPS_PIC, EF_MIPS_CPIC,
                      EF_MIPS_ABI_O32, EF_MIPS_ARCH_32 ]
 Sections:
   - Name:            .text
diff --git a/lld/test/elf/Mips/exe-got.test b/lld/test/elf/Mips/exe-got.test
index 2eb28280cfe..7254c87530b 100644
--- a/lld/test/elf/Mips/exe-got.test
+++ b/lld/test/elf/Mips/exe-got.test
@@ -57,7 +57,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
   - Name:         .text
diff --git a/lld/test/elf/Mips/gp-sym-1.test b/lld/test/elf/Mips/gp-sym-1.test
index 2492ba71e2a..ad36cc0eb63 100644
--- a/lld/test/elf/Mips/gp-sym-1.test
+++ b/lld/test/elf/Mips/gp-sym-1.test
@@ -22,7 +22,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
   - Name:         .text
diff --git a/lld/test/elf/Mips/hilo16-4.test b/lld/test/elf/Mips/hilo16-4.test
index d3e02193b40..0d61c569cd0 100644
--- a/lld/test/elf/Mips/hilo16-4.test
+++ b/lld/test/elf/Mips/hilo16-4.test
@@ -29,6 +29,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
+  Flags:   [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/hilo16-5.test b/lld/test/elf/Mips/hilo16-5.test
index 95d8e86ff5b..23471f5e68c 100644
--- a/lld/test/elf/Mips/hilo16-5.test
+++ b/lld/test/elf/Mips/hilo16-5.test
@@ -18,7 +18,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
   - Name:         .data
@@ -47,7 +47,7 @@ FileHeader:
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_CPIC]
+  Flags: [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/opt-emulation.test b/lld/test/elf/Mips/opt-emulation.test
index 0129ec67cb2..2d1e7142c38 100644
--- a/lld/test/elf/Mips/opt-emulation.test
+++ b/lld/test/elf/Mips/opt-emulation.test
@@ -24,7 +24,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_CPIC]
+  Flags: [EF_MIPS_NOREORDER, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32R2]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/plt-header.test b/lld/test/elf/Mips/plt-header.test
index 4fecb38d563..51fda4209e1 100644
--- a/lld/test/elf/Mips/plt-header.test
+++ b/lld/test/elf/Mips/plt-header.test
@@ -36,7 +36,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
   - Name:         .text
diff --git a/lld/test/elf/Mips/r26-1.test b/lld/test/elf/Mips/r26-1.test
index 22d8f39b043..9c39f6b2165 100644
--- a/lld/test/elf/Mips/r26-1.test
+++ b/lld/test/elf/Mips/r26-1.test
@@ -69,7 +69,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
@@ -93,7 +93,7 @@ FileHeader:
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_MIPS
-  Flags:           [ EF_MIPS_ABI_O32, EF_MIPS_ARCH_32 ]
+  Flags:           [ EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32 ]
 
 Sections:
   - Name:            .text
diff --git a/lld/test/elf/Mips/r26-2.test b/lld/test/elf/Mips/r26-2.test
index 2f7393c1065..956830524d9 100644
--- a/lld/test/elf/Mips/r26-2.test
+++ b/lld/test/elf/Mips/r26-2.test
@@ -33,6 +33,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
+  Flags:   [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-32.test b/lld/test/elf/Mips/rel-32.test
index 85d3f0c99cf..beefde59b7b 100644
--- a/lld/test/elf/Mips/rel-32.test
+++ b/lld/test/elf/Mips/rel-32.test
@@ -17,6 +17,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
+  Flags: [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-copy.test b/lld/test/elf/Mips/rel-copy.test
index 11910c51455..648a25e22ae 100644
--- a/lld/test/elf/Mips/rel-copy.test
+++ b/lld/test/elf/Mips/rel-copy.test
@@ -69,7 +69,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .data
@@ -98,7 +98,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .data
@@ -122,7 +122,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
diff --git a/lld/test/elf/Mips/rel-dynamic-01.test b/lld/test/elf/Mips/rel-dynamic-01.test
index e2b4ea5712d..79a76390f2e 100644
--- a/lld/test/elf/Mips/rel-dynamic-01.test
+++ b/lld/test/elf/Mips/rel-dynamic-01.test
@@ -113,7 +113,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
@@ -163,7 +163,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_CPIC]
+  Flags: [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-02.test b/lld/test/elf/Mips/rel-dynamic-02.test
index e1365566f0b..5758e98ca67 100644
--- a/lld/test/elf/Mips/rel-dynamic-02.test
+++ b/lld/test/elf/Mips/rel-dynamic-02.test
@@ -34,7 +34,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags: [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-03.test b/lld/test/elf/Mips/rel-dynamic-03.test
index 3374a40fc80..1de5ac57e80 100644
--- a/lld/test/elf/Mips/rel-dynamic-03.test
+++ b/lld/test/elf/Mips/rel-dynamic-03.test
@@ -55,7 +55,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
@@ -79,7 +79,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_CPIC]
+  Flags: [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-04.test b/lld/test/elf/Mips/rel-dynamic-04.test
index d67e0667fb1..a5df8cba827 100644
--- a/lld/test/elf/Mips/rel-dynamic-04.test
+++ b/lld/test/elf/Mips/rel-dynamic-04.test
@@ -121,7 +121,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
@@ -155,7 +155,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_CPIC]
+  Flags: [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-05.test b/lld/test/elf/Mips/rel-dynamic-05.test
index 4dcfd543a3a..b294df649ff 100644
--- a/lld/test/elf/Mips/rel-dynamic-05.test
+++ b/lld/test/elf/Mips/rel-dynamic-05.test
@@ -103,7 +103,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
@@ -137,7 +137,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_CPIC]
+  Flags: [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-06.test b/lld/test/elf/Mips/rel-dynamic-06.test
index dc099601148..433eb5fadf5 100644
--- a/lld/test/elf/Mips/rel-dynamic-06.test
+++ b/lld/test/elf/Mips/rel-dynamic-06.test
@@ -56,7 +56,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags: [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-07.test b/lld/test/elf/Mips/rel-dynamic-07.test
index d31c5bff726..56e55be3a26 100644
--- a/lld/test/elf/Mips/rel-dynamic-07.test
+++ b/lld/test/elf/Mips/rel-dynamic-07.test
@@ -130,7 +130,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
@@ -175,7 +175,7 @@ FileHeader:
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags: [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-08.test b/lld/test/elf/Mips/rel-dynamic-08.test
index cb1ed4db4ef..62f4dc278b0 100644
--- a/lld/test/elf/Mips/rel-dynamic-08.test
+++ b/lld/test/elf/Mips/rel-dynamic-08.test
@@ -80,7 +80,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
@@ -125,7 +125,7 @@ FileHeader:
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_CPIC]
+  Flags: [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-09.test b/lld/test/elf/Mips/rel-dynamic-09.test
index 189defcad11..18eeb9dd33d 100644
--- a/lld/test/elf/Mips/rel-dynamic-09.test
+++ b/lld/test/elf/Mips/rel-dynamic-09.test
@@ -34,7 +34,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_CPIC]
+  Flags: [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32 ]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-10.test b/lld/test/elf/Mips/rel-dynamic-10.test
index 53376896925..4df558167fc 100644
--- a/lld/test/elf/Mips/rel-dynamic-10.test
+++ b/lld/test/elf/Mips/rel-dynamic-10.test
@@ -36,7 +36,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
@@ -86,7 +86,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_CPIC]
+  Flags: [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-dynamic-11.test b/lld/test/elf/Mips/rel-dynamic-11.test
index aaa7b41aefe..50f7306023f 100644
--- a/lld/test/elf/Mips/rel-dynamic-11.test
+++ b/lld/test/elf/Mips/rel-dynamic-11.test
@@ -37,7 +37,7 @@ FileHeader:
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_MIPS
-  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags:   [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name:         .text
@@ -61,7 +61,7 @@ FileHeader:
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
-  Flags: [EF_MIPS_PIC, EF_MIPS_CPIC]
+  Flags: [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text
diff --git a/lld/test/elf/Mips/rel-pc32.test b/lld/test/elf/Mips/rel-pc32.test
index b701a215951..e448e8afc30 100644
--- a/lld/test/elf/Mips/rel-pc32.test
+++ b/lld/test/elf/Mips/rel-pc32.test
@@ -17,6 +17,7 @@ FileHeader: !FileHeader
   Data: ELFDATA2LSB
   Type: ET_REL
   Machine: EM_MIPS
+  Flags:   [EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
 
 Sections:
 - Name: .text