|
 |
3180964 |
From 8d12e4ec8b843d59661a12a7a92bfec7e4473e0f Mon Sep 17 00:00:00 2001
|
|
|
3180964 |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
3180964 |
Date: Thu, 4 Sep 2014 15:26:58 +0200
|
|
|
3180964 |
Subject: [PATCH] No -fstack-protect-strong for gcc3_linux_aarch64/cpp2uno.cxx
|
|
|
3180964 |
vtableSlotCall
|
|
|
3180964 |
|
|
|
3180964 |
Change-Id: I52efda594d87c37c2d38c61b54f1eebcc76cdfce
|
|
|
3180964 |
---
|
|
|
3180964 |
bridges/Library_cpp_uno.mk | 9 ++++++++-
|
|
|
3180964 |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
3180964 |
|
|
|
3180964 |
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
|
|
|
3180964 |
index 33a5c00..c2e303d 100644
|
|
|
3180964 |
--- a/bridges/Library_cpp_uno.mk
|
|
|
3180964 |
+++ b/bridges/Library_cpp_uno.mk
|
|
|
3180964 |
@@ -38,7 +38,14 @@ endif
|
|
|
34e5755 |
else ifeq ($(OS)-$(CPUNAME),LINUX-AARCH64)
|
|
|
3180964 |
|
|
|
3180964 |
bridges_SELECTED_BRIDGE := gcc3_linux_aarch64
|
|
|
3180964 |
-bridge_exception_objects := abi callvirtualfunction cpp2uno uno2cpp
|
|
|
3180964 |
+bridge_exception_objects := abi callvirtualfunction uno2cpp
|
|
|
3180964 |
+
|
|
|
3180964 |
+$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno, \
|
|
|
3180964 |
+ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/cpp2uno, \
|
|
|
3180964 |
+ $(subst -fstack-protector-strong,-fstack-protector, \
|
|
|
3180964 |
+ $(gb_LinkTarget_EXCEPTIONFLAGS) \
|
|
|
3180964 |
+ $(call gb_LinkTarget__get_cxxflags,$(gb_CPPU_ENV)_uno)) \
|
|
|
3180964 |
+))
|
|
|
3180964 |
|
|
|
3180964 |
else ifeq ($(OS)-$(CPUNAME),LINUX-AXP)
|
|
|
3180964 |
|
|
|
3180964 |
--
|
|
|
3180964 |
1.9.3
|
|
|
3180964 |
|