1 From e180a4085d8d2f82a05f037e465708cfc16bd2bf Mon Sep 17 00:00:00 2001
2 From: Gustavo Zacarias <gustavo@zacarias.com.ar>
3 Date: Tue, 14 Jun 2016 20:31:12 -0300
4 Subject: [PATCH] Kill compatibility bits
6 Kill ABI compatibility bits, we don't need them.
7 Fixes build failures on non-ELF targets.
9 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
11 pcrecpp.cc | 16 ----------------
12 1 file changed, 16 deletions(-)
14 diff --git a/pcrecpp.cc b/pcrecpp.cc
15 index d09c9ab..6910db0 100644
18 @@ -58,22 +58,6 @@ static const int kVecSize = (1 + kMaxArgs) * 3; // results + PCRE workspace
19 // Special object that stands-in for no argument
20 Arg RE::no_arg((void*)NULL);
22 -// This is for ABI compatibility with old versions of pcre (pre-7.6),
23 -// which defined a global no_arg variable instead of putting it in the
24 -// RE class. This works on GCC >= 3, at least. It definitely works
25 -// for ELF, but may not for other object formats (Mach-O, for
26 -// instance, does not support aliases.) We could probably have a more
27 -// inclusive test if we ever needed it. (Note that not only the
28 -// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are
30 -#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) && !defined(__INTEL_COMPILER)
31 -# define ULP_AS_STRING(x) ULP_AS_STRING_INTERNAL(x)
32 -# define ULP_AS_STRING_INTERNAL(x) #x
33 -# define USER_LABEL_PREFIX_STR ULP_AS_STRING(__USER_LABEL_PREFIX__)
35 - __attribute__((alias(USER_LABEL_PREFIX_STR "_ZN7pcrecpp2RE6no_argE")));
38 // If a regular expression has no error, its error_ field points here
39 static const string empty_string;