clean up defines for openbsd powerpc, also enable the libc_r support properly.

2 files changed, 12 insertions, 6 deletions

diff --git a/gnu/egcs/gcc/config/rs6000/openbsd.h b/gnu/egcs/gcc/config/rs6000/openbsd.h
index 17ac4420973..e71ce7f9e28 100644
--- a/gnu/egcs/gcc/config/rs6000/openbsd.h
+++ b/gnu/egcs/gcc/config/rs6000/openbsd.h
@@ -30,7 +30,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* Run-time target specifications. */
 #define CPP_PREDEFINES \
- "-D__PPC -D__unix__ -D__OpenBSD__ -D__powerpc -D__powerpc__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(powerpc) -Amachine(powerpc)"
+  "-D__PPC -D__powerpc -D__powerpc__ -Acpu(powerpc) -Amachine(powerpc)"
+
+#undef	CPP_OS_DEFAULT_SPEC
+#define CPP_OS_DEFAULT_SPEC "%(cpp_os_openbsd)"
 
 #undef LINK_SPEC
 #define LINK_SPEC "-m elf32ppc %{shared:-shared} \
@@ -58,6 +61,10 @@ Boston, MA 02111-1307, USA.  */
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (PowerPC OpenBSD)");
 
+/* Default ABI to use */
+#undef RS6000_ABI_NAME 
+#define RS6000_ABI_NAME "openbsd"
+
 /* Define this macro as a C expression for the initializer of an
    array of string to tell the driver program which options are
    defaults for this target and thus do not need to be handled
diff --git a/gnu/egcs/gcc/config/rs6000/sysv4.h b/gnu/egcs/gcc/config/rs6000/sysv4.h
index a86d11f728d..99e91ec52e0 100644
--- a/gnu/egcs/gcc/config/rs6000/sysv4.h
+++ b/gnu/egcs/gcc/config/rs6000/sysv4.h
@@ -1161,7 +1161,7 @@ do {									\
 %{mmvme: %(cpp_os_mvme) } \
 %{msim: %(cpp_os_sim) } \
 %{mcall-linux: %(cpp_os_linux) } \
-%{mcall-openbsd: %(cpp_os_linux) } \
+%{mcall-openbsd: %(cpp_os_openbsd) } \
 %{mcall-solaris: %(cpp_os_solaris) } \
 %{!mads: %{!myellowknife: %{!mmvme: %{!msim: %{!mcall-linux: %{!mcall-openbsd: %{!mcall-solaris: %(cpp_os_default) }}}}}}}"
 
@@ -1362,11 +1362,11 @@ do {									\
 
 /* OpenBSD support.  */
 #ifndef	LIB_OPENBSD_SPEC
-#define LIB_OPENBSD_SPEC "%{mnewlib: --start-group -lopenbsd %(libc_openbsd) --end-group } %{!mnewlib: %(libc_openbsd) }"
+#define LIB_OPENBSD_SPEC "%{mnewlib: --start-group %(libc_openbsd) --end-group } %{!mnewlib: %(libc_openbsd) }"
 #endif
 
 #ifndef LIBC_OPENBSD_SPEC
-#define LIBC_OPENBSD_SPEC "-lc%{pthread_r}%{p:_p}%{!p:%{pg:_p}}"
+#define LIBC_OPENBSD_SPEC "-lc%{pthread:_r}%{p:_p}%{!p:%{pg:_p}}"
 #endif
 
 #ifndef	STARTFILE_OPENBSD_SPEC
@@ -1399,8 +1399,7 @@ do {									\
 #ifndef CPP_OS_OPENBSD_SPEC
 #define CPP_OS_OPENBSD_SPEC "-D__unix__ -D__OpenBSD__ \
 %{!ansi: -Dunix } \
-%{pthread:-D_POSIX_THREADS} \
--Asystem(unix) -Asystem(OpenBSD)"
+-Asystem(unix) -Asystem(OpenBSD) " OBSD_CPP_SPEC
 #endif
 
 /* Solaris support.  */