Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 90c392c0b02d
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f47813e0f499
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 13, 2021

  1. gcc: don't link against libssp 

    when -fstack-protector is provided as linker argument.
    @korli
    korli committed Oct 13, 2021
    Copy the full SHA
    f47813e View commit details
Showing with 37 additions and 9 deletions.
  1. +1 −1 sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
  2. +36 −8 sys-devel/gcc/patches/gcc-8.3.0_2019_05_24.patchset
2 changes: 1 addition & 1 deletion sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ HOMEPAGE="https://gcc.gnu.org/"
COPYRIGHT="1988-2019 Free Software Foundation, Inc."
LICENSE="GNU GPL v3
GNU LGPL v3"
REVISION="12"
REVISION="13"
gccVersion="${portVersion%%_*}"
SOURCE_URI="https://ftpmirror.gnu.org/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz
https://ftp.gnu.org/gnu/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz"
44 changes: 36 additions & 8 deletions sys-devel/gcc/patches/gcc-8.3.0_2019_05_24.patchset
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From adc6ede27d2394559d88d637b006ebbe3dccc5e5 Mon Sep 17 00:00:00 2001
From 1a45a6bbd833740073bc6a9bd34a68c8911483ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Sun, 19 Jul 2015 18:55:34 +0200
Subject: Haiku patch
@@ -2403,7 +2403,7 @@ index 24d13f3..94d96d9 100644
2.30.2


From 01924134017f1fcd0081a891ba2eb95613f97258 Mon Sep 17 00:00:00 2001
From 5278f6e0137d027b8f669dc5999992dac5ce77c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Mon, 27 Jul 2015 16:32:32 +0200
Subject: Haiku: disable -fno-PIE as this fails on x86_64.
@@ -2439,7 +2439,7 @@ index f42df7e..74d3ef4 100644
2.30.2


From 21968c34fecc00d38a297603c432060d8454b4d0 Mon Sep 17 00:00:00 2001
From 461bd324b37e0b0553d0b74dc0a822ea4607443a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 5 May 2016 09:03:06 +0000
Subject: fix for libstdc++/69506
@@ -2461,7 +2461,7 @@ index 4674f7b..02c8693 100644
2.30.2


From 5d7df4f5e5a264b795bb4494475a521aff1c9eb4 Mon Sep 17 00:00:00 2001
From 06acec6877043b44d275a3f3c427b89e7b7bc78b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 5 May 2016 15:52:08 +0000
Subject: rename x86_elf_aligned_common.
@@ -2488,7 +2488,7 @@ index 76ba48e..e2fa55a 100644
2.30.2


From 859d7f708f77d4dc9c72da5da6a2a796ec6c4b09 Mon Sep 17 00:00:00 2001
From 5980a8d66fde1080674aca89410da37ce112a8e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 2 May 2018 08:37:20 +0200
Subject: Enable libstdcxx_filesystem_ts for Haiku
@@ -2512,7 +2512,7 @@ index 4f37b6a..7d8fd79 100644
2.30.2


From fdf77b1df64dd3246904e03e7a80bd4aef9ed932 Mon Sep 17 00:00:00 2001
From b06ae201ddae22f2b4f81954d4d98180782a9f5c Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Fri, 12 Jul 2019 18:17:00 +0000
Subject: gcc: fix build configuration for libgcc.
@@ -2537,7 +2537,7 @@ index 26d080a..bdc2b1c 100644
2.30.2


From e77f625295263a155c7ecfde11a828c473f42456 Mon Sep 17 00:00:00 2001
From 90b6943f4ac5418f94b6751cf5a25daa8bc4bf85 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 12 May 2017 23:49:00 +0200
Subject: Haiku: regenerate configure.
@@ -3287,7 +3287,7 @@ index 5535bfa..aa15c92 100755
2.30.2


From 4af6226f7b6c94c455ec3b9bfdb95460b055ad3b Mon Sep 17 00:00:00 2001
From 068c004d09a21e772aa11e64e13e6182eb485f2d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 6 May 2021 19:15:37 +0200
Subject: Haiku: default to strict Dwarf4
@@ -3408,4 +3408,32 @@ index 587d1fb..ba1f7f5 100644
2.30.2


From d3ce0f4820e7ff5daeb74fa3b6d3b3561e302081 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 13 Oct 2021 23:41:37 +0200
Subject: linking against libssp isn't needed as it's provided by libroot

but building libssp is required to be able to merge libssp_nonshared
in libgcc.

diff --git a/gcc/config/haiku.h b/gcc/config/haiku.h
index 62e88cc..ebb29ab 100644
--- a/gcc/config/haiku.h
+++ b/gcc/config/haiku.h
@@ -210,10 +210,9 @@ Boston, MA 02111-1307, USA. */
/* Haiku headers are C++-aware (and often use C++). */
#define NO_IMPLICIT_EXTERN_C

-/* Only allow -lssp for SSP, as -lssp_nonshared is problematic in Haiku */
-#ifndef TARGET_LIBC_PROVIDES_SSP
-#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all:-lssp}"
-#endif
+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+ "|fstack-protector-strong|fstack-protector-explicit" \
+ ":-lssp_nonshared}"

/* Do not use TM clone registry in Haiku for now */
#define USE_TM_CLONE_REGISTRY 0
--
2.30.2