From a6bc7b5de68815c7f158346e97df35cf0c2d5565 Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Sun, 24 Sep 2017 02:21:10 +0200 Subject: [PATCH] elf2flt is no longer the right name --- Elf2Mac/Elf2Mac.cc | 9 --------- gcc/gcc/config/m68k/m68k.h | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Elf2Mac/Elf2Mac.cc b/Elf2Mac/Elf2Mac.cc index 313ecc62f7..30106b889a 100644 --- a/Elf2Mac/Elf2Mac.cc +++ b/Elf2Mac/Elf2Mac.cc @@ -218,7 +218,6 @@ int main(int argc, char *argv[]) if(boost::algorithm::ends_with(argv[0], "ld")) { string outputFile = "a.out"; - bool elf2flt = false; bool elf2mac = false; vector args2; @@ -235,10 +234,6 @@ int main(int argc, char *argv[]) { outputFile = (*p).substr(2); } - else if(*p == "-elf2flt") - { - elf2flt = true; - } else if(*p == "-elf2mac") { elf2mac = true; @@ -250,10 +245,6 @@ int main(int argc, char *argv[]) } if(elf2mac) - { - errx(EXIT_FAILURE, "-elf2mac: not yet implemented"); - } - else if(elf2flt) { char tmpfile[] = "/tmp/ldscriptXXXXXX"; int fd = mkstemp(tmpfile); diff --git a/gcc/gcc/config/m68k/m68k.h b/gcc/gcc/config/m68k/m68k.h index 997b04e3ee..f8e72b2d87 100644 --- a/gcc/gcc/config/m68k/m68k.h +++ b/gcc/gcc/config/m68k/m68k.h @@ -55,7 +55,7 @@ along with GCC; see the file COPYING3. If not see #define SUBTARGET_EXTRA_SPECS #define LIBGCC_SPEC "-lretrocrt -lgcc" -#define LINK_SPEC "-elf2flt -q -undefined=_consolewrite" +#define LINK_SPEC "-elf2mac -q -undefined=_consolewrite" /* Note that some other tm.h files include this one and then override many of the definitions that relate to assembler syntax. */