[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

 external/nss/asan.patch.1 |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 58a84aa21694bf15dd234e5f8bac57c6ffc44b13
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Aug 30 08:43:48 2017 +0200

    Update external/nss/asan.patch.1
    
    ...after c6df07f905cd9562132b06e44f90b0479b250f7a "nss: Upgrade to release
    3.31.1 and update patches"
    
    Change-Id: I0f18659ee65d9b917377ef75e94f3b9fb8ece58e

diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
index 0685adb1dc4b..6acbb04d233d 100644
--- a/external/nss/asan.patch.1
+++ b/external/nss/asan.patch.1
@@ -1,12 +1,12 @@
 diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
 --- nss.org/nss/coreconf/Linux.mk	2014-05-06 04:36:01.817838877 +0200
 +++ nss/nss/coreconf/Linux.mk	2014-05-06 04:37:25.387835456 +0200
-@@ -158,7 +158,7 @@
+@@ -146,7 +146,7 @@
  # we don't use -z defs there.
  # Also, -z defs conflicts with Address Sanitizer, which emits relocations
  # against the libsanitizer runtime built into the main executable.
 -ZDEFS_FLAG		= -Wl,-z,defs
 +ZDEFS_FLAG		=
- ifneq ($(USE_ASAN),1)
- DSO_LDOPTS             += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
- endif
+ DSO_LDOPTS      += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
+ LDFLAGS			+= $(ARCHFLAG) -z noexecstack
+