X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fpe-arm.c;h=2d1b7ead1f796daa4ad7b4a8a9f56998c0d9947a;hb=a8eab7c6d529ddd248ff5243bb22e9346196e376;hp=8b5d1c7e1015e0d50ab86051f1ef2b09f4017b56;hpb=b34976b65aea8f33690229600bbf4527ec3118e1;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/pe-arm.c b/bfd/pe-arm.c
index 8b5d1c7e10..2d1b7ead1f 100644
--- a/bfd/pe-arm.c
+++ b/bfd/pe-arm.c
@@ -1,47 +1,67 @@
 /* BFD back-end for ARM PECOFF files.
-   Copyright 1995, 1996, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-#include "bfd.h"
-#include "sysdep.h"
 
-#ifndef TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM    armpe_little_vec
-#define TARGET_LITTLE_NAME   "pe-arm-little"
-#define TARGET_BIG_SYM       armpe_big_vec
-#define TARGET_BIG_NAME      "pe-arm-big"
-#endif
-
-#define COFF_WITH_PE
-#define PCRELOFFSET          TRUE
-#define COFF_LONG_SECTION_NAMES
+/* Do this before including bfd.h, so we prototype the right functions.  */
 
 #ifndef bfd_arm_allocate_interworking_sections
 #define bfd_arm_allocate_interworking_sections \
-	bfd_arm_pe_allocate_interworking_sections
+  bfd_armpe_allocate_interworking_sections
 #define bfd_arm_get_bfd_for_interworking \
-	bfd_arm_pe_get_bfd_for_interworking
+  bfd_armpe_get_bfd_for_interworking
 #define bfd_arm_process_before_allocation \
-	bfd_arm_pe_process_before_allocation
+  bfd_armpe_process_before_allocation
 #endif
 
-#ifdef ARM_WINCE
-#define TARGET_UNDERSCORE 0
+#include "sysdep.h"
+#include "bfd.h"
+
+#ifndef TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM    arm_pe_le_vec
+#define TARGET_LITTLE_NAME   "pe-arm-little"
+#define TARGET_BIG_SYM	     arm_pe_be_vec
+#define TARGET_BIG_NAME	     "pe-arm-big"
 #endif
 
+#define COFF_WITH_PE
+#define PCRELOFFSET	     TRUE
+#define COFF_LONG_SECTION_NAMES
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".bss"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".data"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".rdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".text"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".zdebug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
 #include "coff-arm.c"