From 2f2da8fd3ff3c04928621bcbc0c01b9f9ebce7cc Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Mon, 4 Jan 2016 23:35:03 +0000 Subject: [PATCH] MIPS/LD: Convert ELF linker emulation option macros to an enum ld/ * emultempl/mipself.em (PARSE_AND_LIST_PROLOGUE): Convert OPTION_INSN32 and OPTION_NO_INSN32 macros to an enum. --- ld/ChangeLog | 5 +++++ ld/emultempl/mipself.em | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 8a062e1f97c..3aa46ed88e0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2016-01-04 Maciej W. Rozycki + + * emultempl/mipself.em (PARSE_AND_LIST_PROLOGUE): Convert + OPTION_INSN32 and OPTION_NO_INSN32 macros to an enum. + 2016-01-04 Maciej W. Rozycki * testsuite/ld-mips-elf/attr-gnu-4-14.d: Update the order of diff --git a/ld/emultempl/mipself.em b/ld/emultempl/mipself.em index 1b79aaf2231..dbff36bb8d1 100644 --- a/ld/emultempl/mipself.em +++ b/ld/emultempl/mipself.em @@ -250,8 +250,11 @@ EOF # parse_args and list_options functions. # PARSE_AND_LIST_PROLOGUE=' -#define OPTION_INSN32 301 -#define OPTION_NO_INSN32 (OPTION_INSN32 + 1) +enum + { + OPTION_INSN32 = 301, + OPTION_NO_INSN32 + }; ' PARSE_AND_LIST_LONGOPTS=' -- 2.30.2