[ARM] Fix NULL dereference of march_ext_opt

[deliverable/binutils-gdb.git] / gas / config / tc-s390.h

diff --git a/gas/config/tc-s390.h b/gas/config/tc-s390.h
index 163640005dff19c3e985218fc163f3a943a3fce3..ddede39a728f998cc1572fd03221b5af1220697d 100644 (file)
--- a/gas/config/tc-s390.h
+++ b/gas/config/tc-s390.h
@@ -1,6 +1,5 @@
 /* tc-s390.h -- Header file for tc-s390.c.
-   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2018 Free Software Foundation, Inc.
    Written by Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of GAS, the GNU Assembler.
@@ -29,7 +28,8 @@ extern int tc_s390_force_relocation (struct fix *);
 
 /* Don't resolve foo@PLT-bar to offset@PLT.  */
 #define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEG) \
-  (! SEG_NORMAL (SEG) || TC_FORCE_RELOCATION (FIX))
+  (GENERIC_FORCE_RELOCATION_SUB_SAME (FIX, SEG)        \
+   || TC_FORCE_RELOCATION (FIX))
 
 #define tc_fix_adjustable(X)  tc_s390_fix_adjustable(X)
 extern int tc_s390_fix_adjustable (struct fix *);
@@ -95,3 +95,7 @@ extern int s390_cie_data_alignment;
 #define DWARF2_LINE_MIN_INSN_LENGTH     1
 #define DWARF2_DEFAULT_RETURN_COLUMN    14
 #define DWARF2_CIE_DATA_ALIGNMENT       s390_cie_data_alignment
+
+extern void s390_elf_final_processing (void);
+
+#define elf_tc_final_processing s390_elf_final_processing