0001-Kill-compatibility-bits.patch 1.8 KB

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