From 6fc9e67e61e085fea544f06b3406c8576255db70 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 1 Jun 2003 17:43:20 +0000 Subject: [PATCH] * config/m68k/linux.h: Remove code protected by USE_GNULIBC_1. From-SVN: r67304 --- gcc/ChangeLog | 4 ++++ gcc/config/m68k/linux.h | 28 ---------------------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1658cfc6269..b254385758c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2003-06-01 Andreas Schwab + + * config/m68k/linux.h: Remove code protected by USE_GNULIBC_1. + 2003-06-01 Andreas Jaeger * gen-protos.c (main): Revert patch to check for argument. diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h index b9b90826467..5b8bbd24886 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h @@ -119,15 +119,6 @@ Boston, MA 02111-1307, USA. */ while (0) #undef CPP_SPEC -#ifdef USE_GNULIBC_1 -#if TARGET_DEFAULT & MASK_68881 -#define CPP_SPEC \ - "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!msoft-float:-D__HAVE_68881__} %{posix:-D_POSIX_SOURCE}" -#else -#define CPP_SPEC \ - "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m68881:-D__HAVE_68881__} %{posix:-D_POSIX_SOURCE}" -#endif -#else #if TARGET_DEFAULT & MASK_68881 #define CPP_SPEC \ "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!msoft-float:-D__HAVE_68881__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" @@ -135,7 +126,6 @@ Boston, MA 02111-1307, USA. */ #define CPP_SPEC \ "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m68881:-D__HAVE_68881__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" #endif -#endif /* We override the ASM_SPEC from svr4.h because we must pass -m68040 down to the assembler. */ @@ -161,30 +151,12 @@ Boston, MA 02111-1307, USA. */ /* If ELF is the default format, we should not use /lib/elf. */ #undef LINK_SPEC -#ifdef USE_GNULIBC_1 -#ifndef LINUX_DEFAULT_ELF -#define LINK_SPEC "-m m68kelf %{shared} %{symbolic:-shared -Bsymbolic} \ - %{!shared:%{!symbolic: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker*:-dynamic-linker /lib/elf/ld-linux.so.1} \ - %{!rpath*:-rpath /lib/elf/}} %{static}}}" -#else -#define LINK_SPEC "-m m68kelf %{shared} %{symbolic:-shared -Bsymbolic} \ - %{!shared:%{!symbolic: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker*:-dynamic-linker /lib/ld-linux.so.1}} \ - %{static}}}" -#endif -#else #define LINK_SPEC "-m m68kelf %{shared} \ %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \ %{static}}" -#endif /* For compatibility with linux/a.out */