From 2d2a84288c5f4711a259c219efe5d628f58428f6 Mon Sep 17 00:00:00 2001 From: kan Date: Wed, 28 Jul 2004 04:31:47 +0000 Subject: Update for GCC 3.4.2. Bump __FreeBSD_cc_version_ and use correct ELF interpreter on FreeBSD 5.x series. --- contrib/gcc/config/freebsd-spec.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc/config/freebsd-spec.h b/contrib/gcc/config/freebsd-spec.h index 2599176..38ea430 100644 --- a/contrib/gcc/config/freebsd-spec.h +++ b/contrib/gcc/config/freebsd-spec.h @@ -1,20 +1,20 @@ /* Base configuration file for all FreeBSD targets. Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to +along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -64,7 +64,6 @@ Boston, MA 02111-1307, USA. */ else \ builtin_define ("__FreeBSD__"); \ builtin_define_std ("unix"); \ - builtin_define ("__ELF__"); \ builtin_define ("__KPRINTF_ATTRIBUTE__"); \ builtin_assert ("system=unix"); \ builtin_assert ("system=bsd"); \ @@ -80,7 +79,7 @@ Boston, MA 02111-1307, USA. */ #ifdef FREEBSD_NATIVE #define FBSD_NATIVE_TARGET_OS_CPP_BUILTINS() \ do { \ - builtin_define_std ("__FreeBSD_cc_version=510002"); \ + builtin_define_std ("__FreeBSD_cc_version=520001"); \ } while (0) #else #define FBSD_NATIVE_TARGET_OS_CPP_BUILTINS() \ @@ -97,7 +96,7 @@ Boston, MA 02111-1307, USA. */ #define FBSD_CPP_SPEC " \ %(cpp_cpu) \ - %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ + %{fPIC|fpic|fPIE|fpie:-D__PIC__ -D__pic__} \ %{!ansi:%{!std=c89:%{!std=iso9899.1990:%{!std=iso9899.199409:-D_LONGLONG}}}} \ %{posix:-D_POSIX_SOURCE}" @@ -173,3 +172,9 @@ is built with the --enable-threads configure-time option.} \ }" #endif #endif + +#if FBSD_MAJOR < 5 +#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1" +#else +#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1" +#endif -- cgit v1.1