[patch] add GNU-stack marking to asm, and change 'new' to call to rtl_allocateMemory in cpp2uno.cxx for linux intel

linux-intel-nx.diff (text/plain), 1.35 KB, created by Kevin F. Quinn (RETIRED) on 2006-01-29 04:53:09 UTC

	Add marking to call.o indicating it does not need executable stack,
	and change use of 'new' into call to rtl_allocateMemory in order to
	obtain executable heap properly; necessary on x86 with PaX or Execshield.

--- bridges/source/cpp_uno/gcc3_linux_intel/call.s.orig	2006-01-29 10:05:22.000000000 +0100
+++ bridges/source/cpp_uno/gcc3_linux_intel/call.s	2006-01-29 10:06:15.000000000 +0100
@@ -265,3 +265,5 @@
     .uleb128 5
     .align 4
 .LEFDEc:
+
+.section .note.GNU-stack,"",@progbits
--- bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx.orig	2006-01-29 12:20:02.000000000 +0100
+++ bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	2006-01-29 13:16:28.000000000 +0100
@@ -37,6 +37,7 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
+#include <rtl/alloc.h>
 
 #include "bridges/cpp_uno/shared/bridge.hxx"
 #include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
@@ -423,8 +424,8 @@
 char * bridges::cpp_uno::shared::VtableFactory::createBlock(
     sal_Int32 slotCount, void *** slots)
 {
-    char * block = new char[
-        (slotCount + 2) * sizeof (void *) + slotCount * codeSnippetSize];
+    char * block = (char *)::rtl_allocateMemory(
+        (slotCount + 2) * sizeof (void *) + slotCount * codeSnippetSize);
     *slots = mapBlockToVtable(block);
     (*slots)[-2] = 0;
     (*slots)[-1] = 0;