Fri Jul 24 21:27:03 2015 UTC ()
Remove unofficial AVR32


(matt)
diff -r1.147 -r1.148 src/sys/sys/exec_elf.h
cvs diff -r1.147 -r1.148 src/sys/sys/exec_elf.h (expand / switch to unified diff)

--- src/sys/sys/exec_elf.h 2015/07/24 21:09:25 1.147
+++ src/sys/sys/exec_elf.h 2015/07/24 21:27:03 1.148
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: exec_elf.h,v 1.147 2015/07/24 21:09:25 matt Exp $ */ 1/* $NetBSD: exec_elf.h,v 1.148 2015/07/24 21:27:03 matt Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1994 The NetBSD Foundation, Inc. 4 * Copyright (c) 1994 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Christos Zoulas. 8 * by Christos Zoulas.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -306,27 +306,26 @@ typedef struct { @@ -306,27 +306,26 @@ typedef struct {
306#define EM_ARCA 109 /* Arca RISC microprocessor */ 306#define EM_ARCA 109 /* Arca RISC microprocessor */
307#define EM_UNICORE 110 /* UNICORE from PKU-Unity Ltd. and MPRC Peking University */ 307#define EM_UNICORE 110 /* UNICORE from PKU-Unity Ltd. and MPRC Peking University */
308#define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */ 308#define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */
309#define EM_AARCH64 183 /* AArch64 64-bit ARM microprocessor */ 309#define EM_AARCH64 183 /* AArch64 64-bit ARM microprocessor */
310#define EM_AVR32 185 /* Atmel Corporation 32-bit microprocessor family*/ 310#define EM_AVR32 185 /* Atmel Corporation 32-bit microprocessor family*/
311#define EM_TILE64 187 /* Tilera TILE64 multicore architecture family */ 311#define EM_TILE64 187 /* Tilera TILE64 multicore architecture family */
312#define EM_TILEPRO 188 /* Tilera TILEPro multicore architecture family */ 312#define EM_TILEPRO 188 /* Tilera TILEPro multicore architecture family */
313#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze 32-bit RISC soft processor core */ 313#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze 32-bit RISC soft processor core */
314#define EM_TILEGX 192 /* Tilera TILE-GX multicore architecture family */ 314#define EM_TILEGX 192 /* Tilera TILE-GX multicore architecture family */
315#define EM_Z80 220 /* Zilog Z80 */ 315#define EM_Z80 220 /* Zilog Z80 */
316#define EM_RISCV 243 /* RISC-V */ 316#define EM_RISCV 243 /* RISC-V */
317 317
318/* Unofficial machine types follow */ 318/* Unofficial machine types follow */
319#define EM_AVR32 6317 /* used by NetBSD/avr32 */ 
320#define EM_ALPHA_EXP 36902 /* used by NetBSD/alpha; obsolete */ 319#define EM_ALPHA_EXP 36902 /* used by NetBSD/alpha; obsolete */
321#define EM_NUM 36903 320#define EM_NUM 36903
322 321
323/* 322/*
324 * Program Header 323 * Program Header
325 */ 324 */
326typedef struct { 325typedef struct {
327 Elf32_Word p_type; /* entry type */ 326 Elf32_Word p_type; /* entry type */
328 Elf32_Off p_offset; /* offset */ 327 Elf32_Off p_offset; /* offset */
329 Elf32_Addr p_vaddr; /* virtual address */ 328 Elf32_Addr p_vaddr; /* virtual address */
330 Elf32_Addr p_paddr; /* physical address */ 329 Elf32_Addr p_paddr; /* physical address */
331 Elf32_Word p_filesz; /* file size */ 330 Elf32_Word p_filesz; /* file size */
332 Elf32_Word p_memsz; /* memory size */ 331 Elf32_Word p_memsz; /* memory size */