From c77b1f0cae5fb10215374bd6986d3a6013546037 Mon Sep 17 00:00:00 2001
From: pascal <pascal@openbsd.org>
Date: Mon, 4 Feb 2013 11:37:09 +0000
Subject: [PATCH] sync hppa LINK_SPEC; ok brad@

no bumps for 4.7 as it doesn't build there
---
 lang/gcc/4.6/Makefile                         | 16 ++++++-------
 .../4.6/patches/patch-gcc_config_pa_openbsd_h | 23 +++++++++----------
 .../4.7/patches/patch-gcc_config_pa_openbsd_h | 23 +++++++++----------
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/lang/gcc/4.6/Makefile b/lang/gcc/4.6/Makefile
index 7b4d8848d2c..f4834a428d3 100644
--- a/lang/gcc/4.6/Makefile
+++ b/lang/gcc/4.6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2013/02/01 16:34:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.49 2013/02/04 11:37:09 pascal Exp $
 
 ONLY_FOR_ARCHS = alpha amd64 hppa i386 powerpc sparc64
 DPB_PROPERTIES = parallel
@@ -24,14 +24,14 @@ PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 PKGNAME-go =	gccgo-${FULL_PKGVERSION}
 PKGSPEC-main = gcc->=4.6,<4.7
 
-REVISION-main = 14
-REVISION-c++ = 13
+REVISION-main = 15
+REVISION-c++ = 14
 REVISION-estdc = 10
-REVISION-f95 = 13
-REVISION-java = 14
-REVISION-objc = 13
-REVISION-ada = 14
-REVISION-go = 13
+REVISION-f95 = 14
+REVISION-java = 15
+REVISION-objc = 14
+REVISION-ada = 15
+REVISION-go = 14
 
 SHARED_LIBS =	estdc++		14.0 \
 		gfortran	3.0 \
diff --git a/lang/gcc/4.6/patches/patch-gcc_config_pa_openbsd_h b/lang/gcc/4.6/patches/patch-gcc_config_pa_openbsd_h
index 8b70acc73c9..89a4ce220cd 100644
--- a/lang/gcc/4.6/patches/patch-gcc_config_pa_openbsd_h
+++ b/lang/gcc/4.6/patches/patch-gcc_config_pa_openbsd_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_config_pa_openbsd_h,v 1.1 2013/01/16 19:28:48 pascal Exp $
---- gcc/config/pa/openbsd.h.orig	Wed Apr  4 05:01:01 2012
-+++ gcc/config/pa/openbsd.h	Wed Apr  4 08:28:10 2012
-@@ -0,0 +1,186 @@
+$OpenBSD: patch-gcc_config_pa_openbsd_h,v 1.2 2013/02/04 11:37:09 pascal Exp $
+--- gcc/config/pa/openbsd.h.orig	Sun Feb  3 12:05:20 2013
++++ gcc/config/pa/openbsd.h	Sun Feb  3 12:18:14 2013
+@@ -0,0 +1,185 @@
 +/* Configuration file for an hppa risc OpenBSD target.
 +
 +   Copyright (C) 1999 Free Software Foundation, Inc.
@@ -151,16 +151,15 @@ $OpenBSD: patch-gcc_config_pa_openbsd_h,v 1.1 2013/01/16 19:28:48 pascal Exp $
 +#undef TARGET_SCHED_DEFAULT
 +#define TARGET_SCHED_DEFAULT PROCESSOR_700
 +
-+/* XXX Why doesn't PA support -R  like everyone ??? */
 +#undef LINK_SPEC
 +#define LINK_SPEC \
-+  "%{EB} %{EL} %{shared} %{non_shared} \
-+   %{call_shared} %{no_archive} %{exact_version} \
-+   %{!shared: %{!non_shared: %{!call_shared: -non_shared}}} \
-+   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so} \
-+   %{!nostdlib:%{!r*:%{!e*:-e __start}}} -dc -dp \
-+   %{static:-Bstatic} %{!static:-Bdynamic} %{rdynamic:-export-dynamic} \
-+   %{assert*}"
++   "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \
++   %{shared:-shared} %{R*} \
++   %{static:-Bstatic} \
++   %{!static:-Bdynamic} \
++   %{rdynamic:-export-dynamic} \
++   %{assert*} \
++   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
 +
 +/* Layout of source language data types. */
 +
diff --git a/lang/gcc/4.7/patches/patch-gcc_config_pa_openbsd_h b/lang/gcc/4.7/patches/patch-gcc_config_pa_openbsd_h
index 922aa530372..42bf02f11f6 100644
--- a/lang/gcc/4.7/patches/patch-gcc_config_pa_openbsd_h
+++ b/lang/gcc/4.7/patches/patch-gcc_config_pa_openbsd_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_config_pa_openbsd_h,v 1.2 2012/07/01 18:56:45 pascal Exp $
---- gcc/config/pa/openbsd.h.orig	Wed Jun 20 14:46:16 2012
-+++ gcc/config/pa/openbsd.h	Sun Jun 24 13:17:34 2012
-@@ -0,0 +1,186 @@
+$OpenBSD: patch-gcc_config_pa_openbsd_h,v 1.3 2013/02/04 11:37:09 pascal Exp $
+--- gcc/config/pa/openbsd.h.orig	Mon Feb  4 12:32:35 2013
++++ gcc/config/pa/openbsd.h	Mon Feb  4 12:33:52 2013
+@@ -0,0 +1,185 @@
 +/* Configuration file for an hppa risc OpenBSD target.
 +
 +   Copyright (C) 1999 Free Software Foundation, Inc.
@@ -151,16 +151,15 @@ $OpenBSD: patch-gcc_config_pa_openbsd_h,v 1.2 2012/07/01 18:56:45 pascal Exp $
 +#undef TARGET_SCHED_DEFAULT
 +#define TARGET_SCHED_DEFAULT PROCESSOR_700
 +
-+/* XXX Why doesn't PA support -R  like everyone ??? */
 +#undef LINK_SPEC
 +#define LINK_SPEC \
-+  "%{EB} %{EL} %{shared} %{non_shared} \
-+   %{call_shared} %{no_archive} %{exact_version} \
-+   %{!shared: %{!non_shared: %{!call_shared: -non_shared}}} \
-+   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so} \
-+   %{!nostdlib:%{!r*:%{!e*:-e __start}}} -dc -dp \
-+   %{static:-Bstatic} %{!static:-Bdynamic} %{rdynamic:-export-dynamic} \
-+   %{assert*}"
++   "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \
++   %{shared:-shared} %{R*} \
++   %{static:-Bstatic} \
++   %{!static:-Bdynamic} \
++   %{rdynamic:-export-dynamic} \
++   %{assert*} \
++   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
 +
 +/* Layout of source language data types. */
 +