From 6fb237714b2bea61ccd36bfb345e8ca6043b6068 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 15 Jun 2019 20:44:57 -0400 Subject: [PATCH] gcc: Change ARM typeinfo behavior to match other architectures. For all other architectures, these lines were removed in btrev39570. For some reason, ARM was missed. Now we rectify that. --- gcc/gcc/config/arm/haiku.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gcc/gcc/config/arm/haiku.h b/gcc/gcc/config/arm/haiku.h index f0c0d63..d5a4c0d 100644 --- a/gcc/gcc/config/arm/haiku.h +++ a/gcc/gcc/config/arm/haiku.h @@ -45,7 +45,6 @@ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6 /* Now we define the strings used to build the spec file. */ -/* interestingly, bpabi defines __GXX_TYPEINFO_EQUALITY_INLINE=0 too as we do. */ #undef TARGET_OS_CPP_BUILTINS #define TARGET_OS_CPP_BUILTINS() \ @@ -58,12 +57,6 @@ builtin_define ("__cdecl=__attribute__((__cdecl__))"); \ builtin_define ("__STDC_ISO_10646__=201103L"); \ builtin_assert ("system=haiku"); \ - /* Haiku apparently doesn't support merging of symbols across shared \ - object boundaries. Hence we need to explicitly specify that \ - type_infos are not merged, so that they get compared by name \ - instead of by pointer. */ \ - builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \ - /*builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); done in bpabi: */\ TARGET_BPABI_CPP_BUILTINS(); \ } \ while (0) -- gitore 0.2.1