[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2443: clean up a redefine vs. certain versions of elf.h (bug 4183)
Mats Wichmann
mats at linuxfoundation.org
Tue Dec 6 16:04:18 UTC 2016
------------------------------------------------------------
revno: 2443
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Tue 2016-12-06 09:04:18 -0700
message:
clean up a redefine vs. certain versions of elf.h (bug 4183)
modified:
elfchk/elf_values.h
elfchk/hdr.c
package/Makefile
-------------- next part --------------
=== modified file 'elfchk/elf_values.h'
--- a/elfchk/elf_values.h 2010-05-17 06:14:22 +0000
+++ b/elfchk/elf_values.h 2016-12-06 16:04:18 +0000
@@ -4,79 +4,36 @@
* Define the values here instead of including elf.h not to depend
* on the system where elfchk is built, since elf.h evolves and
* can be different in different systems.
+ *
+ * Note: somewhere along the line, <elf.h> is getting included
+ * anyway. There doesn't seem a lot of reason to keep this file,
+ * but for know we've hacked it down to a multiple-define proof
+ * subset to get rid of problems that cropped up in 2016 (bug 4183)
*/
-#define EM_NONE 0 /* No machine */
-#define EM_M32 1 /* AT&T WE 32100 */
-#define EM_SPARC 2 /* SUN SPARC */
-#define EM_386 3 /* Intel 80386 */
-#define EM_68K 4 /* Motorola m68k family */
-#define EM_88K 5 /* Motorola m88k family */
-#define EM_860 7 /* Intel 80860 */
-#define EM_MIPS 8 /* MIPS R3000 big-endian */
-#define EM_S370 9 /* IBM System/370 */
-#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */
-#define EM_PARISC 15 /* HPPA */
-#define EM_VPP500 17 /* Fujitsu VPP500 */
-#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */
-#define EM_960 19 /* Intel 80960 */
-#define EM_PPC 20 /* PowerPC */
-#define EM_PPC64 21 /* PowerPC 64-bit */
-#define EM_S390 22 /* IBM S390 */
-#define EM_V800 36 /* NEC V800 series */
-#define EM_FR20 37 /* Fujitsu FR20 */
-#define EM_RH32 38 /* TRW RH-32 */
-#define EM_RCE 39 /* Motorola RCE */
-#define EM_ARM 40 /* ARM */
-#define EM_FAKE_ALPHA 41 /* Digital Alpha */
-#define EM_SH 42 /* Hitachi SH */
-#define EM_SPARCV9 43 /* SPARC v9 64-bit */
-#define EM_TRICORE 44 /* Siemens Tricore */
-#define EM_ARC 45 /* Argonaut RISC Core */
-#define EM_H8_300 46 /* Hitachi H8/300 */
-#define EM_H8_300H 47 /* Hitachi H8/300H */
-#define EM_H8S 48 /* Hitachi H8S */
-#define EM_H8_500 49 /* Hitachi H8/500 */
-#define EM_IA_64 50 /* Intel Merced */
-#define EM_MIPS_X 51 /* Stanford MIPS-X */
-#define EM_COLDFIRE 52 /* Motorola Coldfire */
-#define EM_68HC12 53 /* Motorola M68HC12 */
-#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/
-#define EM_PCP 55 /* Siemens PCP */
-#define EM_NCPU 56 /* Sony nCPU embeeded RISC */
-#define EM_NDR1 57 /* Denso NDR1 microprocessor */
-#define EM_STARCORE 58 /* Motorola Start*Core processor */
-#define EM_ME16 59 /* Toyota ME16 processor */
-#define EM_ST100 60 /* STMicroelectronic ST100 processor */
-#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/
-#define EM_X86_64 62 /* AMD x86-64 architecture */
-#define EM_PDSP 63 /* Sony DSP Processor */
-#define EM_FX66 66 /* Siemens FX66 microcontroller */
-#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */
-#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */
-#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */
-#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */
-#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */
-#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */
-#define EM_SVX 73 /* Silicon Graphics SVx */
-#define EM_ST19 74 /* STMicroelectronics ST19 8 bit mc */
-#define EM_VAX 75 /* Digital VAX */
-#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
-#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */
-#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */
-#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */
-#define EM_MMIX 80 /* Donald Knuth's educational 64-bit processor */
-#define EM_HUANY 81 /* Harvard University machine-independent object files */
-#define EM_PRISM 82 /* SiTera Prism */
-#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */
-#define EM_FR30 84 /* Fujitsu FR30 */
-#define EM_D10V 85 /* Mitsubishi D10V */
-#define EM_D30V 86 /* Mitsubishi D30V */
-#define EM_V850 87 /* NEC v850 */
-#define EM_M32R 88 /* Mitsubishi M32R */
-#define EM_MN10300 89 /* Matsushita MN10300 */
-#define EM_MN10200 90 /* Matsushita MN10200 */
-#define EM_PJ 91 /* picoJava */
-#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */
-#define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */
-#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */
-#define EM_ALPHA 0x9026 /* Alpha */
+
+#undef EM_NONE
+#define EM_NONE 0 /* No machine */
+
+#undef EM_386
+#define EM_386 3 /* Intel 80386 */
+
+#undef EM_PPC
+#define EM_PPC 20 /* PowerPC */
+
+#undef EM_PPC64
+#define EM_PPC64 21 /* PowerPC 64-bit */
+
+#undef EM_S390
+#define EM_S390 22 /* IBM S390 */
+
+#undef EM_ARM
+#define EM_ARM 40 /* ARM */
+
+#undef EM_IA_64
+#define EM_IA_64 50 /* Intel Merced */
+
+#undef EM_X86_64
+#define EM_X86_64 62 /* AMD x86-64 architecture */
+
+#undef EM_AARCH64
+#define EM_AARCH64 183 /* ARM AARCH64 */
=== modified file 'elfchk/hdr.c'
--- a/elfchk/hdr.c 2013-09-28 15:26:11 +0000
+++ b/elfchk/hdr.c 2016-12-06 16:04:18 +0000
@@ -284,82 +284,16 @@
switch (e_machine) {
case EM_NONE: return "EM_NONE (No machine)";
- case EM_M32: return "EM_M32 (AT&T WE 32100)";
- case EM_SPARC: return "EM_SPARC (SUN SPARC)";
case EM_386: return "EM_386 (Intel 80386)";
- case EM_68K: return "EM_68K (Motorola m68k family)";
- case EM_88K: return "EM_88K (Motorola m88k family)";
- case EM_860: return "EM_860 (Intel 80860)";
- case EM_MIPS: return "EM_MIPS (MIPS R3000 big-endian)";
- case EM_S370: return "EM_S370 (IBM System/370)";
- case EM_MIPS_RS3_LE: return "EM_MIPS_RS3_LE (MIPS R3000 little-endian)";
- case EM_PARISC: return "EM_PARISC (HPPA)";
- case EM_VPP500: return "EM_VPP500 (Fujitsu VPP500)";
- case EM_SPARC32PLUS: return "EM_SPARC32PLUS (Sun's v8plus)";
- case EM_960: return "EM_960 (Intel 80960)";
case EM_PPC: return "EM_PPC (PowerPC)";
case EM_PPC64: return "EM_PPC64 (PowerPC 64-bit)";
case EM_S390: return "EM_S390 (IBM S390)";
- case EM_V800: return "EM_V800 (NEC V800 series)";
- case EM_FR20: return "EM_FR20 (Fujitsu FR20)";
- case EM_RH32: return "EM_RH32 (TRW RH-32)";
- case EM_RCE: return "EM_RCE (Motorola RCE)";
case EM_ARM: return "EM_ARM (ARM)";
- case EM_FAKE_ALPHA: return "EM_FAKE_ALPHA (Digital Alpha)";
- case EM_SH: return "EM_SH (Hitachi SH)";
- case EM_SPARCV9: return "EM_SPARCV9 (SPARC v9 64-bit)";
- case EM_TRICORE: return "EM_TRICORE (Siemens Tricore)";
- case EM_ARC: return "EM_ARC (Argonaut RISC Core)";
- case EM_H8_300: return "EM_H8_300 (Hitachi H8/300)";
- case EM_H8_300H: return "EM_H8_300H (Hitachi H8/300H)";
- case EM_H8S: return "EM_H8S (Hitachi H8S)";
- case EM_H8_500: return "EM_H8_500 (Hitachi H8/500)";
case EM_IA_64: return "EM_IA_64 (Intel Merced)";
- case EM_MIPS_X: return "EM_MIPS_X (Stanford MIPS-X)";
- case EM_COLDFIRE: return "EM_COLDFIRE (Motorola Coldfire)";
- case EM_68HC12: return "EM_68HC12 (Motorola M68HC12)";
- case EM_MMA: return "EM_MMA (Fujitsu MMA Multimedia Accelerator)";
- case EM_PCP: return "EM_PCP (Siemens PCP)";
- case EM_NCPU: return "EM_NCPU (Sony nCPU embeeded RISC)";
- case EM_NDR1: return "EM_NDR1 (Denso NDR1 microprocessor)";
- case EM_STARCORE: return "EM_STARCORE (Motorola Start*Core processor)";
- case EM_ME16: return "EM_ME16 (Toyota ME16 processor)";
- case EM_ST100: return "EM_ST100 (STMicroelectronic ST100 processor)";
- case EM_TINYJ: return "EM_TINYJ (Advanced Logic Corp. Tinyj emb.fam)";
case EM_X86_64: return "EM_X86_64 (AMD x86-64 architecture)";
- case EM_PDSP: return "EM_PDSP (Sony DSP Processor)";
- case EM_FX66: return "EM_FX66 (Siemens FX66 microcontroller)";
- case EM_ST9PLUS: return "EM_ST9PLUS (STMicroelectronics ST9+ 8/16 mc)";
- case EM_ST7: return "EM_ST7 (STmicroelectronics ST7 8 bit mc)";
- case EM_68HC16: return "EM_68HC16 (Motorola MC68HC16 microcontroller)";
- case EM_68HC11: return "EM_68HC11 (Motorola MC68HC11 microcontroller)";
- case EM_68HC08: return "EM_68HC08 (Motorola MC68HC08 microcontroller)";
- case EM_68HC05: return "EM_68HC05 (Motorola MC68HC05 microcontroller)";
- case EM_SVX: return "EM_SVX (Silicon Graphics SVx)";
- case EM_ST19: return "EM_ST19 (STMicroelectronics ST19 8 bit mc)";
- case EM_VAX: return "EM_VAX (Digital VAX)";
- case EM_CRIS: return "EM_CRIS (Axis Communications 32-bit embedded processor)";
- case EM_JAVELIN: return "EM_JAVELIN (Infineon Technologies 32-bit embedded processor)";
- case EM_FIREPATH: return "EM_FIREPATH (Element 14 64-bit DSP Processor)";
- case EM_ZSP: return "EM_ZSP (LSI Logic 16-bit DSP Processor)";
- case EM_MMIX: return "EM_MMIX (Donald Knuth's educational 64-bit processor)";
- case EM_HUANY: return "EM_HUANY (Harvard University machine-independent object files)";
- case EM_PRISM: return "EM_PRISM (SiTera Prism)";
- case EM_AVR: return "EM_AVR (Atmel AVR 8-bit microcontroller)";
- case EM_FR30: return "EM_FR30 (Fujitsu FR30)";
- case EM_D10V: return "EM_D10V (Mitsubishi D10V)";
- case EM_D30V: return "EM_D30V (Mitsubishi D30V)";
- case EM_V850: return "EM_V850 (NEC v850)";
- case EM_M32R: return "EM_M32R (Mitsubishi M32R)";
- case EM_MN10300: return "EM_MN10300 (Matsushita MN10300)";
- case EM_MN10200: return "EM_MN10200 (Matsushita MN10200)";
- case EM_PJ: return "EM_PJ (picoJava)";
- case EM_OPENRISC: return "EM_OPENRISC (OpenRISC 32-bit embedded processor)";
- case EM_ARC_A5: return "EM_ARC_A5 (ARC Cores Tangent-A5)";
- case EM_XTENSA: return "EM_XTENSA (Tensilica Xtensa Architecture)";
- case EM_ALPHA: return "EM_ALPHA (Alpha)";
+ case EM_AARCH64: return "EM_AARCH64 (ARM AARCH64)";
default:
- snprintf(buff, sizeof (buff), "<unknown>: 0x%x", e_machine);
+ snprintf(buff, sizeof (buff), "<unknown/non-LSB>: 0x%x", e_machine);
return buff;
}
}
=== modified file 'package/Makefile'
--- a/package/Makefile 2015-04-03 15:33:23 +0000
+++ b/package/Makefile 2016-12-06 16:04:18 +0000
@@ -20,7 +20,7 @@
# Release number of package relative to specification version
# Should have leading "."
# a big number (80-99) is leading up to the next minor spec
-SUB_VERSION=.3
+SUB_VERSION=.4
# We define this here instead of directly in the spec file as
# we need to be able to work out what the produced rpm files will be called
More information about the lsb-messages
mailing list