gcc: remove hack that breaks everything.

gcc pretended to be tinycc to workaround the fact that Haiku could not
handle a version of gcc larger than 9. However, this led to cmake
thinking that the compiler was tinycc, and disabled all optimizations in
release builds. Which in turn made webkit fail to build.

Everything that was compiled with gcc11 and cmake until now needs to be
rebuilt to have optimizations.
This commit is contained in:
Adrien Destugues
2021-11-05 21:47:37 +01:00
parent 94c4fd9391
commit 6a7f34b76a
2 changed files with 1 additions and 37 deletions

View File

@@ -5,7 +5,7 @@ HOMEPAGE="https://gcc.gnu.org/"
COPYRIGHT="1988-2021 Free Software Foundation, Inc."
LICENSE="GNU GPL v3
GNU LGPL v3"
REVISION="1"
REVISION="2"
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"

View File

@@ -3140,39 +3140,3 @@ index 326a279..51c46bb 100755
--
2.30.2
From fc70fa1aa2e4a41590724b1ef1474fd650702056 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 12 May 2021 16:35:45 +0200
Subject: patch for Haiku beta2
diff --git a/gcc/config/i386/haiku64.h b/gcc/config/i386/haiku64.h
index e2fa55a..519fd0c 100644
--- a/gcc/config/i386/haiku64.h
+++ b/gcc/config/i386/haiku64.h
@@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA. */
do \
{ \
builtin_define ("__HAIKU__"); \
+ builtin_define ("__TINYC__"); \
if (!TARGET_64BIT) \
{ \
builtin_define ("__INTEL__"); \
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
index 02c19f5..d1d5d36 100644
--- a/gcc/cp/module.cc
+++ b/gcc/cp/module.cc
@@ -233,7 +233,8 @@ Classes used:
#define MAPPED_READING 0
#define MAPPED_WRITING 0
#else
-#if HAVE_MMAP_FILE && _POSIX_MAPPED_FILES > 0
+#if HAVE_MMAP_FILE && _POSIX_MAPPED_FILES > 0 \
+ && B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_2
/* mmap, munmap. */
#define MAPPED_READING 1
#if HAVE_SYSCONF && defined (_SC_PAGE_SIZE)
--
2.30.2