Skip to content

Commit 9e1be51

Browse files
committed
Add ELF machine IDs for AVR32, MicroBlaze and V800
1 parent abe036e commit 9e1be51

File tree

3 files changed

+34
-1
lines changed

3 files changed

+34
-1
lines changed

core/org.eclipse.cdt.core/.settings/.api_filters

+20
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,24 @@
2222
</message_arguments>
2323
</filter>
2424
</resource>
25+
<resource path="utils/org/eclipse/cdt/utils/elf/Elf.java" type="org.eclipse.cdt.utils.elf.Elf$ELFhdr">
26+
<filter id="336658481">
27+
<message_arguments>
28+
<message_argument value="org.eclipse.cdt.utils.elf.Elf.ELFhdr"/>
29+
<message_argument value="EM_AVR32"/>
30+
</message_arguments>
31+
</filter>
32+
<filter id="336658481">
33+
<message_arguments>
34+
<message_argument value="org.eclipse.cdt.utils.elf.Elf.ELFhdr"/>
35+
<message_argument value="EM_MICROBLAZE"/>
36+
</message_arguments>
37+
</filter>
38+
<filter id="336658481">
39+
<message_arguments>
40+
<message_argument value="org.eclipse.cdt.utils.elf.Elf.ELFhdr"/>
41+
<message_argument value="EM_V800"/>
42+
</message_arguments>
43+
</filter>
44+
</resource>
2545
</component>

core/org.eclipse.cdt.core/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
5-
Bundle-Version: 8.4.300.qualifier
5+
Bundle-Version: 8.5.0.qualifier
66
Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java

+13
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ public class ELFhdr {
114114
public static final int EM_SPARC32PLUS = 18;
115115
public static final int EM_PPC = 20;
116116
public static final int EM_PPC64 = 21;
117+
/** @since 8.5*/
118+
public static final int EM_V800 = 36;
117119
public static final int EM_ARM = 40;
118120
public static final int EM_SH = 42;
119121
public static final int EM_SPARCV9 = 43;
@@ -157,6 +159,10 @@ public class ELFhdr {
157159
public static final int EM_RL78 = 197; /* Renesas RL78 Microcontroller */
158160
/** @since 6.0 */
159161
public static final int EM_AARCH64 = 183;
162+
/** @since 8.5 */
163+
public static final int EM_AVR32 = 185;
164+
/** @since 8.5 */
165+
public static final int EM_MICROBLAZE = 189;
160166

161167
/** @since 7.0 */
162168
public static final int EM_RISCV = 243;
@@ -824,6 +830,9 @@ public Attribute getAttributes() throws IOException {
824830
case Elf.ELFhdr.EM_H8_300H:
825831
attrib.cpu = "h8300"; //$NON-NLS-1$
826832
break;
833+
case Elf.ELFhdr.EM_V800:
834+
attrib.cpu = "v800"; //$NON-NLS-1$
835+
break;
827836
case Elf.ELFhdr.EM_V850:
828837
case Elf.ELFhdr.EM_CYGNUS_V850:
829838
attrib.cpu = "v850"; //$NON-NLS-1$
@@ -870,6 +879,9 @@ public Attribute getAttributes() throws IOException {
870879
case Elf.ELFhdr.EM_AVR:
871880
attrib.cpu = "avr"; //$NON-NLS-1$
872881
break;
882+
case Elf.ELFhdr.EM_AVR32:
883+
attrib.cpu = "avr32"; //$NON-NLS-1$
884+
break;
873885
case Elf.ELFhdr.EM_MSP430:
874886
attrib.cpu = "msp430"; //$NON-NLS-1$
875887
break;
@@ -882,6 +894,7 @@ public Attribute getAttributes() throws IOException {
882894
case Elf.ELFhdr.EM_X86_64:
883895
attrib.cpu = "x86_64"; //$NON-NLS-1$
884896
break;
897+
case Elf.ELFhdr.EM_MICROBLAZE:
885898
case Elf.ELFhdr.EM_XILINX_MICROBLAZE:
886899
attrib.cpu = "microblaze"; //$NON-NLS-1$
887900
break;

0 commit comments

Comments
 (0)