ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-24 01:28:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gcc: update to version 6.3.0

Browse Source 
Issue #2372
This commit is contained in:
Christian Prochaska
2017-04-09 21:02:34 +02:00
committed by Christian Helmuth
parent 9f9271783e
commit 58f2088d3e
34 changed files with 417 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
repos/ports/ports/gcc.hash
View File

@ -1 +1 @@
252baf48de6641bad2af9ea82c716a4e50c1e74d
8943c53d0247a0a69fb62be66a224348170af9be

4
repos/ports/ports/gcc.port
View File

@ -1,9 +1,9 @@
LICENSE := GPLv3
VERSION := 4.9.2
VERSION := 6.3.0
DOWNLOADS := gcc.archive
URL(gcc) := ftp://ftp.fu-berlin.de/gnu/gcc/gcc-$(VERSION)/gcc-$(VERSION).tar.bz2
SHA(gcc) := 79dbcb09f44232822460d80b033c962c0237c6d8
SHA(gcc) := 928ab552666ee08eed645ff20ceb49d139205dea
SIG(gcc) := ${URL(gcc)}.sig
KEY(gcc) := GNU
DIR(gcc) := src/noux-pkg/gcc

2
repos/ports/src/lib/libc_noux/plugin.cc
View File

@ -695,7 +695,7 @@ extern "C" void sync(void)
}
extern "C" int kill(int pid, int sig)
extern "C" int kill(__pid_t pid, int sig)
{
if (verbose_signals)
log(__func__, ": pid=", pid, ", sig=", sig);

31
repos/ports/src/noux-pkg/gcc/patches/arm.patch
View File

@ -4,14 +4,24 @@ From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
gcc/config/arm/arm.h | 1 -
1 file changed, 1 deletion(-)
gcc/config/arm/arm.h | 3 +--
libgcc/config/arm/unwind-arm.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index c60d9a4..fefa7d4 100644
index ad123dd..31ccb95 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -2381,7 +2381,6 @@ extern const char *arm_rewrite_mcpu (int argc, const char **argv);
@@ -865,7 +865,7 @@ extern int arm_arch_crc;
#define EH_RETURN_STACKADJ_RTX gen_rtx_REG (SImode, ARM_EH_STACKADJ_REGNUM)
#ifndef ARM_TARGET2_DWARF_FORMAT
-#define ARM_TARGET2_DWARF_FORMAT DW_EH_PE_pcrel
+#define ARM_TARGET2_DWARF_FORMAT (DW_EH_PE_pcrel | DW_EH_PE_indirect)
#endif
/* ttype entries (the only interesting data references used)
@@ -2250,7 +2250,6 @@ extern const char *arm_rewrite_mcpu (int argc, const char **argv);
#if defined(__arm__)
extern const char *host_detect_local_cpu (int argc, const char **argv);
# define EXTRA_SPEC_FUNCTIONS \
@ -19,3 +29,16 @@ index c60d9a4..fefa7d4 100644
BIG_LITTLE_CPU_SPEC_FUNCTIONS
# define MCPU_MTUNE_NATIVE_SPECS \
diff --git a/libgcc/config/arm/unwind-arm.h b/libgcc/config/arm/unwind-arm.h
index d67383f..9812a47 100644
--- a/libgcc/config/arm/unwind-arm.h
+++ b/libgcc/config/arm/unwind-arm.h
@@ -49,7 +49,7 @@ extern "C" {
return 0;
#if (defined(linux) && !defined(__uClinux__)) || defined(__NetBSD__) \
- || defined(__FreeBSD__)
+ || defined(__FreeBSD__) || 1
/* Pc-relative indirect. */
#define _GLIBCXX_OVERRIDE_TTYPE_ENCODING (DW_EH_PE_pcrel | DW_EH_PE_indirect)
tmp += ptr;

117
repos/ports/src/noux-pkg/gcc/patches/config.patch
View File

@ -1,8 +1,20 @@
config.patch
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
gcc/config.gcc | 2 +-
gcc/config/arm/unknown-elf.h | 16 ++++++++++++++++
gcc/config/i386/x86-64.h | 23 +++++++++++++++++++++--
libgcc/config.host | 12 ++++++++++--
4 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/gcc/config.gcc b/gcc/config.gcc
index b7ebc07..5acf469 100644
index 1d5b23f..1840148 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1060,7 +1060,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
@@ -1119,7 +1119,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
case ${target} in
arm*-*-eabi*)
tm_file="$tm_file newlib-stdint.h"
@ -11,29 +23,27 @@ index b7ebc07..5acf469 100644
use_gcc_stdint=wrap
;;
arm*-*-rtems*)
@@ -1969,7 +1969,7 @@ riscv*-*-linux*) # Linux RISC-V
;;
riscv*-*-elf*) # Linux RISC-V
tm_file="elfos.h newlib-stdint.h ${tm_file} riscv/elf.h"
- tmake_file="${tmake_file} riscv/t-elf"
+ tmake_file="${tmake_file} riscv/t-elf t-slibgcc"
gnu_ld=yes
gas=yes
gcc_cv_initfini_array=yes
@@ -2915,7 +2915,7 @@ i[34567]86-*-linux* | x86_64-*-linux*)
tmake_file="${tmake_file} i386/t-pmm_malloc i386/t-i386"
;;
i[34567]86-*-* | x86_64-*-*)
- tmake_file="${tmake_file} i386/t-gmm_malloc i386/t-i386"
+ tmake_file="${tmake_file} i386/t-gmm_malloc i386/t-i386 t-slibgcc"
;;
powerpc*-*-* | rs6000-*-*)
tm_file="${tm_file} rs6000/option-defaults.h"
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -671,11 +671,11 @@
#define MAX_FIXED_MODE_SIZE 64
#ifndef SIZE_TYPE
-#define SIZE_TYPE (TARGET_AAPCS_BASED ? "unsigned int" : "long unsigned int")
+#define SIZE_TYPE (TARGET_AAPCS_BASED ? "long unsigned int" : "long unsigned int")
#endif
#ifndef PTRDIFF_TYPE
-#define PTRDIFF_TYPE (TARGET_AAPCS_BASED ? "int" : "long int")
+#define PTRDIFF_TYPE (TARGET_AAPCS_BASED ? "long int" : "long int")
#endif
/* AAPCS requires that structure alignment is affected by bitfields. */
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
index ec6f9a4..579172d 100644
index fafe057..8bd23e0 100644
--- a/gcc/config/arm/unknown-elf.h
+++ b/gcc/config/arm/unknown-elf.h
@@ -94,3 +94,19 @@
@@ -98,3 +98,19 @@
which will depend on abort, which is defined in libc. */
#undef LINK_GCC_C_SEQUENCE_SPEC
#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L --end-group"
@ -54,9 +64,22 @@ index ec6f9a4..579172d 100644
+/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57699 */
+#define NO_IMPLICIT_EXTERN_C
diff --git a/gcc/config/i386/x86-64.h b/gcc/config/i386/x86-64.h
index 16fc685..85b07bb 100644
index 204f128..8f590fe 100644
--- a/gcc/config/i386/x86-64.h
+++ b/gcc/config/i386/x86-64.h
@@ -37,10 +37,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define MCOUNT_NAME "mcount"
#undef SIZE_TYPE
-#define SIZE_TYPE (TARGET_LP64 ? "long unsigned int" : "unsigned int")
+#define SIZE_TYPE (TARGET_LP64 ? "long unsigned int" : "long unsigned int")
#undef PTRDIFF_TYPE
-#define PTRDIFF_TYPE (TARGET_LP64 ? "long int" : "int")
+#define PTRDIFF_TYPE (TARGET_LP64 ? "long int" : "long int")
#undef WCHAR_TYPE
#define WCHAR_TYPE "int"
@@ -106,3 +106,22 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#undef TARGET_SECTION_TYPE_FLAGS
@ -80,34 +103,11 @@ index 16fc685..85b07bb 100644
+/* Don't assume anything about the header files. */
+/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57699 */
+#define NO_IMPLICIT_EXTERN_C
diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
index 4533cff..1f78497 100644
--- a/gcc/config/riscv/riscv.h
+++ b/gcc/config/riscv/riscv.h
@@ -171,14 +171,11 @@ along with GCC; see the file COPYING3. If not see
%(subtarget_asm_spec)"
/* Extra switches sometimes passed to the linker. */
-
-#ifndef LINK_SPEC
+#undef LINK_SPEC
#define LINK_SPEC "\
-%{!T:-dT riscv.ld} \
-%{m64:-melf64lriscv} \
-%{m32:-melf32lriscv} \
-%{shared}"
-#endif /* LINK_SPEC defined */
+-melf64lriscv \
+%{shared:-shared} \
+%{!static:--eh-frame-hdr}"
/* This macro defines names of additional specifications to put in the specs
that can be used in various specifications like CC1_SPEC. Its definition
diff --git a/libgcc/config.host b/libgcc/config.host
index 8a30368..83b5dba 100644
index 124f2ce..7b25b79 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -300,7 +300,7 @@ case ${host} in
@@ -309,7 +309,7 @@ case ${host} in
tmake_file=t-vxworks
;;
*-*-elf)
@ -116,7 +116,7 @@ index 8a30368..83b5dba 100644
;;
esac
@@ -387,8 +387,12 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
@@ -414,8 +414,12 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
tm_file="$tm_file arm/bpabi-lib.h"
case ${host} in
arm*-*-eabi* | arm*-*-rtems*)
@ -124,31 +124,20 @@ index 8a30368..83b5dba 100644
+ # The 't-eh-dw2-dip' tmake file is needed to let the tool chain use 'unwind-dw2-fde-dip.c',
+ # needed for the exception handling on Genode in the presence of shared libraries.
+ tmake_file="${tmake_file} t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
tmake_file="${tmake_file} arm/t-bpabi"
tmake_file="${tmake_file} arm/t-bpabi t-crtfm"
- extra_parts="crtbegin.o crtend.o crti.o crtn.o"
+ extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
;;
arm*-*-symbianelf*)
tmake_file="${tmake_file} arm/t-symbian t-slibgcc-nolc-override"
@@ -546,6 +550,10 @@ i[34567]86-*-elf*)
@@ -585,6 +589,10 @@ i[34567]86-*-elf*)
tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic"
;;
x86_64-*-elf*)
x86_64-*-elf* | x86_64-*-rtems*)
+ # The 't-slibgcc' tmake file is needed to have libgcc_eh.a built.
+ # The 't-eh-dw2-dip' tmake file is needed to let the tool chain use 'unwind-dw2-fde-dip.c',
+ # needed for the exception handling on Genode in the presence of shared libraries.
+ tmake_file="$tmake_file t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic"
;;
i[34567]86-*-freebsd*)
@@ -1014,8 +1022,8 @@ riscv*-*-linux*)
extra_parts="$extra_parts crtbegin.o crtend.o crti.o crtn.o crtendS.o crtbeginT.o"
;;
riscv*-*-*)
- tmake_file="${tmake_file} riscv/t-fpbit riscv/t-dpbit riscv/t-elf"
- extra_parts="$extra_parts crtbegin.o crtend.o crti.o crtn.o"
+ tmake_file="${tmake_file} riscv/t-fpbit riscv/t-dpbit riscv/t-elf t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
+ extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
;;
rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
md_unwind_header=rs6000/aix-unwind.h
i[34567]86-*-dragonfly*)

33
repos/ports/src/noux-pkg/gcc/patches/gnu_inline_mismatch.patch
View File

@ -1,33 +0,0 @@
Required for building with newer gcc
See https://gcc.gnu.org/ml/gcc-patches/2015-08/msg00375.html
--
diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
index 68acd3d..953262f 100644
--- a/gcc/cp/cfns.gperf
+++ b/gcc/cp/cfns.gperf
@@ -22,6 +22,9 @@ __inline
static unsigned int hash (const char *, unsigned int);
#ifdef __GNUC__
__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
#endif
const char * libc_name_p (const char *, unsigned int);
%}
diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
index 1c6665d..6d00c0e 100644
--- a/gcc/cp/cfns.h
+++ b/gcc/cp/cfns.h
@@ -53,6 +53,9 @@ __inline
static unsigned int hash (const char *, unsigned int);
#ifdef __GNUC__
__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
#endif
const char * libc_name_p (const char *, unsigned int);
/* maximum key range = 391, duplicates = 0 */

4
repos/ports/src/noux-pkg/gcc/patches/go_libbacktrace.patch
View File

@ -8,7 +8,7 @@ Remove the dependency on libbacktrace, which needs a libc.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/go/config-lang.in b/gcc/go/config-lang.in
index c33e218..ca2b3b1 100644
index 8e27ade..b326557 100644
--- a/gcc/go/config-lang.in
+++ b/gcc/go/config-lang.in
@@ -28,7 +28,7 @@ language="go"
@ -17,6 +17,6 @@ index c33e218..ca2b3b1 100644
-target_libs="target-libgo target-libffi target-libbacktrace"
+target_libs="target-libgo target-libffi"
lang_dirs="gotools"
# The Go frontend is written in C++, so we need to build the C++
# compiler during stage 1.

4
repos/ports/src/noux-pkg/gcc/patches/host_target_combination.patch
View File

@ -14,10 +14,10 @@ compiler as much as possible.
1 file changed, 1 deletion(-)
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index 15d876e..e026e9a 100644
index ece1256..a73ce57 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -278,7 +278,6 @@ case "${host}" in
@@ -271,7 +271,6 @@ case "${host}" in
AC_DEFINE(HAVE_TANHF)
;;
*)

28
repos/ports/src/noux-pkg/gcc/patches/libgcc_s.patch
View File

@ -4,30 +4,34 @@ From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
libgcc/Makefile.in | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
libgcc/Makefile.in | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index e86e98d..ca2275d 100644
index f09b39b..cabc562 100644
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -907,7 +907,7 @@ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
@@ -913,7 +913,11 @@ all: libunwind.a
endif
ifeq ($(enable_shared),yes)
-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
+ifeq ($(GENODE),yes)
+all: libgcc_eh.a
+else
all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
+endif
ifneq ($(LIBUNWIND),)
all: libunwind$(SHLIB_EXT)
endif
@@ -1090,10 +1090,6 @@ install-shared:
libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
@@ -1115,9 +1119,11 @@ install-shared:
chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
- $(subst @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_base_name@,libgcc_s,$(subst \
- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-
+ifneq ($(GENODE),yes)
$(subst @multilib_dir@,$(MULTIDIR),$(subst \
@shlib_base_name@,libgcc_s,$(subst \
@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
+endif
install-leaf: $(install-shared) $(install-libunwind)
$(mkinstalldirs) $(DESTDIR)$(inst_libdir)

33
repos/ports/src/noux-pkg/gcc/patches/libstdcxx_without_libc.patch
View File

@ -4,41 +4,42 @@ From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
libstdc++-v3/configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
libstdc++-v3/configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index 3e8b9c5..1543c25 100644
index fdc4622..ed8a338 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -89,9 +89,9 @@ CXXFLAGS="$save_CXXFLAGS"
@@ -89,9 +89,11 @@ CXXFLAGS="$save_CXXFLAGS"
GLIBCXX_CONFIGURE
# Libtool setup.
-if test "x${with_newlib}" != "xyes"; then
- AC_LIBTOOL_DLOPEN
-fi
+#if test "x${with_newlib}" != "xyes"; then
+# AC_LIBTOOL_DLOPEN
+#fi
+if test "$is_hosted" = yes; then
if test "x${with_newlib}" != "xyes"; then
AC_LIBTOOL_DLOPEN
fi
+fi
AM_PROG_LIBTOOL
ACX_LT_HOST_FLAGS
AC_SUBST(enable_shared)
@@ -205,7 +205,7 @@ AC_CHECK_HEADERS(fenv.h complex.h)
@@ -209,7 +211,9 @@ AC_CHECK_HEADERS(fenv.h complex.h)
GLIBCXX_CHECK_C99_TR1
# For the EOF, SEEK_CUR, and SEEK_END integer constants.
-GLIBCXX_COMPUTE_STDIO_INTEGER_CONSTANTS
+#GLIBCXX_COMPUTE_STDIO_INTEGER_CONSTANTS
+if test "$is_hosted" = yes; then
GLIBCXX_COMPUTE_STDIO_INTEGER_CONSTANTS
+fi
# For gettimeofday support.
GLIBCXX_CHECK_GETTIMEOFDAY
@@ -358,7 +358,7 @@ GCC_CHECK_UNWIND_GETIPINFO
@@ -362,7 +366,9 @@ GCC_CHECK_UNWIND_GETIPINFO
GCC_LINUX_FUTEX([AC_DEFINE(HAVE_LINUX_FUTEX, 1, [Define if futex syscall is available.])])
-GCC_HEADER_STDINT(include/gstdint.h)
+#GCC_HEADER_STDINT(include/gstdint.h)
+if test "$is_hosted" = yes; then
GCC_HEADER_STDINT(include/gstdint.h)
+fi
GLIBCXX_ENABLE_SYMVERS([yes])
AC_SUBST(libtool_VERSION)

62
repos/ports/src/noux-pkg/gcc/patches/libsupcxx_demangle.patch
View File

@ -6,14 +6,14 @@ From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
include/libiberty.h | 4 ++++
libiberty/cp-demangle.c | 4 +++-
libstdc++-v3/libsupc++/Makefile.in | 10 +++++-----
3 files changed, 12 insertions(+), 6 deletions(-)
libstdc++-v3/libsupc++/Makefile.in | 19 ++++++++++++++++++-
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/include/libiberty.h b/include/libiberty.h
index 78c42eb..4fcf284 100644
index a9c885f..a1479af 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -47,7 +47,11 @@ extern "C" {
@@ -46,7 +46,11 @@ extern "C" {
/* Get a definition for va_list. */
#include <stdarg.h>
@ -26,10 +26,10 @@ index 78c42eb..4fcf284 100644
/* If the OS supports it, ensure that the supplied stream is setup to
avoid any multi-threaded locking. Otherwise leave the FILE pointer
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 3d5d33e..e5f542f 100644
index 78e5978..d9da7a4 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -103,7 +103,9 @@
@@ -107,7 +107,9 @@
#include "config.h"
#endif
@ -39,7 +39,7 @@ index 3d5d33e..e5f542f 100644
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@ -5875,7 +5877,7 @@ d_demangle (const char *mangled, int options, size_t *palc)
@@ -6187,7 +6189,7 @@ d_demangle (const char *mangled, int options, size_t *palc)
return dgs.buf;
}
@ -49,38 +49,52 @@ index 3d5d33e..e5f542f 100644
extern char *__cxa_demangle (const char *, char *, size_t *, int *);
diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 88b237e..f861d29 100644
index f3648ac..169b927 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -104,7 +104,7 @@ am__objects_1 = array_type_info.lo atexit_arm.lo atexit_thread.lo \
new_opv.lo new_opvnt.lo pbase_type_info.lo pmem_type_info.lo \
pointer_type_info.lo pure.lo si_class_type_info.lo tinfo.lo \
tinfo2.lo vec.lo vmi_class_type_info.lo vterminate.lo
-@GLIBCXX_HOSTED_TRUE@am__objects_2 = cp-demangle.lo
@@ -128,7 +128,11 @@ am__objects_1 = array_type_info.lo atexit_arm.lo atexit_thread.lo \
pbase_type_info.lo pmem_type_info.lo pointer_type_info.lo \
pure.lo si_class_type_info.lo tinfo.lo tinfo2.lo vec.lo \
vmi_class_type_info.lo vterminate.lo
+ifeq ($(GENODE),yes)
+am__objects_2 = cp-demangle.lo
@ENABLE_VTABLE_VERIFY_TRUE@am__objects_3 = vtv_stubs.lo
+else
@GLIBCXX_HOSTED_TRUE@am__objects_2 = cp-demangle.lo
+endif
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@am__objects_3 = \
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@ vtv_stubs.lo
am_libsupc___la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3)
@@ -367,8 +367,8 @@ bits_HEADERS = \
@@ -398,8 +402,14 @@ bits_HEADERS = \
exception_defines.h exception_ptr.h hash_bytes.h nested_exception.h
headers = $(std_HEADERS) $(bits_HEADERS)
-@GLIBCXX_HOSTED_TRUE@c_sources = \
-@GLIBCXX_HOSTED_TRUE@ cp-demangle.c
+
+ifeq ($(GENODE),yes)
+c_sources = \
+ cp-demangle.c
+ cp-demangle.c
+else
@GLIBCXX_HOSTED_TRUE@c_sources = \
-@GLIBCXX_HOSTED_TRUE@ cp-demangle.c
+@GLIBCXX_HOSTED_TRUE@ cp-demangle.c
+endif
sources = \
array_type_info.cc \
@@ -801,9 +801,9 @@ cp-demangle.c:
@@ -840,10 +850,17 @@ uninstall-am: uninstall-bitsHEADERS uninstall-stdHEADERS \
cp-demangle.c:
rm -f $@
$(LN_S) $(toplevel_srcdir)/libiberty/cp-demangle.c $@
cp-demangle.lo: cp-demangle.c
- $(LTCOMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
+ifeq ($(GENODE),yes)
+cp-demangle.lo: cp-demangle.c
+ $(LTCOMPILE) -DGENODE -Wno-error -c $<
cp-demangle.o: cp-demangle.c
- $(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
+cp-demangle.o: cp-demangle.c
+ $(C_COMPILE) -DGENODE -Wno-error -c $<
+else
cp-demangle.lo: cp-demangle.c
$(LTCOMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
cp-demangle.o: cp-demangle.c
$(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
+endif
# Use special rules for the C++11 sources so that the proper flags are passed.
bad_array_length.lo: bad_array_length.cc

4
repos/ports/src/noux-pkg/gcc/patches/misc.patch
View File

@ -9,7 +9,7 @@ Changes lacking documentation
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgcc/config/t-libunwind-elf b/libgcc/config/t-libunwind-elf
index beacf04..4556eb1 100644
index cfde66e..aacf57c 100644
--- a/libgcc/config/t-libunwind-elf
+++ b/libgcc/config/t-libunwind-elf
@@ -32,7 +32,7 @@ SHLIBUNWIND_SONAME = @shlib_base_name@.so.$(SHLIBUNWIND_SOVERSION)
@ -22,7 +22,7 @@ index beacf04..4556eb1 100644
if [ -f $(SHLIB_DIR)/$(SHLIBUNWIND_SONAME) ]; then \
mv -f $(SHLIB_DIR)/$(SHLIBUNWIND_SONAME) \
diff --git a/libgcc/config/t-slibgcc b/libgcc/config/t-slibgcc
index 1696fe8..0beb525 100644
index 8c5f890..f2285a3 100644
--- a/libgcc/config/t-slibgcc
+++ b/libgcc/config/t-slibgcc
@@ -26,7 +26,7 @@ SHLIB_MAP = @shlib_map_file@

4
repos/ports/src/noux-pkg/gcc/patches/no_short_enums.patch
View File

@ -8,10 +8,10 @@ Ensure -fno-short-enums as default.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 439a4de..948a369 100644
index f0fde72..4442c66 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -28348,7 +28348,7 @@ arm_promote_function_mode (const_tree type ATTRIBUTE_UNUSED,
@@ -26418,7 +26418,7 @@ arm_promote_function_mode (const_tree type ATTRIBUTE_UNUSED,
static bool
arm_default_short_enums (void)
{

76
repos/ports/src/noux-pkg/gcc/patches/noux_build.patch
View File

@ -1,24 +1,23 @@
build.patch
noux_build.patch
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
Makefile.def | 1 +
Makefile.tpl | 6 ++++++
Makefile.tpl | 7 +++++++
fixincludes/Makefile.in | 5 +++--
gcc/Makefile.in | 6 +++---
gcc/config.host | 2 +-
gcc/configure.ac | 4 ++--
gcc/gengtype-lex.c | 1 -
libgcc/Makefile.in | 2 +-
8 files changed, 17 insertions(+), 10 deletions(-)
7 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Makefile.def b/Makefile.def
index 90d9653..642f637 100644
index ea8453e..201480f 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -263,6 +263,7 @@ flags_to_pass = { flag= GOCFLAGS_FOR_TARGET ; };
@@ -288,6 +288,7 @@ flags_to_pass = { flag= GOCFLAGS_FOR_TARGET ; };
flags_to_pass = { flag= LD_FOR_TARGET ; };
flags_to_pass = { flag= LIPO_FOR_TARGET ; };
flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
@ -27,7 +26,7 @@ index 90d9653..642f637 100644
flags_to_pass = { flag= LIBCXXFLAGS_FOR_TARGET ; };
flags_to_pass = { flag= NM_FOR_TARGET ; };
diff --git a/Makefile.tpl b/Makefile.tpl
index e81c095..92c10b8 100644
index 6b2eb6a..a89f815 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -156,6 +156,8 @@ BUILD_EXPORTS = \
@ -39,7 +38,15 @@ index e81c095..92c10b8 100644
GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
GOC="$(GOC_FOR_BUILD)"; export GOC; \
@@ -194,6 +196,8 @@ HOST_EXPORTS = \
@@ -172,6 +174,7 @@ BUILD_EXPORTS = \
# built for the build system to override those in BASE_FLAGS_TO_PASS.
EXTRA_BUILD_FLAGS = \
CFLAGS="$(CFLAGS_FOR_BUILD)" \
+ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
LDFLAGS="$(LDFLAGS_FOR_BUILD)"
# This is the list of directories to built for the host system.
@@ -194,6 +197,8 @@ HOST_EXPORTS = \
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
CXX="$(CXX)"; export CXX; \
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
@ -48,7 +55,7 @@ index e81c095..92c10b8 100644
GCJ="$(GCJ)"; export GCJ; \
GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
GOC="$(GOC)"; export GOC; \
@@ -278,6 +282,7 @@ BASE_TARGET_EXPORTS = \
@@ -281,6 +286,7 @@ BASE_TARGET_EXPORTS = \
CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
@ -56,16 +63,16 @@ index e81c095..92c10b8 100644
CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
@@ -644,6 +649,7 @@ EXTRA_TARGET_FLAGS = \
'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
@@ -660,6 +666,7 @@ EXTRA_TARGET_FLAGS = \
-B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
$$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
+ 'CPPFLAGS=$$(CPPFLAGS_FOR_TARGET)' \
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
index ce850ff..437d3f4 100644
index 5dc1b23..57e6afa 100644
--- a/fixincludes/Makefile.in
+++ b/fixincludes/Makefile.in
@@ -28,6 +28,7 @@ STAMP = echo timestamp >
@ -91,19 +98,19 @@ index ce850ff..437d3f4 100644
$(AF): $(FIXOBJ) $(LIBIBERTY)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 2a4475b..98c6235 100644
index 13d0d1b..88f3ef5 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -748,7 +748,7 @@ BUILD_LINKERFLAGS = $(BUILD_CXXFLAGS)
# Native linker and preprocessor flags. For x-fragment overrides.
BUILD_LDFLAGS=@BUILD_LDFLAGS@
@@ -779,7 +779,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@
BUILD_NO_PIE_FLAG = @BUILD_NO_PIE_FLAG@
BUILD_LDFLAGS += $(BUILD_NO_PIE_FLAG)
BUILD_CPPFLAGS= -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
- -I$(srcdir)/../include @INCINTL@ $(CPPINC) $(CPPFLAGS)
+ -I$(srcdir)/../include @INCINTL@ $(CPPINC) $(INCLUDES) $(CPPFLAGS_FOR_BUILD)
# Actual name to use when installing a native compiler.
GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
@@ -1019,8 +1019,8 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
@@ -1031,8 +1031,8 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
# How to link with both our special library facilities
# and the system's installed libraries.
@ -111,27 +118,27 @@ index 2a4475b..98c6235 100644
- $(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS)
+LIBS = libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \
+ $(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS) @LIBS@
BACKENDLIBS = $(CLOOGLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \
BACKENDLIBS = $(ISLLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \
$(ZLIB)
# Any system libraries needed just for GNAT.
diff --git a/gcc/config.host b/gcc/config.host
index 1196ec5..414d5ff 100644
index 44f2f56..961dc0f 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -99,7 +99,7 @@ case ${host} in
esac
case ${host} in
- arm*-*-linux*)
@@ -107,7 +107,7 @@ case ${host} in
;;
esac
;;
- arm*-*-freebsd* | arm*-*-linux*)
+ arm*-*-*)
case ${target} in
arm*-*-*)
host_extra_gcc_objs="driver-arm.o"
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 3ee1d67..004a185 100644
index 4c65d44..8a9a93c 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1521,8 +1521,8 @@ else
@@ -1688,8 +1688,8 @@ else
# system.h from including gmp.h.
CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
@ -143,7 +150,7 @@ index 3ee1d67..004a185 100644
--enable-languages=${enable_languages-all} \
--target=$target_alias --host=$build_alias --build=$build_alias
diff --git a/gcc/gengtype-lex.c b/gcc/gengtype-lex.c
index 244dd0d..ee29879 100644
index dcf6983..7a96f93 100644
--- a/gcc/gengtype-lex.c
+++ b/gcc/gengtype-lex.c
@@ -1,4 +1,3 @@
@ -151,16 +158,3 @@ index 244dd0d..ee29879 100644
#line 2 "gengtype-lex.c"
#line 4 "gengtype-lex.c"
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index db9b1b2..594fc6d 100644
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -225,7 +225,7 @@ endif
LIBGCC2_DEBUG_CFLAGS = -g
LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \
$(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \
- -fbuilding-libgcc -fno-stack-protector \
+ -fno-stack-protector \
$(INHIBIT_LIBC_CFLAGS)
# Additional options to use when compiling libgcc2.a.

2
repos/ports/src/noux-pkg/gcc/patches/prefer_pic.patch
View File

@ -13,7 +13,7 @@ nothing rather than '-prefer-pic'.
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index 1de0f6c..3e8b9c5 100644
index 9e19e99..fdc4622 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -115,16 +115,16 @@ fi

3
repos/ports/src/noux-pkg/gcc/patches/series
View File

@ -1,5 +1,3 @@
riscv_files.patch
riscv.patch
config.patch
misc.patch
no_short_enums.patch
@ -10,6 +8,5 @@ libsupcxx_demangle.patch
libgcc_s.patch
go_libbacktrace.patch
target_libbacktrace.patch
gnu_inline_mismatch.patch
noux_build.patch
arm.patch

4
repos/ports/src/noux-pkg/gcc/patches/target_libbacktrace.patch
View File

@ -8,10 +8,10 @@ Don't build libbacktrace, which needs a libc.
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 27ee905..8174460 100644
index 74bf58a..dbfaf4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,6 @@ libgcj="target-libffi \
@@ -151,7 +151,6 @@ libgcj="target-libffi \
# the host libraries and the host tools (which may be a cross compiler)
# Note that libiberty is not a target library.
target_libraries="target-libgcc \

2
repos/ports/src/noux-pkg/gcc/target.inc
View File

@ -31,7 +31,7 @@ ENV += CFLAGS_FOR_TARGET='-I$(BASE_DIR)/../../tool -DUSE_PT_GNU_EH_FRAME -Dinhib
# libsupc++
ENV += CXXFLAGS_FOR_TARGET='-fPIC'
MAKE_ENV += MULTILIB_OPTIONS="m64/m32" MULTILIB_DIRNAMES="64 32"
MAKE_ENV += GENODE="yes"
#
# We link libraries to the final binaries using the 'LIBS' variable. But

2
repos/ports/src/noux-pkg/gcc_x86/target.mk
View File

@ -4,4 +4,6 @@ GCC_TARGET = x86_64-pc-elf
# cross-compiling does not work yet
REQUIRES = x86
MAKE_ENV += MULTILIB_OPTIONS="m64/m32" MULTILIB_DIRNAMES="64 32"
include $(PRG_DIR)/../gcc/target.inc