Compare commits
19 Commits
Author | SHA1 | Date |
---|---|---|
Jens Petersen | 8ea6e50930 | |
Jens Petersen | 864bffacc6 | |
Jens Petersen | ae6fe15573 | |
Jens Petersen | 60a180bd78 | |
Jens Petersen | 4dd90e509e | |
Jens Petersen | 90d9ed7db6 | |
Jens Petersen | 178134facc | |
Peter Robinson | b3a2c62362 | |
Jens Petersen | ac707860ed | |
Jens Petersen | 5f31880e3c | |
Jens Petersen | 7ae53a9612 | |
Jens Petersen | 5622fde289 | |
Jens Petersen | 349f72d46f | |
Jens Petersen | 00daef9a06 | |
Jens Petersen | 83c424700a | |
Jens Petersen | 61fc08e4d3 | |
Jens Petersen | 08c5539696 | |
Jens Petersen | 56bcb63ca2 | |
Jens Petersen | b2900646c8 |
|
@ -1,37 +0,0 @@
|
||||||
From 08a38628f29df63ac842f4d083efb414f42d7bff Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Edward Z. Yang" <ezyang@mit.edu>
|
|
||||||
Date: Tue, 9 Jul 2013 00:01:43 -0700
|
|
||||||
Subject: [PATCH] Disable executable stack for the linker note, fixing #703
|
|
||||||
(again)
|
|
||||||
|
|
||||||
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
|
|
||||||
---
|
|
||||||
compiler/main/DriverPipeline.hs | 12 +++++++++++-
|
|
||||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
|
|
||||||
index 67377e6..26425ae 100644
|
|
||||||
--- a/compiler/main/DriverPipeline.hs
|
|
||||||
+++ b/compiler/main/DriverPipeline.hs
|
|
||||||
@@ -1640,7 +1640,17 @@ mkNoteObjsToLinkIntoBinary dflags dep_packages = do
|
|
||||||
text elfSectionNote,
|
|
||||||
text "\n",
|
|
||||||
|
|
||||||
- text "\t.ascii \"", info', text "\"\n" ]
|
|
||||||
+ text "\t.ascii \"", info', text "\"\n",
|
|
||||||
+
|
|
||||||
+ -- ALL generated assembly must have this section to disable
|
|
||||||
+ -- executable stacks. See also
|
|
||||||
+ -- compiler/nativeGen/AsmCodeGen.lhs for another instance
|
|
||||||
+ -- where we need to do this.
|
|
||||||
+ (if platformHasGnuNonexecStack (targetPlatform dflags)
|
|
||||||
+ then text ".section .note.GNU-stack,\"\",@progbits\n"
|
|
||||||
+ else empty)
|
|
||||||
+
|
|
||||||
+ ]
|
|
||||||
where
|
|
||||||
info' = text $ escape info
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
commit 08a38628f29df63ac842f4d083efb414f42d7bff
|
|
||||||
Author: Edward Z. Yang <ezyang@mit.edu>
|
|
||||||
Date: Tue Jul 9 00:01:43 2013 -0700
|
|
||||||
|
|
||||||
Disable executable stack for the linker note, fixing #703 (again)
|
|
||||||
|
|
||||||
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
|
|
||||||
|
|
||||||
Modified compiler/main/DriverPipeline.hs
|
|
||||||
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
|
|
||||||
index 67377e6..26425ae 100644
|
|
||||||
--- a/compiler/main/DriverPipeline.hs
|
|
||||||
+++ b/compiler/main/DriverPipeline.hs
|
|
||||||
@@ -1640,7 +1640,17 @@ mkNoteObjsToLinkIntoBinary dflags dep_packages = do
|
|
||||||
text elfSectionNote,
|
|
||||||
text "\n",
|
|
||||||
|
|
||||||
- text "\t.ascii \"", info', text "\"\n" ]
|
|
||||||
+ text "\t.ascii \"", info', text "\"\n",
|
|
||||||
+
|
|
||||||
+ -- ALL generated assembly must have this section to disable
|
|
||||||
+ -- executable stacks. See also
|
|
||||||
+ -- compiler/nativeGen/AsmCodeGen.lhs for another instance
|
|
||||||
+ -- where we need to do this.
|
|
||||||
+ (if platformHasGnuNonexecStack (targetPlatform dflags)
|
|
||||||
+ then text ".section .note.GNU-stack,\"\",@progbits\n"
|
|
||||||
+ else empty)
|
|
||||||
+
|
|
||||||
+ ]
|
|
||||||
where
|
|
||||||
info' = text $ escape info
|
|
||||||
|
|
|
@ -34,5 +34,5 @@ if [ -x "gen_contents_index" -a ! -r "$PKGDIRCACHE.new" -o -n "$DIR_DIFF" ]; the
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f $PKGDIRCACHE.new ]; then
|
if [ -f $PKGDIRCACHE.new ]; then
|
||||||
mv -f $PKGDIRCACHE{.new,}
|
mv -f $PKGDIRCACHE.new $PKGDIRCACHE
|
||||||
fi
|
fi
|
||||||
|
|
58
ghc.spec
58
ghc.spec
|
@ -22,7 +22,7 @@ Version: 7.6.3
|
||||||
# - release can only be reset if *all* library versions get bumped simultaneously
|
# - release can only be reset if *all* library versions get bumped simultaneously
|
||||||
# (sometimes after a major release)
|
# (sometimes after a major release)
|
||||||
# - minor release numbers for a branch should be incremented monotonically
|
# - minor release numbers for a branch should be incremented monotonically
|
||||||
Release: 25%{?dist}
|
Release: 26.4%{?dist}
|
||||||
Summary: Glasgow Haskell Compiler
|
Summary: Glasgow Haskell Compiler
|
||||||
|
|
||||||
License: %BSDHaskellReport
|
License: %BSDHaskellReport
|
||||||
|
@ -103,7 +103,7 @@ Obsoletes: ghc-feldspar-language < 0.4, ghc-feldspar-language-devel < 0.4, ghc-f
|
||||||
%if %{undefined ghc_bootstrapping}
|
%if %{undefined ghc_bootstrapping}
|
||||||
BuildRequires: ghc-compiler = %{version}
|
BuildRequires: ghc-compiler = %{version}
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} >= 20
|
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
|
||||||
BuildRequires: ghc-rpm-macros-extra
|
BuildRequires: ghc-rpm-macros-extra
|
||||||
%else
|
%else
|
||||||
BuildRequires: ghc-rpm-macros
|
BuildRequires: ghc-rpm-macros
|
||||||
|
@ -124,7 +124,7 @@ BuildRequires: libxslt, docbook-style-xsl
|
||||||
BuildRequires: python
|
BuildRequires: python
|
||||||
%endif
|
%endif
|
||||||
%ifarch armv7hl armv5tel
|
%ifarch armv7hl armv5tel
|
||||||
BuildRequires: llvm >= 3.0
|
BuildRequires: llvm34
|
||||||
%endif
|
%endif
|
||||||
%ifarch ppc64le aarch64
|
%ifarch ppc64le aarch64
|
||||||
# for patch19 and patch21
|
# for patch19 and patch21
|
||||||
|
@ -172,7 +172,7 @@ Requires(postun): chkconfig
|
||||||
# added in f14
|
# added in f14
|
||||||
Obsoletes: ghc-doc < 6.12.3-4
|
Obsoletes: ghc-doc < 6.12.3-4
|
||||||
%ifarch armv7hl armv5tel
|
%ifarch armv7hl armv5tel
|
||||||
Requires: llvm >= 3.0
|
Requires: llvm34
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description compiler
|
%description compiler
|
||||||
|
@ -196,11 +196,13 @@ documention.
|
||||||
|
|
||||||
%global ghc_version_override %{version}
|
%global ghc_version_override %{version}
|
||||||
|
|
||||||
|
# EL7 rpm supports fileattrs ghc.attr
|
||||||
|
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||||
# needs ghc_version_override for bootstrapping
|
# needs ghc_version_override for bootstrapping
|
||||||
%global _use_internal_dependency_generator 0
|
%global _use_internal_dependency_generator 0
|
||||||
%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}
|
%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}
|
||||||
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}
|
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}
|
||||||
|
%endif
|
||||||
|
|
||||||
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
|
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
|
||||||
|
|
||||||
|
@ -326,6 +328,12 @@ BuildFlavour = perf
|
||||||
%else
|
%else
|
||||||
BuildFlavour = perf-llvm
|
BuildFlavour = perf-llvm
|
||||||
%endif
|
%endif
|
||||||
|
%else
|
||||||
|
%ifnarch armv7hl armv5tel
|
||||||
|
BuildFlavour = quick-llvm
|
||||||
|
%else
|
||||||
|
BuildFlavour = quick
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
GhcLibWays = v %{!?ghc_without_shared:dyn} %{!?without_prof:p}
|
GhcLibWays = v %{!?ghc_without_shared:dyn} %{!?without_prof:p}
|
||||||
%if %{defined without_haddock}
|
%if %{defined without_haddock}
|
||||||
|
@ -341,7 +349,6 @@ BUILD_DOCBOOK_HTML = NO
|
||||||
#EXTRA_HC_OPTS=-debug
|
#EXTRA_HC_OPTS=-debug
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
export CFLAGS="${CFLAGS:-%optflags}"
|
|
||||||
# note %%configure induces cross-build due to different target/host/build platform names
|
# note %%configure induces cross-build due to different target/host/build platform names
|
||||||
# --with-gcc=%{_bindir}/gcc is to avoid ccache hardcoding problem when bootstrapping
|
# --with-gcc=%{_bindir}/gcc is to avoid ccache hardcoding problem when bootstrapping
|
||||||
%ifarch ppc64le aarch64 armv7hl
|
%ifarch ppc64le aarch64 armv7hl
|
||||||
|
@ -350,12 +357,18 @@ for i in $(find . -name config.guess -o -name config.sub) ; do
|
||||||
done
|
done
|
||||||
autoreconf
|
autoreconf
|
||||||
%endif
|
%endif
|
||||||
|
export CFLAGS="${CFLAGS:-%optflags}"
|
||||||
|
export LDFLAGS="${LDFLAGS:-%__global_ldflags}"
|
||||||
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
|
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
|
||||||
--bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
|
--bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
|
||||||
--datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
|
--datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
|
||||||
--libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
|
--libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
|
||||||
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
|
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
|
||||||
--with-gcc=%{_bindir}/gcc
|
--with-gcc=%{_bindir}/gcc \
|
||||||
|
%ifarch armv7hl armv5tel
|
||||||
|
--with-llc=%{_bindir}/llc-3.4 --with-opt=%{_bindir}/opt-3.4 \
|
||||||
|
%endif
|
||||||
|
%{nil}
|
||||||
|
|
||||||
# utf8 is needed when building with verbose output
|
# utf8 is needed when building with verbose output
|
||||||
LANG=en_US.utf8 make %{?_smp_mflags}
|
LANG=en_US.utf8 make %{?_smp_mflags}
|
||||||
|
@ -547,6 +560,26 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 9 2016 Jens Petersen <petersen@redhat.com> - 7.6.3-26.4
|
||||||
|
- rebase 7.6.3-18.3 to F21 7.6.3-26.3 to allow building for aarch64/ppc64le
|
||||||
|
(#1200404)
|
||||||
|
- use rpm fileattrs also for EPEL7
|
||||||
|
|
||||||
|
* Wed Dec 24 2014 Jens Petersen <petersen@redhat.com> - 7.6.3-26.3
|
||||||
|
- remove the build hack to switch from llvm to llvm34 (#1161049)
|
||||||
|
|
||||||
|
* Mon Dec 22 2014 Jens Petersen <petersen@redhat.com> - 7.6.3-26.2
|
||||||
|
- use llvm34 instead of llvm-3.5 for arm (#1161049)
|
||||||
|
|
||||||
|
* Tue Nov 18 2014 Jens Petersen <petersen@redhat.com> - 7.6.3-26.1
|
||||||
|
- use rpm internal dependency generator with ghc.attr on F21+
|
||||||
|
- fix bash-ism in ghc-doc-index (#1146733)
|
||||||
|
- do "quick" build when bootstrapping
|
||||||
|
- setup LDFLAGS
|
||||||
|
|
||||||
|
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.6.3-26
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
* Tue Jul 15 2014 Jens Petersen <petersen@redhat.com> - 7.6.3-25
|
* Tue Jul 15 2014 Jens Petersen <petersen@redhat.com> - 7.6.3-25
|
||||||
- configure ARM with VFPv3D16 and without NEON (#995419)
|
- configure ARM with VFPv3D16 and without NEON (#995419)
|
||||||
- only apply the Cabal unversion docdir patch to F21 and later
|
- only apply the Cabal unversion docdir patch to F21 and later
|
||||||
|
@ -564,21 +597,22 @@ fi
|
||||||
- add ppc64le support patch from Debian by Colin Watson
|
- add ppc64le support patch from Debian by Colin Watson
|
||||||
(thanks to Jaromir Capik for Fedora ppc64le bootstrap)
|
(thanks to Jaromir Capik for Fedora ppc64le bootstrap)
|
||||||
|
|
||||||
* Wed Jan 29 2014 Jens Petersen <petersen@redhat.com> - 7.6.3-21
|
-- 7.6.3-19
|
||||||
|
- generate and ship library doc index for ghc bundled libraries
|
||||||
|
|
||||||
|
* Wed Jan 29 2014 Jens Petersen <petersen@redhat.com> - 7.6.3-18.3
|
||||||
- fix segfault on i686 when using ffi double-mapping for selinux (#907515)
|
- fix segfault on i686 when using ffi double-mapping for selinux (#907515)
|
||||||
see http://hackage.haskell.org/trac/ghc/ticket/7629
|
see http://hackage.haskell.org/trac/ghc/ticket/7629
|
||||||
(thanks Garrett Mitchener for patch committed upstream)
|
(thanks Garrett Mitchener for patch committed upstream)
|
||||||
|
|
||||||
* Wed Oct 30 2013 Jens Petersen <petersen@redhat.com> - 7.6.3-20
|
* Wed Oct 30 2013 Jens Petersen <petersen@redhat.com> - 7.6.3-18.2
|
||||||
- enable debuginfo for C code bits (#989593)
|
- enable debuginfo for C code bits (#989593)
|
||||||
- back to production build
|
- back to production build
|
||||||
|
|
||||||
* Tue Oct 29 2013 Jens Petersen <petersen@redhat.com> - 7.6.3-19
|
* Tue Oct 29 2013 Jens Petersen <petersen@redhat.com> - 7.6.3-18.1
|
||||||
- fix rts hang on 64bit bigendian archs (patch by Gustavo Luiz Duarte, #989593)
|
- fix rts hang on 64bit bigendian archs (patch by Gustavo Luiz Duarte, #989593)
|
||||||
- generate and ship library doc index for ghc bundled libraries
|
|
||||||
- build with utf8 encoding (needed for verbose ghc output
|
- build with utf8 encoding (needed for verbose ghc output
|
||||||
and makes better sense anyway)
|
and makes better sense anyway)
|
||||||
- change ghc-cabal to make library html docdirs unversioned
|
|
||||||
- bootstrap build
|
- bootstrap build
|
||||||
|
|
||||||
* Sat Jul 27 2013 Jóhann B. Guðmundsson <johannbg@fedoraproject.org> - 7.6.3-18
|
* Sat Jul 27 2013 Jóhann B. Guðmundsson <johannbg@fedoraproject.org> - 7.6.3-18
|
||||||
|
|
Loading…
Reference in New Issue