You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/06/03 10:31:29 UTC
[incubator-nuttx] branch master updated: boards/mips: restore
OUTPUT_FORMAT and OUTPUT_ARCH for mips link scripts
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new d05cca0 boards/mips: restore OUTPUT_FORMAT and OUTPUT_ARCH for mips link scripts
d05cca0 is described below
commit d05cca0d91f8b0daa7793d4690d76bfd338c426c
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Wed Jun 3 16:18:43 2020 +0800
boards/mips: restore OUTPUT_FORMAT and OUTPUT_ARCH for mips link scripts
Restore OUTPUT_FORMAT and OUTPUT_ARCH for mips link scripts to fix Nightly build break logs:
p32-ld: pic32mx_head.o: compiled for a little endian system and target is big endian
p32-ld: pic32mx_head.o: endianness incompatible with that of the selected emulation
p32-ld: failed to merge target specific data of file pic32mx_head.o
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
boards/mips/pic32mx/mirtoo/scripts/c32-debug.ld | 2 ++
boards/mips/pic32mx/mirtoo/scripts/c32-release.ld | 2 ++
boards/mips/pic32mx/mirtoo/scripts/mips-elf-debug.ld | 2 ++
boards/mips/pic32mx/mirtoo/scripts/mips-elf-release.ld | 2 ++
boards/mips/pic32mx/mirtoo/scripts/pinguino-debug.ld | 2 ++
boards/mips/pic32mx/mirtoo/scripts/xc32-debug.ld | 2 ++
boards/mips/pic32mx/mirtoo/scripts/xc32-release.ld | 2 ++
boards/mips/pic32mx/pic32mx-starterkit/scripts/c32-release.ld | 2 ++
boards/mips/pic32mx/pic32mx-starterkit/scripts/mips-release.ld | 2 ++
boards/mips/pic32mx/pic32mx-starterkit/scripts/pinguino-debug.ld | 2 ++
boards/mips/pic32mx/pic32mx7mmb/scripts/c32-release.ld | 2 ++
boards/mips/pic32mx/pic32mx7mmb/scripts/mips-release.ld | 2 ++
boards/mips/pic32mx/pic32mx7mmb/scripts/pinguino-debug.ld | 2 ++
boards/mips/pic32mx/sure-pic32mx/scripts/c32-release.ld | 2 ++
boards/mips/pic32mx/sure-pic32mx/scripts/mips-release.ld | 2 ++
boards/mips/pic32mx/sure-pic32mx/scripts/pinguino-debug.ld | 2 ++
boards/mips/pic32mx/ubw32/scripts/c32-release.ld | 2 ++
boards/mips/pic32mx/ubw32/scripts/mips-release.ld | 2 ++
boards/mips/pic32mx/ubw32/scripts/pinguino-debug.ld | 2 ++
boards/mips/pic32mz/flipnclick-pic32mz/scripts/c32-debug.ld | 2 ++
boards/mips/pic32mz/flipnclick-pic32mz/scripts/mips-debug.ld | 2 ++
boards/mips/pic32mz/flipnclick-pic32mz/scripts/pinguino-debug.ld | 2 ++
boards/mips/pic32mz/flipnclick-pic32mz/scripts/xc32-debug.ld | 2 ++
boards/mips/pic32mz/pic32mz-starterkit/scripts/c32-debug.ld | 2 ++
boards/mips/pic32mz/pic32mz-starterkit/scripts/mips-debug.ld | 2 ++
boards/mips/pic32mz/pic32mz-starterkit/scripts/pinguino-debug.ld | 2 ++
boards/mips/pic32mz/pic32mz-starterkit/scripts/xc32-debug.ld | 2 ++
27 files changed, 54 insertions(+)
diff --git a/boards/mips/pic32mx/mirtoo/scripts/c32-debug.ld b/boards/mips/pic32mx/mirtoo/scripts/c32-debug.ld
index 494ab0f..d6d6983 100644
--- a/boards/mips/pic32mx/mirtoo/scripts/c32-debug.ld
+++ b/boards/mips/pic32mx/mirtoo/scripts/c32-debug.ld
@@ -88,6 +88,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/mirtoo/scripts/c32-release.ld b/boards/mips/pic32mx/mirtoo/scripts/c32-release.ld
index 6e67691..b9e3880 100644
--- a/boards/mips/pic32mx/mirtoo/scripts/c32-release.ld
+++ b/boards/mips/pic32mx/mirtoo/scripts/c32-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/mirtoo/scripts/mips-elf-debug.ld b/boards/mips/pic32mx/mirtoo/scripts/mips-elf-debug.ld
index a687133..d679a7f 100644
--- a/boards/mips/pic32mx/mirtoo/scripts/mips-elf-debug.ld
+++ b/boards/mips/pic32mx/mirtoo/scripts/mips-elf-debug.ld
@@ -88,6 +88,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/mirtoo/scripts/mips-elf-release.ld b/boards/mips/pic32mx/mirtoo/scripts/mips-elf-release.ld
index 809f38e..8fe496e 100644
--- a/boards/mips/pic32mx/mirtoo/scripts/mips-elf-release.ld
+++ b/boards/mips/pic32mx/mirtoo/scripts/mips-elf-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/mirtoo/scripts/pinguino-debug.ld b/boards/mips/pic32mx/mirtoo/scripts/pinguino-debug.ld
index a687133..d679a7f 100644
--- a/boards/mips/pic32mx/mirtoo/scripts/pinguino-debug.ld
+++ b/boards/mips/pic32mx/mirtoo/scripts/pinguino-debug.ld
@@ -88,6 +88,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/mirtoo/scripts/xc32-debug.ld b/boards/mips/pic32mx/mirtoo/scripts/xc32-debug.ld
index d4bd1a0..4b89794 100644
--- a/boards/mips/pic32mx/mirtoo/scripts/xc32-debug.ld
+++ b/boards/mips/pic32mx/mirtoo/scripts/xc32-debug.ld
@@ -88,6 +88,8 @@ MEMORY
kseg1_data_mem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/mirtoo/scripts/xc32-release.ld b/boards/mips/pic32mx/mirtoo/scripts/xc32-release.ld
index 1d7c460..d8fda78 100644
--- a/boards/mips/pic32mx/mirtoo/scripts/xc32-release.ld
+++ b/boards/mips/pic32mx/mirtoo/scripts/xc32-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_data_mem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/scripts/c32-release.ld b/boards/mips/pic32mx/pic32mx-starterkit/scripts/c32-release.ld
index 3bba120..a38af5a 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/scripts/c32-release.ld
+++ b/boards/mips/pic32mx/pic32mx-starterkit/scripts/c32-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 128K - 512
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/scripts/mips-release.ld b/boards/mips/pic32mx/pic32mx-starterkit/scripts/mips-release.ld
index 2015812..6d6f100 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/scripts/mips-release.ld
+++ b/boards/mips/pic32mx/pic32mx-starterkit/scripts/mips-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 128K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/scripts/pinguino-debug.ld b/boards/mips/pic32mx/pic32mx-starterkit/scripts/pinguino-debug.ld
index 2015812..6d6f100 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/scripts/pinguino-debug.ld
+++ b/boards/mips/pic32mx/pic32mx-starterkit/scripts/pinguino-debug.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 128K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/pic32mx7mmb/scripts/c32-release.ld b/boards/mips/pic32mx/pic32mx7mmb/scripts/c32-release.ld
index a9c24af..9e2323a 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/scripts/c32-release.ld
+++ b/boards/mips/pic32mx/pic32mx7mmb/scripts/c32-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 128K - 512
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/pic32mx7mmb/scripts/mips-release.ld b/boards/mips/pic32mx/pic32mx7mmb/scripts/mips-release.ld
index 86d396b..a457905 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/scripts/mips-release.ld
+++ b/boards/mips/pic32mx/pic32mx7mmb/scripts/mips-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 128K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/pic32mx7mmb/scripts/pinguino-debug.ld b/boards/mips/pic32mx/pic32mx7mmb/scripts/pinguino-debug.ld
index 86d396b..a457905 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/scripts/pinguino-debug.ld
+++ b/boards/mips/pic32mx/pic32mx7mmb/scripts/pinguino-debug.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 128K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/sure-pic32mx/scripts/c32-release.ld b/boards/mips/pic32mx/sure-pic32mx/scripts/c32-release.ld
index 5670e4e..8947f19 100644
--- a/boards/mips/pic32mx/sure-pic32mx/scripts/c32-release.ld
+++ b/boards/mips/pic32mx/sure-pic32mx/scripts/c32-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/sure-pic32mx/scripts/mips-release.ld b/boards/mips/pic32mx/sure-pic32mx/scripts/mips-release.ld
index 2d0cf0f..9ef11a4 100644
--- a/boards/mips/pic32mx/sure-pic32mx/scripts/mips-release.ld
+++ b/boards/mips/pic32mx/sure-pic32mx/scripts/mips-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/sure-pic32mx/scripts/pinguino-debug.ld b/boards/mips/pic32mx/sure-pic32mx/scripts/pinguino-debug.ld
index 2d0cf0f..9ef11a4 100644
--- a/boards/mips/pic32mx/sure-pic32mx/scripts/pinguino-debug.ld
+++ b/boards/mips/pic32mx/sure-pic32mx/scripts/pinguino-debug.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/ubw32/scripts/c32-release.ld b/boards/mips/pic32mx/ubw32/scripts/c32-release.ld
index c73c9ff..0050c5e 100644
--- a/boards/mips/pic32mx/ubw32/scripts/c32-release.ld
+++ b/boards/mips/pic32mx/ubw32/scripts/c32-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/ubw32/scripts/mips-release.ld b/boards/mips/pic32mx/ubw32/scripts/mips-release.ld
index d7821b0..6377698 100644
--- a/boards/mips/pic32mx/ubw32/scripts/mips-release.ld
+++ b/boards/mips/pic32mx/ubw32/scripts/mips-release.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mx/ubw32/scripts/pinguino-debug.ld b/boards/mips/pic32mx/ubw32/scripts/pinguino-debug.ld
index d7821b0..6377698 100644
--- a/boards/mips/pic32mx/ubw32/scripts/pinguino-debug.ld
+++ b/boards/mips/pic32mx/ubw32/scripts/pinguino-debug.ld
@@ -90,6 +90,8 @@ MEMORY
kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/c32-debug.ld b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/c32-debug.ld
index b616c46..5b4e650 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/c32-debug.ld
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/c32-debug.ld
@@ -104,6 +104,8 @@ MEMORY
kseg1_datamem (rw!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mz)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/mips-debug.ld b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/mips-debug.ld
index 21771a9..1e6b704 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/mips-debug.ld
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/mips-debug.ld
@@ -104,6 +104,8 @@ MEMORY
kseg1_datamem (rw!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/pinguino-debug.ld b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/pinguino-debug.ld
index 21771a9..9dd2bc8 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/pinguino-debug.ld
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/pinguino-debug.ld
@@ -104,6 +104,8 @@ MEMORY
kseg1_datamem (rw!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/xc32-debug.ld b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/xc32-debug.ld
index 10e556f..4809b36 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/xc32-debug.ld
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/xc32-debug.ld
@@ -104,6 +104,8 @@ MEMORY
kseg1_data_mem (rw!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/scripts/c32-debug.ld b/boards/mips/pic32mz/pic32mz-starterkit/scripts/c32-debug.ld
index 5034cb8..0c4dca9 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/scripts/c32-debug.ld
+++ b/boards/mips/pic32mz/pic32mz-starterkit/scripts/c32-debug.ld
@@ -104,6 +104,8 @@ MEMORY
kseg1_datamem (rw!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mz)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/scripts/mips-debug.ld b/boards/mips/pic32mz/pic32mz-starterkit/scripts/mips-debug.ld
index 23c9c0e..619bb73 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/scripts/mips-debug.ld
+++ b/boards/mips/pic32mz/pic32mz-starterkit/scripts/mips-debug.ld
@@ -104,6 +104,8 @@ MEMORY
kseg1_datamem (rw!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/scripts/pinguino-debug.ld b/boards/mips/pic32mz/pic32mz-starterkit/scripts/pinguino-debug.ld
index 23c9c0e..1be9eba 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/scripts/pinguino-debug.ld
+++ b/boards/mips/pic32mz/pic32mz-starterkit/scripts/pinguino-debug.ld
@@ -104,6 +104,8 @@ MEMORY
kseg1_datamem (rw!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
}
+OUTPUT_FORMAT("elf32-littlemips")
+OUTPUT_ARCH(mips)
ENTRY(__start)
SECTIONS
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/scripts/xc32-debug.ld b/boards/mips/pic32mz/pic32mz-starterkit/scripts/xc32-debug.ld
index 0eec48b..1b39818 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/scripts/xc32-debug.ld
+++ b/boards/mips/pic32mz/pic32mz-starterkit/scripts/xc32-debug.ld
@@ -104,6 +104,8 @@ MEMORY
kseg1_data_mem (rw!x) : ORIGIN = 0xa0000200, LENGTH = 512K - 640
}
+OUTPUT_FORMAT("elf32-tradlittlemips")
+OUTPUT_ARCH(pic32mx)
ENTRY(__start)
SECTIONS