From 9397f1011e4222eb53649161023fc96714cfcf4a Mon Sep 17 00:00:00 2001 From: espie Date: Sat, 20 Feb 1999 04:26:13 +0000 Subject: [PATCH] This does match what the FSF took in. If you're wondering about the added blank lines at the end of all Makefile fragments, just think how it will look when it is inserted in the Makefile. --- lang/egcs-snapshot/Makefile | 12 ++--- .../files/config/gcc/config/openbsd.h | 45 ++++++++++--------- .../files/config/gcc/config/t-openbsd | 1 + .../files/config/gcc/config/t-openbsd-thread | 1 + .../files/config/gcc/config/xm-openbsd.h | 3 +- .../files/config/libstdc++/config/openbsd.ml | 1 + .../files/config/libstdc++/config/openbsd.mt | 1 + lang/egcs/snapshot/Makefile | 12 ++--- .../files/config/gcc/config/openbsd.h | 45 ++++++++++--------- .../files/config/gcc/config/t-openbsd | 1 + .../files/config/gcc/config/t-openbsd-thread | 1 + .../files/config/gcc/config/xm-openbsd.h | 3 +- .../files/config/libstdc++/config/openbsd.ml | 1 + .../files/config/libstdc++/config/openbsd.mt | 1 + 14 files changed, 70 insertions(+), 58 deletions(-) diff --git a/lang/egcs-snapshot/Makefile b/lang/egcs-snapshot/Makefile index 70d0c8f9c83..3ac0d68306e 100644 --- a/lang/egcs-snapshot/Makefile +++ b/lang/egcs-snapshot/Makefile @@ -3,19 +3,19 @@ # Date created: 25 sep 98 # Whom: Marc Espie # -# $OpenBSD: Makefile,v 1.31 1999/02/18 02:37:32 marc Exp $ +# $OpenBSD: Makefile,v 1.32 1999/02/20 04:26:13 espie Exp $ # # This is a configuration file for egcs, snapshot flavor # PLEASE use the regular egcs-stable for serious work, resort to this one # for experimentations and testing. +# it only works right with a recent bsd.port.mk. +NEED_VERSION=1.60 + # we could remove this dependency by patching configure, but this is not # reasonable... - -NEED_VERSION=1.60 BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf - CATEGORIES= lang MAINTAINER= Marc.Espie@openbsd.org MIRROR_DISTFILE=no @@ -297,7 +297,7 @@ pre-configure: #### # build section # should work without gmake. If it turns out to be needed, this must be -# reported to the egcs folks +# reported to MAINTAINER. #USE_GMAKE= yes # you shouldn't skip bootstrap unless you know what you're doing @@ -337,7 +337,7 @@ M4FLAGS+= -DOBJC .if defined(MAKE_JAVA) M4FLAGS+= -DJAVA .endif -.if (${MACHINE_ARCH}) != "alpha") +.if !defined(NO_SHARED_LIBS) M4FLAGS+= -DDYNAMIC .endif diff --git a/lang/egcs-snapshot/files/config/gcc/config/openbsd.h b/lang/egcs-snapshot/files/config/gcc/config/openbsd.h index da151eb3fff..af8358eb153 100644 --- a/lang/egcs-snapshot/files/config/gcc/config/openbsd.h +++ b/lang/egcs-snapshot/files/config/gcc/config/openbsd.h @@ -45,17 +45,17 @@ Boston, MA 02111-1307, USA. */ the OpenBSD source tree, specifically through Makefile.bsd-wrapper. In such a case the include path can be trimmed as there is no - distinction between system includes and gcc includes. */ + distinction between system includes and gcc includes. */ /* This configuration method, namely Makefile.bsd-wrapper and - OPENBSD_NATIVE is NOT recommended for building cross-compilers. */ + OPENBSD_NATIVE is NOT recommended for building cross-compilers. */ #ifdef OPENBSD_NATIVE #undef GCC_INCLUDE_DIR #define GCC_INCLUDE_DIR "/usr/include" -/* The compiler is configured with ONLY the gcc/g++ standard headers. */ +/* The compiler is configured with ONLY the gcc/g++ standard headers. */ #undef INCLUDE_DEFAULTS #define INCLUDE_DEFAULTS \ { \ @@ -71,7 +71,7 @@ Boston, MA 02111-1307, USA. */ #endif -/* Controlling the compilation driver. */ +/* Controlling the compilation driver. */ /* CPP_SPEC appropriate for OpenBSD. We deal with -posix and -pthread. XXX the way threads are handling currently is not very satisfying, @@ -100,12 +100,12 @@ Boston, MA 02111-1307, USA. */ #ifdef OBSD_OLD_GAS /* ASM_SPEC appropriate for OpenBSD. For some architectures, OpenBSD still uses a special flavor of gas that needs to be told when generating - pic code. */ + pic code. */ #undef ASM_SPEC #define ASM_SPEC "%{fpic:-k} %{fPIC:-k -K} %|" #else /* Since we use gas, stdin -> - is a good idea, but we don't want to - override native specs just for that. */ + override native specs just for that. */ #ifndef ASM_SPEC #define ASM_SPEC "%|" #endif @@ -127,45 +127,45 @@ Boston, MA 02111-1307, USA. */ #endif -/* Runtime target specification. */ +/* Runtime target specification. */ -/* You must redefine CPP_PREDEFINES in any arch specific file. */ +/* You must redefine CPP_PREDEFINES in any arch specific file. */ #undef CPP_PREDEFINES -/* Implicit calls to library routines. */ +/* Implicit calls to library routines. */ -/* Use memcpy and memset instead of bcopy and bzero. */ +/* Use memcpy and memset instead of bcopy and bzero. */ #define TARGET_MEM_FUNCTIONS -/* Miscellaneous parameters. */ +/* Miscellaneous parameters. */ -/* Tell libgcc2.c that OpenBSD targets support atexit. */ +/* Tell libgcc2.c that OpenBSD targets support atexit. */ #define HAVE_ATEXIT -/* Controlling debugging info: dbx options. */ +/* Controlling debugging info: dbx options. */ /* Don't use the `xsTAG;' construct in DBX output; OpenBSD systems that - use DBX don't support it. */ + use DBX don't support it. */ #define DBX_NO_XREFS -/* Support of shared libraries, mostly imported from svr4.h through netbsd. */ +/* Support of shared libraries, mostly imported from svr4.h through netbsd. */ /* Two differences from svr4.h: - we use . - _func instead of a local label, - we put extra spaces in expressions such as .type _func , @function This is more readable for a human being and confuses c++filt less. */ -/* Assembler format: output and generation of labels. */ +/* Assembler format: output and generation of labels. */ /* Define the strings used for the .type and .size directives. These strings generally do not vary from one system running OpenBSD to another, but if a given system needs to use different pseudo-op - names for these, they may be overridden in the arch specific file. */ + names for these, they may be overridden in the arch specific file. */ /* OpenBSD assembler is hacked to have .type & .size support even in a.out format object files. Functions size are supported but not activated - yet (look for GRACE_PERIOD_EXPIRED in gas/config/obj-aout.c). */ + yet (look for GRACE_PERIOD_EXPIRED in gas/config/obj-aout.c). */ #undef TYPE_ASM_OP #undef SIZE_ASM_OP @@ -273,14 +273,14 @@ do { \ /* Tell the assembler that a symbol is weak. */ /* Note: netbsd arm32 assembler needs a .globl here. An override may - be needed when/if we go for arm32 support. */ + be needed when/if we go for arm32 support. */ #ifndef ASM_WEAKEN_LABEL #define ASM_WEAKEN_LABEL(FILE,NAME) \ do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \ fputc ('\n', FILE); } while (0) #endif -/* Tell the assembler that a symbol is global. */ +/* Tell the assembler that a symbol is global. */ #ifndef ASM_GLOBALIZE_LABEL #define ASM_GLOBALIZE_LABEL(FILE,NAME) \ do { fputs ("\t.globl\t", FILE); assemble_name (FILE, NAME); \ @@ -288,7 +288,7 @@ do { \ #endif -/* Storage layout. */ +/* Storage layout. */ /* We don't have to worry about binary compatibility with older C++ code, but there is a big known bug with vtable thunks which has not been @@ -297,5 +297,6 @@ do { \ /* Otherwise, since we support weak, gthr.h erroneously tries to use - #pragma weak. */ + #pragma weak. */ #define GTHREAD_USE_WEAK 0 + diff --git a/lang/egcs-snapshot/files/config/gcc/config/t-openbsd b/lang/egcs-snapshot/files/config/gcc/config/t-openbsd index 3c87ff3a2ba..14bebc13e6b 100644 --- a/lang/egcs-snapshot/files/config/gcc/config/t-openbsd +++ b/lang/egcs-snapshot/files/config/gcc/config/t-openbsd @@ -4,3 +4,4 @@ STMP_FIXPROTO = # We don't need GCC's own include files but we do need lang specific ones. USER_H = ${LANG_EXTRA_HEADERS} INSTALL_ASSERT_H = + diff --git a/lang/egcs-snapshot/files/config/gcc/config/t-openbsd-thread b/lang/egcs-snapshot/files/config/gcc/config/t-openbsd-thread index 06315c803b0..4b25f25a4e5 100644 --- a/lang/egcs-snapshot/files/config/gcc/config/t-openbsd-thread +++ b/lang/egcs-snapshot/files/config/gcc/config/t-openbsd-thread @@ -2,3 +2,4 @@ TARGET_LIBGCC2_CFLAGS=-pthread #T_CFLAGS=-pthread #T_CPPFLAGS=-pthread + diff --git a/lang/egcs-snapshot/files/config/gcc/config/xm-openbsd.h b/lang/egcs-snapshot/files/config/gcc/config/xm-openbsd.h index 1c0f4094038..74a842184c3 100644 --- a/lang/egcs-snapshot/files/config/gcc/config/xm-openbsd.h +++ b/lang/egcs-snapshot/files/config/gcc/config/xm-openbsd.h @@ -27,8 +27,9 @@ Boston, MA 02111-1307, USA. */ #undef POSIX #define POSIX -/* Ensure we get gnu C's defaults. */ +/* Ensure we get gnu C's defaults. */ #ifdef __GNUC__ #define alloca __builtin_alloca #endif + diff --git a/lang/egcs-snapshot/files/config/libstdc++/config/openbsd.ml b/lang/egcs-snapshot/files/config/libstdc++/config/openbsd.ml index 79abd2001fb..0d278f6b0b0 100644 --- a/lang/egcs-snapshot/files/config/libstdc++/config/openbsd.ml +++ b/lang/egcs-snapshot/files/config/libstdc++/config/openbsd.ml @@ -4,3 +4,4 @@ LIBS = $(ARLIB) $(SHLIB) $(SHLINK) mshlink SHFLAGS = -nostdlib -Wl,-Bshareable,-Bforcearchive SHDEPS = -lm DEPLIBS = ../$(SHLIB) + diff --git a/lang/egcs-snapshot/files/config/libstdc++/config/openbsd.mt b/lang/egcs-snapshot/files/config/libstdc++/config/openbsd.mt index 8de319865d9..29da11cf454 100644 --- a/lang/egcs-snapshot/files/config/libstdc++/config/openbsd.mt +++ b/lang/egcs-snapshot/files/config/libstdc++/config/openbsd.mt @@ -1,2 +1,3 @@ # tell we want the mt-safe version MT_CFLAGS = -D_IO_MTSAFE_IO -D_PTHREADS + diff --git a/lang/egcs/snapshot/Makefile b/lang/egcs/snapshot/Makefile index 70d0c8f9c83..3ac0d68306e 100644 --- a/lang/egcs/snapshot/Makefile +++ b/lang/egcs/snapshot/Makefile @@ -3,19 +3,19 @@ # Date created: 25 sep 98 # Whom: Marc Espie # -# $OpenBSD: Makefile,v 1.31 1999/02/18 02:37:32 marc Exp $ +# $OpenBSD: Makefile,v 1.32 1999/02/20 04:26:13 espie Exp $ # # This is a configuration file for egcs, snapshot flavor # PLEASE use the regular egcs-stable for serious work, resort to this one # for experimentations and testing. +# it only works right with a recent bsd.port.mk. +NEED_VERSION=1.60 + # we could remove this dependency by patching configure, but this is not # reasonable... - -NEED_VERSION=1.60 BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf - CATEGORIES= lang MAINTAINER= Marc.Espie@openbsd.org MIRROR_DISTFILE=no @@ -297,7 +297,7 @@ pre-configure: #### # build section # should work without gmake. If it turns out to be needed, this must be -# reported to the egcs folks +# reported to MAINTAINER. #USE_GMAKE= yes # you shouldn't skip bootstrap unless you know what you're doing @@ -337,7 +337,7 @@ M4FLAGS+= -DOBJC .if defined(MAKE_JAVA) M4FLAGS+= -DJAVA .endif -.if (${MACHINE_ARCH}) != "alpha") +.if !defined(NO_SHARED_LIBS) M4FLAGS+= -DDYNAMIC .endif diff --git a/lang/egcs/snapshot/files/config/gcc/config/openbsd.h b/lang/egcs/snapshot/files/config/gcc/config/openbsd.h index da151eb3fff..af8358eb153 100644 --- a/lang/egcs/snapshot/files/config/gcc/config/openbsd.h +++ b/lang/egcs/snapshot/files/config/gcc/config/openbsd.h @@ -45,17 +45,17 @@ Boston, MA 02111-1307, USA. */ the OpenBSD source tree, specifically through Makefile.bsd-wrapper. In such a case the include path can be trimmed as there is no - distinction between system includes and gcc includes. */ + distinction between system includes and gcc includes. */ /* This configuration method, namely Makefile.bsd-wrapper and - OPENBSD_NATIVE is NOT recommended for building cross-compilers. */ + OPENBSD_NATIVE is NOT recommended for building cross-compilers. */ #ifdef OPENBSD_NATIVE #undef GCC_INCLUDE_DIR #define GCC_INCLUDE_DIR "/usr/include" -/* The compiler is configured with ONLY the gcc/g++ standard headers. */ +/* The compiler is configured with ONLY the gcc/g++ standard headers. */ #undef INCLUDE_DEFAULTS #define INCLUDE_DEFAULTS \ { \ @@ -71,7 +71,7 @@ Boston, MA 02111-1307, USA. */ #endif -/* Controlling the compilation driver. */ +/* Controlling the compilation driver. */ /* CPP_SPEC appropriate for OpenBSD. We deal with -posix and -pthread. XXX the way threads are handling currently is not very satisfying, @@ -100,12 +100,12 @@ Boston, MA 02111-1307, USA. */ #ifdef OBSD_OLD_GAS /* ASM_SPEC appropriate for OpenBSD. For some architectures, OpenBSD still uses a special flavor of gas that needs to be told when generating - pic code. */ + pic code. */ #undef ASM_SPEC #define ASM_SPEC "%{fpic:-k} %{fPIC:-k -K} %|" #else /* Since we use gas, stdin -> - is a good idea, but we don't want to - override native specs just for that. */ + override native specs just for that. */ #ifndef ASM_SPEC #define ASM_SPEC "%|" #endif @@ -127,45 +127,45 @@ Boston, MA 02111-1307, USA. */ #endif -/* Runtime target specification. */ +/* Runtime target specification. */ -/* You must redefine CPP_PREDEFINES in any arch specific file. */ +/* You must redefine CPP_PREDEFINES in any arch specific file. */ #undef CPP_PREDEFINES -/* Implicit calls to library routines. */ +/* Implicit calls to library routines. */ -/* Use memcpy and memset instead of bcopy and bzero. */ +/* Use memcpy and memset instead of bcopy and bzero. */ #define TARGET_MEM_FUNCTIONS -/* Miscellaneous parameters. */ +/* Miscellaneous parameters. */ -/* Tell libgcc2.c that OpenBSD targets support atexit. */ +/* Tell libgcc2.c that OpenBSD targets support atexit. */ #define HAVE_ATEXIT -/* Controlling debugging info: dbx options. */ +/* Controlling debugging info: dbx options. */ /* Don't use the `xsTAG;' construct in DBX output; OpenBSD systems that - use DBX don't support it. */ + use DBX don't support it. */ #define DBX_NO_XREFS -/* Support of shared libraries, mostly imported from svr4.h through netbsd. */ +/* Support of shared libraries, mostly imported from svr4.h through netbsd. */ /* Two differences from svr4.h: - we use . - _func instead of a local label, - we put extra spaces in expressions such as .type _func , @function This is more readable for a human being and confuses c++filt less. */ -/* Assembler format: output and generation of labels. */ +/* Assembler format: output and generation of labels. */ /* Define the strings used for the .type and .size directives. These strings generally do not vary from one system running OpenBSD to another, but if a given system needs to use different pseudo-op - names for these, they may be overridden in the arch specific file. */ + names for these, they may be overridden in the arch specific file. */ /* OpenBSD assembler is hacked to have .type & .size support even in a.out format object files. Functions size are supported but not activated - yet (look for GRACE_PERIOD_EXPIRED in gas/config/obj-aout.c). */ + yet (look for GRACE_PERIOD_EXPIRED in gas/config/obj-aout.c). */ #undef TYPE_ASM_OP #undef SIZE_ASM_OP @@ -273,14 +273,14 @@ do { \ /* Tell the assembler that a symbol is weak. */ /* Note: netbsd arm32 assembler needs a .globl here. An override may - be needed when/if we go for arm32 support. */ + be needed when/if we go for arm32 support. */ #ifndef ASM_WEAKEN_LABEL #define ASM_WEAKEN_LABEL(FILE,NAME) \ do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \ fputc ('\n', FILE); } while (0) #endif -/* Tell the assembler that a symbol is global. */ +/* Tell the assembler that a symbol is global. */ #ifndef ASM_GLOBALIZE_LABEL #define ASM_GLOBALIZE_LABEL(FILE,NAME) \ do { fputs ("\t.globl\t", FILE); assemble_name (FILE, NAME); \ @@ -288,7 +288,7 @@ do { \ #endif -/* Storage layout. */ +/* Storage layout. */ /* We don't have to worry about binary compatibility with older C++ code, but there is a big known bug with vtable thunks which has not been @@ -297,5 +297,6 @@ do { \ /* Otherwise, since we support weak, gthr.h erroneously tries to use - #pragma weak. */ + #pragma weak. */ #define GTHREAD_USE_WEAK 0 + diff --git a/lang/egcs/snapshot/files/config/gcc/config/t-openbsd b/lang/egcs/snapshot/files/config/gcc/config/t-openbsd index 3c87ff3a2ba..14bebc13e6b 100644 --- a/lang/egcs/snapshot/files/config/gcc/config/t-openbsd +++ b/lang/egcs/snapshot/files/config/gcc/config/t-openbsd @@ -4,3 +4,4 @@ STMP_FIXPROTO = # We don't need GCC's own include files but we do need lang specific ones. USER_H = ${LANG_EXTRA_HEADERS} INSTALL_ASSERT_H = + diff --git a/lang/egcs/snapshot/files/config/gcc/config/t-openbsd-thread b/lang/egcs/snapshot/files/config/gcc/config/t-openbsd-thread index 06315c803b0..4b25f25a4e5 100644 --- a/lang/egcs/snapshot/files/config/gcc/config/t-openbsd-thread +++ b/lang/egcs/snapshot/files/config/gcc/config/t-openbsd-thread @@ -2,3 +2,4 @@ TARGET_LIBGCC2_CFLAGS=-pthread #T_CFLAGS=-pthread #T_CPPFLAGS=-pthread + diff --git a/lang/egcs/snapshot/files/config/gcc/config/xm-openbsd.h b/lang/egcs/snapshot/files/config/gcc/config/xm-openbsd.h index 1c0f4094038..74a842184c3 100644 --- a/lang/egcs/snapshot/files/config/gcc/config/xm-openbsd.h +++ b/lang/egcs/snapshot/files/config/gcc/config/xm-openbsd.h @@ -27,8 +27,9 @@ Boston, MA 02111-1307, USA. */ #undef POSIX #define POSIX -/* Ensure we get gnu C's defaults. */ +/* Ensure we get gnu C's defaults. */ #ifdef __GNUC__ #define alloca __builtin_alloca #endif + diff --git a/lang/egcs/snapshot/files/config/libstdc++/config/openbsd.ml b/lang/egcs/snapshot/files/config/libstdc++/config/openbsd.ml index 79abd2001fb..0d278f6b0b0 100644 --- a/lang/egcs/snapshot/files/config/libstdc++/config/openbsd.ml +++ b/lang/egcs/snapshot/files/config/libstdc++/config/openbsd.ml @@ -4,3 +4,4 @@ LIBS = $(ARLIB) $(SHLIB) $(SHLINK) mshlink SHFLAGS = -nostdlib -Wl,-Bshareable,-Bforcearchive SHDEPS = -lm DEPLIBS = ../$(SHLIB) + diff --git a/lang/egcs/snapshot/files/config/libstdc++/config/openbsd.mt b/lang/egcs/snapshot/files/config/libstdc++/config/openbsd.mt index 8de319865d9..29da11cf454 100644 --- a/lang/egcs/snapshot/files/config/libstdc++/config/openbsd.mt +++ b/lang/egcs/snapshot/files/config/libstdc++/config/openbsd.mt @@ -1,2 +1,3 @@ # tell we want the mt-safe version MT_CFLAGS = -D_IO_MTSAFE_IO -D_PTHREADS +