18925bc515
this should more or less compile and run tests on i386, but is not guaranteed to do anything more yet...
85 lines
2.9 KiB
Plaintext
85 lines
2.9 KiB
Plaintext
$OpenBSD: patch-gcc_config_openbsd_h,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||
--- gcc/config/openbsd.h.orig Mon Sep 13 14:31:45 2004
|
||
+++ gcc/config/openbsd.h Mon Sep 13 14:35:31 2004
|
||
@@ -52,29 +52,60 @@ Boston, MA 02111-1307, USA. */
|
||
|
||
#ifdef OPENBSD_NATIVE
|
||
|
||
-#undef GCC_INCLUDE_DIR
|
||
-#define GCC_INCLUDE_DIR "/usr/include"
|
||
-
|
||
/* The compiler is configured with ONLY the gcc/g++ standard headers. */
|
||
#undef INCLUDE_DEFAULTS
|
||
#define INCLUDE_DEFAULTS \
|
||
{ \
|
||
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, \
|
||
- { GCC_INCLUDE_DIR, "GCC", 0, 0 }, \
|
||
+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1 }, \
|
||
+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1 }, \
|
||
+ { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0 }, \
|
||
{ 0, 0, 0, 0 } \
|
||
}
|
||
|
||
/* Under OpenBSD, the normal location of the various *crt*.o files is the
|
||
/usr/lib directory. */
|
||
-#define STANDARD_STARTFILE_PREFIX "/usr/lib/"
|
||
+#undef STANDARD_STARTFILE_PREFIX
|
||
+#define STANDARD_STARTFILE_PREFIX "/usr/local/lib/"
|
||
|
||
#endif
|
||
|
||
|
||
/* Controlling the compilation driver. */
|
||
+/* TARGET_OS_CPP_BUILTINS() common to all OpenBSD targets. */
|
||
+#define OPENBSD_OS_CPP_BUILTINS_COMMON() \
|
||
+ do \
|
||
+ { \
|
||
+ builtin_define ("__OpenBSD__"); \
|
||
+ builtin_define ("__unix__"); \
|
||
+ builtin_define ("__ANSI_COMPAT"); \
|
||
+ builtin_assert ("system=unix"); \
|
||
+ builtin_assert ("system=bsd"); \
|
||
+ builtin_assert ("system=OpenBSD"); \
|
||
+ } \
|
||
+ while (0)
|
||
|
||
+/* TARGET_OS_CPP_BUILTINS() common to all OpenBSD ELF targets. */
|
||
+#define OPENBSD_OS_CPP_BUILTINS_ELF() \
|
||
+ do \
|
||
+ { \
|
||
+ OPENBSD_OS_CPP_BUILTINS_COMMON(); \
|
||
+ builtin_define ("__ELF__"); \
|
||
+ } \
|
||
+ while (0)
|
||
+
|
||
+/* TARGET_OS_CPP_BUILTINS() common to all LP64 OpenBSD targets. */
|
||
+#define OPENBSD_OS_CPP_BUILTINS_LP64() \
|
||
+ do \
|
||
+ { \
|
||
+ builtin_define ("_LP64"); \
|
||
+ builtin_define ("__LP64__"); \
|
||
+ } \
|
||
+ while (0)
|
||
+
|
||
+
|
||
/* CPP_SPEC appropriate for OpenBSD. We deal with -posix and -pthread.
|
||
- XXX the way threads are handling currently is not very satisfying,
|
||
+ XXX the way threads are handled currently is not very satisfying,
|
||
since all code must be compiled with -pthread to work.
|
||
This two-stage defines makes it easy to pick that for targets that
|
||
have subspecs. */
|
||
@@ -84,10 +115,9 @@ Boston, MA 02111-1307, USA. */
|
||
#define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
|
||
#endif
|
||
|
||
-/* LIB_SPEC appropriate for OpenBSD. Select the appropriate libc,
|
||
- depending on profiling and threads. Basically,
|
||
- -lc(_r)?(_p)?, select _r for threads, and _p for p or pg. */
|
||
-#define OBSD_LIB_SPEC "%{!shared:-lc%{pthread:_r}%{p:_p}%{!p:%{pg:_p}}}"
|
||
+/* LIB_SPEC appropriate for OpenBSD. Include -lpthread if -pthread is
|
||
+ specified on the command line. */
|
||
+#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread%{p:_p}%{!p:%{pg:_p}}}} %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}"
|
||
|
||
#ifndef OBSD_HAS_CORRECT_SPECS
|
||
|