X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-nds32.h;h=81ff40f6c3131c24d57a431dc602538afeebd499;hb=87789e08e5cb2191af1122ed98af2d6c023b3a0a;hp=328d47fca3e611410512a4f4427edad33ae65605;hpb=b90efa5b79ac1524ec260f8eb89d1be37e0219a7;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/config/tc-nds32.h b/gas/config/tc-nds32.h
index 328d47fca3..81ff40f6c3 100644
--- a/gas/config/tc-nds32.h
+++ b/gas/config/tc-nds32.h
@@ -1,5 +1,5 @@
 /* tc-nds32.h -- Header file for tc-nds32.c.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 Free Software Foundation, Inc.
    Contributed by Andes Technology Corporation.
 
    This file is part of GAS.
@@ -44,7 +44,7 @@
 
 /* as.c.  */
 /* Extend GAS command line option handling capability.  */
-extern int nds32_parse_option (int, char *);
+extern int nds32_parse_option (int, const char *);
 extern void nds32_after_parse_args (void);
 /* The endianness of the target format may change based on command
    line arguments.  */
@@ -131,7 +131,8 @@ extern void nds32_do_align (int);
 #define md_macro_start()			nds32_macro_start ()
 #define md_macro_end()				nds32_macro_end ()
 #define md_macro_info(args)			nds32_macro_info (args)
-#define TC_START_LABEL(C, S, STR)		(C == ':' && nds32_start_label (0, 0))
+#define TC_START_LABEL(STR, NUL_CHAR, NEXT_CHAR)	\
+  (NEXT_CHAR == ':' && nds32_start_label (0, 0))
 #define tc_check_label(label)			nds32_check_label (label)
 #define tc_frob_label(label)			nds32_frob_label (label)
 #define md_end					md_end
@@ -151,10 +152,16 @@ extern void nds32_do_align (int);
 
 /* frags.c.  */
 
-#define NDS32_FRAG_RELAXABLE 0x1
-#define NDS32_FRAG_RELAXED 0x2
-#define NDS32_FRAG_BRANCH 0x4
-#define NDS32_FRAG_LABEL 0x8
+enum FRAG_ATTR
+{
+  NDS32_FRAG_RELAXABLE  = 0x1,
+  NDS32_FRAG_RELAXED = 0x2,
+  NDS32_FRAG_BRANCH = 0x4,
+  NDS32_FRAG_LABEL = 0x8,
+  NDS32_FRAG_FINAL = 0x10,
+  NDS32_FRAG_RELAXABLE_BRANCH = 0x20,
+  NDS32_FRAG_ALIGN = 0x40
+};
 
 struct nds32_frag_type
 {
@@ -222,7 +229,8 @@ enum nds32_ramp
   NDS32_HINT = (1 << 6),
   NDS32_FIX = (1 << 7),
   NDS32_ADDEND = (1 << 8),
-  NDS32_SYM = (1 << 9)
+  NDS32_SYM = (1 << 9),
+  NDS32_PCREL = (1 << 10)
 };
 
 typedef struct nds32_relax_fixup_info