From 0d53e69f9c6aa6972462ab7900e110c8846e99e4 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Wed, 28 Oct 2009 12:32:06 +0100 Subject: [PATCH] gcc44: adjust build infrastructure for gcc-4.4.2 --- gnu/lib/gcc44/libstdc++/Makefile | 18 +-- gnu/lib/gcc44/libstdc++/ctype_base.h.patch | 31 ----- .../gcc44/libstdc++/ctype_noninline.h.patch | 21 --- gnu/lib/gcc44/libstdc++/os_defines.h | 6 - gnu/usr.bin/cc44/Makefile.inc | 6 +- gnu/usr.bin/cc44/Makefile.tgt | 12 +- .../cc44/cc_prep/config/dragonfly-native.h | 15 +-- .../cc44/cc_prep/config/dragonfly-spec.h | 125 ----------------- gnu/usr.bin/cc44/cc_prep/config/dragonfly.h | 87 ------------ .../cc44/cc_prep/config/i386/dragonfly.h | 126 ------------------ .../cc44/cc_prep/config/i386/dragonfly64.h | 51 ------- 11 files changed, 14 insertions(+), 484 deletions(-) delete mode 100644 gnu/lib/gcc44/libstdc++/ctype_base.h.patch delete mode 100644 gnu/lib/gcc44/libstdc++/ctype_noninline.h.patch delete mode 100644 gnu/lib/gcc44/libstdc++/os_defines.h delete mode 100644 gnu/usr.bin/cc44/cc_prep/config/dragonfly-spec.h delete mode 100644 gnu/usr.bin/cc44/cc_prep/config/dragonfly.h delete mode 100644 gnu/usr.bin/cc44/cc_prep/config/i386/dragonfly.h delete mode 100644 gnu/usr.bin/cc44/cc_prep/config/i386/dragonfly64.h diff --git a/gnu/lib/gcc44/libstdc++/Makefile b/gnu/lib/gcc44/libstdc++/Makefile index e663908dec..87d91a9871 100644 --- a/gnu/lib/gcc44/libstdc++/Makefile +++ b/gnu/lib/gcc44/libstdc++/Makefile @@ -22,9 +22,7 @@ LIB= stdc++ SHLIB_MAJOR= 9 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H -CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${GCCDIR}/gcc -I${GCCDIR}/include -CXXFLAGS+= -I${SRCDIR}/config/cpu/${MARCHDIR} CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ -Wno-deprecated @@ -114,8 +112,6 @@ host_sources = \ host_sources_extra = \ basic_file_stdio.cc c_locale.cc -SRCS+= ctype_noninline.h ctype_base.h - atomicity.cc: echo '#include ' > ${.TARGET} @@ -529,9 +525,11 @@ TARGETHDRS+= locale/generic/messages_members.h TARGETHDRS+= locale/generic/time_members.h TARGETHDRS+= os/generic/error_constants.h -TARGETHDRS+= os/bsd/netbsd/ctype_inline.h +TARGETHDRS+= os/bsd/dragonfly/ctype_inline.h +TARGETHDRS+= os/bsd/dragonfly/ctype_base.h +TARGETHDRS+= os/bsd/dragonfly/ctype_noninline.h +TARGETHDRS+= os/bsd/dragonfly/os_defines.h TARGETHDRS:= ${TARGETHDRS:S;^;${SRCDIR}/config/;} -TARGETHDRS+= ctype_base.h ctype_noninline.h os_defines.h TARGETHDRS+= c++config.h TARGETHDRSDIR= ${HD}/bits @@ -575,12 +573,6 @@ gthr-default.h: ${GCCDIR}/gcc/gthr-posix.h -e 's,^#include "\(.*\)",#include ,g' \ < ${GCCDIR}/gcc/gthr-posix.h > gthr-default.h -ctype_base.h: ${SRCDIR}/config/os/bsd/netbsd/ctype_base.h ctype_base.h.patch - patch -o ${.TARGET} -i ${.CURDIR}/ctype_base.h.patch ${SRCDIR}/config/os/bsd/netbsd/ctype_base.h - -ctype_noninline.h: ${SRCDIR}/config/os/bsd/netbsd/ctype_noninline.h ctype_noninline.h.patch - patch -o ${.TARGET} -i ${.CURDIR}/ctype_noninline.h.patch ${SRCDIR}/config/os/bsd/netbsd/ctype_noninline.h - c++config.h: config.h ${SRCDIR}/include/bits/c++config DATESTAMP date=`cat ${.ALLSRC:M*DATESTAMP}` ; \ nsa_version=0 ;\ @@ -599,6 +591,6 @@ c++config.h: config.h ${SRCDIR}/include/bits/c++config DATESTAMP echo "" >> ${.TARGET} echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> ${.TARGET} -CLEANFILES+= ${THRHDRS} ctype_noninline.h ctype_base.h c++config.h +CLEANFILES+= ${THRHDRS} c++config.h .include diff --git a/gnu/lib/gcc44/libstdc++/ctype_base.h.patch b/gnu/lib/gcc44/libstdc++/ctype_base.h.patch deleted file mode 100644 index f9c6eb9a9e..0000000000 --- a/gnu/lib/gcc44/libstdc++/ctype_base.h.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- /usr/src/contrib/gcc-4.0/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h 2005-06-05 20:22:15.000000000 +0200 -+++ ctype_base.h 2005-09-17 17:30:55.000000000 +0200 -@@ -43,16 +43,16 @@ - - // NB: Offsets into ctype::_M_table force a particular size - // on the mask type. Because of this, we don't use an enum. -- typedef unsigned char mask; -- static const mask upper = _U; -- static const mask lower = _L; -- static const mask alpha = _U | _L; -- static const mask digit = _N; -- static const mask xdigit = _N | _X; -- static const mask space = _S; -- static const mask print = _P | _U | _L | _N | _B; -- static const mask graph = _P | _U | _L | _N; -- static const mask cntrl = _C; -- static const mask punct = _P; -- static const mask alnum = _U | _L | _N; -+ typedef uint16_t mask; -+ static const mask upper = _CTYPEMASK_U; -+ static const mask lower = _CTYPEMASK_L; -+ static const mask alpha = _CTYPEMASK_A; -+ static const mask digit = _CTYPEMASK_D; -+ static const mask xdigit = _CTYPEMASK_X; -+ static const mask space = _CTYPEMASK_S; -+ static const mask print = _CTYPEMASK_R; -+ static const mask graph = _CTYPEMASK_G; -+ static const mask cntrl = _CTYPEMASK_C; -+ static const mask punct = _CTYPEMASK_P; -+ static const mask alnum = _CTYPEMASK_A | _CTYPEMASK_D; - }; diff --git a/gnu/lib/gcc44/libstdc++/ctype_noninline.h.patch b/gnu/lib/gcc44/libstdc++/ctype_noninline.h.patch deleted file mode 100644 index bc5ae71d26..0000000000 --- a/gnu/lib/gcc44/libstdc++/ctype_noninline.h.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: ctype_noninline.h -=================================================================== -RCS file: /cvs/src/contrib/gcc-3.4/libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h,v -retrieving revision 1.3 -diff -u -r1.3 ctype_noninline.h ---- config/os/bsd/netbsd/ctype_noninline.h 2 Mar 2005 00:56:21 -0000 1.3 -+++ config/os/bsd/netbsd/ctype_noninline.h 7 Mar 2005 12:15:21 -0000 -@@ -33,11 +33,11 @@ - - // Information as gleaned from /usr/include/ctype.h - -- extern "C" const u_int8_t _C_ctype_[]; -+ extern "C" const __uint16_t __libc_C_ctype_[]; - - const ctype_base::mask* - ctype::classic_table() throw() -- { return _C_ctype_ + 1; } -+ { return __libc_C_ctype_ + 1; } - - ctype::ctype(__c_locale, const mask* __table, bool __del, - size_t __refs) diff --git a/gnu/lib/gcc44/libstdc++/os_defines.h b/gnu/lib/gcc44/libstdc++/os_defines.h deleted file mode 100644 index 5375432fcb..0000000000 --- a/gnu/lib/gcc44/libstdc++/os_defines.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _GLIBCXX_OS_DEFINES -#define _GLIBCXX_OS_DEFINES 1 - -#include - -#endif diff --git a/gnu/usr.bin/cc44/Makefile.inc b/gnu/usr.bin/cc44/Makefile.inc index c4d86d2280..5a02722de6 100644 --- a/gnu/usr.bin/cc44/Makefile.inc +++ b/gnu/usr.bin/cc44/Makefile.inc @@ -1,7 +1,7 @@ .if !target(____) ____: -GCCCOMPLETEVER= 4.4.1 +GCCCOMPLETEVER= 4.4.2 GCCPOINTVER= ${GCCCOMPLETEVER:R} GCCSHORTVER= ${GCCPOINTVER:S/.//} @@ -14,10 +14,6 @@ CFLAGS+= -DBASEVER=\"${GCCCOMPLETEVER}\" CFLAGS+= -DDEFAULT_TARGET_VERSION=\"${version}\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"${target_machine}\" -# XXX -CFLAGS+= -DDFBSD_MAJOR=2 -CFLAGS+= -DDFBSD_CC_VER=100001 - BINDIR?= /usr/libexec/gcc${GCCSHORTVER} .include "../Makefile.inc" diff --git a/gnu/usr.bin/cc44/Makefile.tgt b/gnu/usr.bin/cc44/Makefile.tgt index 42e49ae836..dac15ad3d1 100644 --- a/gnu/usr.bin/cc44/Makefile.tgt +++ b/gnu/usr.bin/cc44/Makefile.tgt @@ -41,16 +41,14 @@ TARGET_INC+= ${GCC_CPU}/att.h .endif TARGET_INC+= dbxelf.h TARGET_INC+= elfos.h -TARGET_INC+= dragonfly-native.h -TARGET_INC+= dragonfly-spec.h TARGET_INC+= dragonfly.h -.if ${TARGET_ARCH} == "amd64" -TARGET_INC+= ${GCC_CPU}/x86-64.h -.endif +.if ${TARGET_ARCH} == "i386" TARGET_INC+= ${GCC_CPU}/dragonfly.h -.if ${TARGET_ARCH} == "amd64" -TARGET_INC+= ${GCC_CPU}/dragonfly64.h +.elif ${TARGET_ARCH} == "amd64" +TARGET_INC+= ${GCC_CPU}/x86-64.h +TARGET_INC+= ${GCC_CPU}/dragonfly64.h .endif +TARGET_INC+= dragonfly-native.h TARGET_INC+= defaults.h # diff --git a/gnu/usr.bin/cc44/cc_prep/config/dragonfly-native.h b/gnu/usr.bin/cc44/cc_prep/config/dragonfly-native.h index bd2fd6215c..c35c87e42e 100644 --- a/gnu/usr.bin/cc44/cc_prep/config/dragonfly-native.h +++ b/gnu/usr.bin/cc44/cc_prep/config/dragonfly-native.h @@ -1,22 +1,13 @@ -#define DFBSD_NATIVE 1 - #ifndef PREFIX2 #define PREFIX2 PREFIX #endif -/* - * Only compilers in base define __DragonFly_cc_version. - * Do not use this in ports, etc. - */ -#define DFBSD_NATIVE_TARGET_OS_CPP_BUILTINS() \ - do { \ - builtin_define_with_int_value ("__DragonFly_cc_version", DFBSD_CC_VER); \ - } while (0) - #define LINK_LIBGCC_SPEC "" #define LIBGCC_SPEC "%{shared: -lgcc_pic} %{!shared: -lgcc}" -#define DFBSD_NATIVE_LINK_SPEC " \ +#undef LINK_SPEC +#define LINK_SPEC \ + DFBSD_LINK_SPEC " \ %{pg: -L"PREFIX2"/lib/gcc"GCCSHORTVER"/profile \ %{!static: -rpath /usr/lib/gcc"GCCSHORTVER"/profile \ -rpath-link "PREFIX2"/lib/gcc"GCCSHORTVER"/profile}} \ diff --git a/gnu/usr.bin/cc44/cc_prep/config/dragonfly-spec.h b/gnu/usr.bin/cc44/cc_prep/config/dragonfly-spec.h deleted file mode 100644 index 94761989c1..0000000000 --- a/gnu/usr.bin/cc44/cc_prep/config/dragonfly-spec.h +++ /dev/null @@ -1,125 +0,0 @@ -/* Base configuration file for all FreeBSD targets. - Copyright (C) 1999, 2000, 2001, 2004, 2005, 2007, 2009 Free Software Foundation, Inc. - -This file is part of GCC. - -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 3, or (at your option) -any later version. - -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. - -Under Section 7 of GPL version 3, you are granted additional -permissions described in the GCC Runtime Library Exception, version -3.1, as published by the Free Software Foundation. - -You should have received a copy of the GNU General Public License and -a copy of the GCC Runtime Library Exception along with this program; -see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -. */ - -/* Common DragonFly configuration. - All DragonFly architectures should include this file, which will specify - their commonalities. - - Adapted from gcc/config/freebsd-spec.h by - Joerg Sonnenberger - - Adapted from gcc/config/freebsd.h by - David O'Brien - Loren J. Rittle . */ - - -/* This defines which switch letters take arguments. On DragonFly, most of - the normal cases (defined in gcc.c) apply, and we also have -h* and - -z* options (for the linker) (coming from SVR4). - We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ - -#define DFBSD_SWITCH_TAKES_ARG(CHAR) \ - (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ - || (CHAR) == 'h' \ - || (CHAR) == 'z' /* ignored by ld */ \ - || (CHAR) == 'R') - -/* This defines which multi-letter switches take arguments. */ - -#define DFBSD_WORD_SWITCH_TAKES_ARG(STR) \ - (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) \ - || !strcmp ((STR), "rpath") || !strcmp ((STR), "rpath-link") \ - || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \ - || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker")) - -#define DFBSD_TARGET_OS_CPP_BUILTINS() \ - do \ - { \ - builtin_define_with_int_value ("__DragonFly__", DFBSD_MAJOR); \ - builtin_define_std ("unix"); \ - builtin_define ("__KPRINTF_ATTRIBUTE__"); \ - builtin_assert ("system=unix"); \ - builtin_assert ("system=bsd"); \ - builtin_assert ("system=DragonFly"); \ - DFBSD_NATIVE_TARGET_OS_CPP_BUILTINS(); \ - DFBSD_TARGET_CPU_CPP_BUILTINS(); \ - } \ - while (0) - -/* Define the default DragonFly-specific per-CPU hook code. */ -#define DFBSD_TARGET_CPU_CPP_BUILTINS() do {} while (0) - -#ifndef DFBSD_NATIVE_TARGET_OS_CPP_BUILTINS -#define DFBSD_NATIVE_TARGET_OS_CPP_BUILTINS() \ - do {} while (0) -#endif - -/* Provide a CPP_SPEC appropriate for DragonFly. We just deal with the GCC - option `-posix', and PIC issues. */ - -#define DFBSD_CPP_SPEC " \ - %(cpp_cpu) \ - %(cpp_arch) \ - %{posix:-D_POSIX_SOURCE}" - -/* Provide a STARTFILE_SPEC appropriate for DragonFly. Here we add - the magical crtbegin.o file (see crtstuff.c) which provides part - of the support for getting C++ file-scope static object constructed - before entering `main'. */ - -#define DFBSD_STARTFILE_SPEC \ - "%{!shared: \ - %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \ - %{!p:%{profile:gcrt1.o%s} \ - %{!profile:crt1.o%s}}}} \ - crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}" - -/* Provide a ENDFILE_SPEC appropriate for DragonFly. Here we tack on - the magical crtend.o file (see crtstuff.c) which provides part of - the support for getting C++ file-scope static object constructed - before entering `main', followed by a normal "finalizer" file, - `crtn.o'. */ - -#define DFBSD_ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" - -/* Provide a LIB_SPEC appropriate for DragonFly. - Just always link -lc and allow -pthread to be an alias for -lpthread - */ - -#define DFBSD_LIB_SPEC " \ - %{pthread:-lpthread} \ - -lc \ - " - -#define DFBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.2" - -#if defined(HAVE_LD_EH_FRAME_HDR) -#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " -#endif - -/* Use --as-needed -lgcc_s for eh support. */ -#ifdef HAVE_LD_AS_NEEDED -#define USE_LD_AS_NEEDED 1 -#endif diff --git a/gnu/usr.bin/cc44/cc_prep/config/dragonfly.h b/gnu/usr.bin/cc44/cc_prep/config/dragonfly.h deleted file mode 100644 index 38f5ec77f7..0000000000 --- a/gnu/usr.bin/cc44/cc_prep/config/dragonfly.h +++ /dev/null @@ -1,87 +0,0 @@ -/* Base configuration file for all DragonFly targets. - Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. - -This file is part of GCC. - -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 3, or (at your option) -any later version. - -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 GCC; see the file COPYING3. If not see -. */ - -/* Common DragonFly configuration. - All DragonFly architectures should include this file, which will specify - their commonalities. - - Adapted from gcc/config/freebsd.h by - Joerg Sonnenberger - - Adapted from gcc/config/i386/freebsd-elf.h by - David O'Brien . - Further work by David O'Brien and - Loren J. Rittle . */ - - -/* This defines which switch letters take arguments. On DragonFly, most of - the normal cases (defined in gcc.c) apply, and we also have -h* and - -z* options (for the linker) (coming from SVR4). - We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ - -#undef SWITCH_TAKES_ARG -#define SWITCH_TAKES_ARG(CHAR) (DFBSD_SWITCH_TAKES_ARG(CHAR)) - -#undef WORD_SWITCH_TAKES_ARG -#define WORD_SWITCH_TAKES_ARG(STR) (DFBSD_WORD_SWITCH_TAKES_ARG(STR)) - -#undef TARGET_OS_CPP_BUILTINS -#define TARGET_OS_CPP_BUILTINS() DFBSD_TARGET_OS_CPP_BUILTINS() - -#undef CPP_SPEC -#define CPP_SPEC DFBSD_CPP_SPEC - -#undef STARTFILE_SPEC -#define STARTFILE_SPEC DFBSD_STARTFILE_SPEC - -#undef ENDFILE_SPEC -#define ENDFILE_SPEC DFBSD_ENDFILE_SPEC - -#undef LIB_SPEC -#define LIB_SPEC DFBSD_LIB_SPEC - -/* Define this so we can compile MS code for use with WINE. */ -#define HANDLE_PRAGMA_PACK_PUSH_POP 1 - -/************************[ Target stuff ]***********************************/ - -/* All DragonFly Architectures support the ELF object file format. */ -#undef OBJECT_FORMAT_ELF -#define OBJECT_FORMAT_ELF - -/* Don't assume anything about the header files. */ -#undef NO_IMPLICIT_EXTERN_C -#define NO_IMPLICIT_EXTERN_C 1 - -/* Make gcc agree with DragonFly's standard headers (, etc...) */ - -#undef WCHAR_TYPE -#define WCHAR_TYPE "int" - -/* Code generation parameters. */ - -/* Use periods rather than dollar signs in special g++ assembler names. - This ensures the configuration knows our system correctly so we can link - with libraries compiled with the native cc. */ -#undef NO_DOLLAR_IN_LABEL - -/* Used by libgcc2.c. We support file locking with fcntl / F_SETLKW. - This enables the test coverage code to use file locking when exiting a - program, which avoids race conditions if the program has forked. */ -#define TARGET_POSIX_IO diff --git a/gnu/usr.bin/cc44/cc_prep/config/i386/dragonfly.h b/gnu/usr.bin/cc44/cc_prep/config/i386/dragonfly.h deleted file mode 100644 index 6586b67086..0000000000 --- a/gnu/usr.bin/cc44/cc_prep/config/i386/dragonfly.h +++ /dev/null @@ -1,126 +0,0 @@ -/* Definitions for Intel 386 running FreeBSD with ELF format - Copyright (C) 1996, 2000, 2002, 2004, 2007 Free Software Foundation, Inc. - Contributed by Eric Youngdale. - Modified for stabs-in-ELF by H.J. Lu. - Adapted from GNU/Linux version by John Polstra. - Continued development by David O'Brien - Adapted from the FreeBSD version. - - -This file is part of GCC. - -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 3, or (at your option) -any later version. - -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 GCC; see the file COPYING3. If not see -. */ - - -#define TARGET_VERSION fprintf (stderr, " (i386 DragonFly/ELF)"); - -/* Override the default comment-starter of "/". */ -#undef ASM_COMMENT_START -#define ASM_COMMENT_START "#" - -#undef ASM_APP_ON -#define ASM_APP_ON "#APP\n" - -#undef ASM_APP_OFF -#define ASM_APP_OFF "#NO_APP\n" - -#undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(n) \ - (TARGET_64BIT ? dbx64_register_map[n] : svr4_dbx_register_map[n]) - -#undef NO_PROFILE_COUNTERS -#define NO_PROFILE_COUNTERS 1 - -/* Tell final.c that we don't need a label passed to mcount. */ - -#undef MCOUNT_NAME -#define MCOUNT_NAME ".mcount" - -/* Make gcc agree with . */ - -#undef SIZE_TYPE -#define SIZE_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") - -#undef PTRDIFF_TYPE -#define PTRDIFF_TYPE (TARGET_64BIT ? "long int" : "int") - -#undef WCHAR_TYPE_SIZE -#define WCHAR_TYPE_SIZE (TARGET_64BIT ? 32 : BITS_PER_WORD) - -#undef SUBTARGET_EXTRA_SPECS /* i386.h bogusly defines it. */ -#define SUBTARGET_EXTRA_SPECS \ - { "dfbsd_dynamic_linker", DFBSD_DYNAMIC_LINKER } - -#undef STARTFILE_SPEC -#define STARTFILE_SPEC DFBSD_STARTFILE_SPEC - -#undef ENDFILE_SPEC -#define ENDFILE_SPEC DFBSD_ENDFILE_SPEC - -/* Provide a LINK_SPEC appropriate for DragonFly. Here we provide support - for the special GCC options -static and -shared, which allow us to - link things in one of these three modes by applying the appropriate - combinations of options at link-time. We like to support here for - as many of the other GNU linker options as possible. But I don't - have the time to search for those flags. I am sure how to add - support for -soname shared_object_name. H.J. - - I took out %{v:%{!V:-V}}. It is too much :-(. They can use - -Wl,-V. - - When the -shared link option is used a final link is not being - done. */ - -#undef LINK_SPEC -#define LINK_SPEC "\ - %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ - %{v:-V} \ - %{assert*} %{R*} %{rpath*} %{defsym*} \ - %{shared:-Bshareable %{h*} %{soname*}} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(dfbsd_dynamic_linker) }} \ - %{static:-Bstatic}} \ - %{symbolic:-Bsymbolic}" \ - DFBSD_NATIVE_LINK_SPEC - -/* A C statement to output to the stdio stream FILE an assembler - command to advance the location counter to a multiple of 1< and std::numeric_limits correct. */ -#undef TARGET_96_ROUND_53_LONG_DOUBLE -#define TARGET_96_ROUND_53_LONG_DOUBLE (!TARGET_64BIT) diff --git a/gnu/usr.bin/cc44/cc_prep/config/i386/dragonfly64.h b/gnu/usr.bin/cc44/cc_prep/config/i386/dragonfly64.h deleted file mode 100644 index 61f369ef7e..0000000000 --- a/gnu/usr.bin/cc44/cc_prep/config/i386/dragonfly64.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Definitions for AMD x86-64 running FreeBSD with ELF format - Copyright (C) 2002, 2004, 2007 Free Software Foundation, Inc. - Contributed by David O'Brien - Adapted from the FreeBSD version. - -This file is part of GCC. - -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 3, or (at your option) -any later version. - -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 GCC; see the file COPYING3. If not see -. */ - - -#undef TARGET_VERSION -#define TARGET_VERSION fprintf (stderr, " (x86-64 DragonFly/ELF)"); - -/* Tell final.c that we don't need a label passed to mcount. */ - -#undef MCOUNT_NAME -#define MCOUNT_NAME ".mcount" - -#define SUBTARGET_EXTRA_SPECS \ - { "dfbsd_dynamic_linker", DFBSD_DYNAMIC_LINKER } - -/* Provide a LINK_SPEC appropriate for the DragonFly/x86-64 ELF target. - This is a copy of LINK_SPEC from tweaked for - the x86-64 target. - XXX We don't support two arch userland yet */ - -#undef LINK_SPEC -#define LINK_SPEC "\ - %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ - %{v:-V} \ - %{assert*} %{R*} %{rpath*} %{defsym*} \ - %{shared:-Bshareable %{h*} %{soname*}} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(dfbsd_dynamic_linker) }} \ - %{static:-Bstatic}} \ - %{symbolic:-Bsymbolic}" \ - DFBSD_NATIVE_LINK_SPEC -- 2.41.0