From f72e1e2bdb00afb31f28e751349fa363d3d54a98 Mon Sep 17 00:00:00 2001 From: sturm Date: Fri, 5 Oct 2007 13:14:12 +0000 Subject: [PATCH] change default behaviour for arm-elf targets to always pass '-mfpu=softfpa' to GAS unless '-mhard-float' is specified sync patches while here from maintainer --- devel/arm-elf/gcc/Makefile | 4 ++-- devel/arm-elf/gcc/patches/patch-Makefile_in | 14 +++++++------- devel/arm-elf/gcc/patches/patch-gcc_Makefile_in | 8 ++++---- .../arm-elf/gcc/patches/patch-gcc_config_arm_elf_h | 12 ++++++++++++ .../gcc/patches/patch-libiberty_Makefile_in | 8 ++++---- 5 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 devel/arm-elf/gcc/patches/patch-gcc_config_arm_elf_h diff --git a/devel/arm-elf/gcc/Makefile b/devel/arm-elf/gcc/Makefile index d53a193bcc3..dd2ffff29ff 100644 --- a/devel/arm-elf/gcc/Makefile +++ b/devel/arm-elf/gcc/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2007/09/16 02:52:56 merdely Exp $ +# $OpenBSD: Makefile,v 1.3 2007/10/05 13:14:12 sturm Exp $ COMMENT= gcc for arm-elf cross-development VERSION= 3.4.5 FULL_VERSION= 3.4-20050913 DISTNAME= gcc-${FULL_VERSION} -PKGNAME= ${CONFIG}-gcc-${VERSION} +PKGNAME= ${CONFIG}-gcc-${VERSION}p0 # GPL PERMIT_PACKAGE_FTP= Yes diff --git a/devel/arm-elf/gcc/patches/patch-Makefile_in b/devel/arm-elf/gcc/patches/patch-Makefile_in index 06e05a44a58..b2e246bad93 100644 --- a/devel/arm-elf/gcc/patches/patch-Makefile_in +++ b/devel/arm-elf/gcc/patches/patch-Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/04/02 15:35:02 sturm Exp $ ---- Makefile.in.orig Sat Oct 14 18:12:49 2006 -+++ Makefile.in Sat Oct 14 18:22:26 2006 +$OpenBSD: patch-Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $ +--- Makefile.in.orig Wed Sep 14 01:56:45 2005 ++++ Makefile.in Fri Oct 5 15:04:31 2007 @@ -597,22 +597,7 @@ configure-host: maybe-configure-gcc \ maybe-configure-utils .PHONY: configure-target @@ -116,7 +116,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/04/02 15:35:02 sturm Exp $ # GCC, the eternal special case .PHONY: maybe-TAGS-gcc TAGS-gcc -@@ -6408,22 +6333,7 @@ install-info-host: maybe-install-info-gc +@@ -6408,22 +6333,7 @@ install-info-host: maybe-install-info-gcc \ .PHONY: install-info-target install-info-target: \ @@ -139,7 +139,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/04/02 15:35:02 sturm Exp $ # GCC, the eternal special case .PHONY: maybe-install-info-gcc install-info-gcc -@@ -8365,22 +8275,7 @@ installcheck-host: maybe-installcheck-gc +@@ -8365,22 +8275,7 @@ installcheck-host: maybe-installcheck-gcc \ .PHONY: installcheck-target installcheck-target: \ @@ -162,7 +162,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/04/02 15:35:02 sturm Exp $ # GCC, the eternal special case .PHONY: maybe-installcheck-gcc installcheck-gcc -@@ -10241,22 +10136,7 @@ mostlyclean-host: maybe-mostlyclean-gcc +@@ -10241,22 +10136,7 @@ mostlyclean-host: maybe-mostlyclean-gcc \ .PHONY: mostlyclean-target mostlyclean-target: \ @@ -231,7 +231,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/04/02 15:35:02 sturm Exp $ # GCC, the eternal special case .PHONY: maybe-distclean-gcc distclean-gcc -@@ -15528,22 +15378,7 @@ maintainer-clean-host: maybe-maintainer- +@@ -15528,22 +15378,7 @@ maintainer-clean-host: maybe-maintainer-clean-gcc \ .PHONY: maintainer-clean-target maintainer-clean-target: \ diff --git a/devel/arm-elf/gcc/patches/patch-gcc_Makefile_in b/devel/arm-elf/gcc/patches/patch-gcc_Makefile_in index 070733d8eaa..f471e4c3c09 100644 --- a/devel/arm-elf/gcc/patches/patch-gcc_Makefile_in +++ b/devel/arm-elf/gcc/patches/patch-gcc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-gcc_Makefile_in,v 1.1.1.1 2007/04/02 15:35:02 sturm Exp $ ---- gcc/Makefile.in.orig Sat Oct 14 18:39:29 2006 -+++ gcc/Makefile.in Sat Oct 14 18:42:44 2006 -@@ -2963,12 +2963,7 @@ install-driver: installdirs xgcc$(exeext +$OpenBSD: patch-gcc_Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $ +--- gcc/Makefile.in.orig Thu Feb 24 10:26:57 2005 ++++ gcc/Makefile.in Fri Oct 5 15:04:31 2007 +@@ -2963,12 +2963,7 @@ install-driver: installdirs xgcc$(exeext) # Install the info files. # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir # to do the install. diff --git a/devel/arm-elf/gcc/patches/patch-gcc_config_arm_elf_h b/devel/arm-elf/gcc/patches/patch-gcc_config_arm_elf_h new file mode 100644 index 00000000000..df99b2d11c9 --- /dev/null +++ b/devel/arm-elf/gcc/patches/patch-gcc_config_arm_elf_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-gcc_config_arm_elf_h,v 1.1 2007/10/05 13:14:13 sturm Exp $ +--- gcc/config/arm/elf.h.orig Fri Oct 5 15:05:10 2007 ++++ gcc/config/arm/elf.h Fri Oct 5 15:05:42 2007 +@@ -46,7 +46,7 @@ + + #ifndef SUBTARGET_ASM_FLOAT_SPEC + #define SUBTARGET_ASM_FLOAT_SPEC "\ +-%{mapcs-float:-mfloat} %{msoft-float:-mfpu=softfpa}" ++%{mapcs-float:-mfloat} %{!mhard-float:-mfpu=softfpa} %{mhard-float:-mfpu=fpa}" + #endif + + #ifndef ASM_SPEC diff --git a/devel/arm-elf/gcc/patches/patch-libiberty_Makefile_in b/devel/arm-elf/gcc/patches/patch-libiberty_Makefile_in index bbbb2c1a05a..34b4a611f7c 100644 --- a/devel/arm-elf/gcc/patches/patch-libiberty_Makefile_in +++ b/devel/arm-elf/gcc/patches/patch-libiberty_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-libiberty_Makefile_in,v 1.1.1.1 2007/04/02 15:35:02 sturm Exp $ ---- libiberty/Makefile.in.orig Sat Oct 14 18:43:16 2006 -+++ libiberty/Makefile.in Sat Oct 14 18:43:47 2006 -@@ -267,7 +267,7 @@ libiberty.html : $(srcdir)/libiberty.tex +$OpenBSD: patch-libiberty_Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $ +--- libiberty/Makefile.in.orig Wed Jan 14 22:27:28 2004 ++++ libiberty/Makefile.in Fri Oct 5 15:04:31 2007 +@@ -267,7 +267,7 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC) @MAINT@ echo stamp > stamp-functions INSTALL_DEST = @INSTALL_DEST@