[Boost-commit] svn:boost r85162 - in branches/release: boost/context boost/context/detail libs/context libs/context/build libs/context/example libs/context/src/asm

Subject: [Boost-commit] svn:boost r85162 - in branches/release: boost/context boost/context/detail libs/context libs/context/build libs/context/example libs/context/src/asm
From: oliver.kowalke_at_[hidden]
Date: 2013-07-26 11:24:15

Author: olli
Date: 2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)
New Revision: 85162
URL: http://svn.boost.org/trac/boost/changeset/85162

Log:
context: merge from trunk

Properties modified: 
   branches/release/boost/context/   (props changed)
   branches/release/libs/context/   (props changed)
Text files modified: 
   branches/release/boost/context/detail/config.hpp                  |    16 ++++++----------                        
   branches/release/libs/context/build/Jamfile.v2                    |     5 +++--                                   
   branches/release/libs/context/example/Jamfile.v2                  |     1 -                                       
   branches/release/libs/context/src/asm/jump_arm_aapcs_elf_gas.S    |     3 +++                                     
   branches/release/libs/context/src/asm/jump_i386_sysv_elf_gas.S    |     3 +++                                     
   branches/release/libs/context/src/asm/jump_mips32_o32_elf_gas.S   |     3 +++                                     
   branches/release/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S   |     3 +++                                     
   branches/release/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S   |     3 +++                                     
   branches/release/libs/context/src/asm/jump_sparc64_sysv_elf_gas.S |     3 +++                                     
   branches/release/libs/context/src/asm/jump_sparc_sysv_elf_gas.S   |     3 +++                                     
   branches/release/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S  |     3 +++                                     
   branches/release/libs/context/src/asm/make_arm_aapcs_elf_gas.S    |     3 +++                                     
   branches/release/libs/context/src/asm/make_i386_sysv_elf_gas.S    |     3 +++                                     
   branches/release/libs/context/src/asm/make_mips32_o32_elf_gas.S   |     3 +++                                     
   branches/release/libs/context/src/asm/make_ppc32_sysv_elf_gas.S   |     3 +++                                     
   branches/release/libs/context/src/asm/make_ppc64_sysv_elf_gas.S   |     3 +++                                     
   branches/release/libs/context/src/asm/make_sparc64_sysv_elf_gas.S |     3 +++                                     
   branches/release/libs/context/src/asm/make_sparc_sysv_elf_gas.S   |     3 +++                                     
   branches/release/libs/context/src/asm/make_x86_64_sysv_elf_gas.S  |     2 ++                                      
   19 files changed, 56 insertions(+), 13 deletions(-)

Modified: branches/release/boost/context/detail/config.hpp
==============================================================================
--- branches/release/boost/context/detail/config.hpp	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/boost/context/detail/config.hpp	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -14,16 +14,12 @@
 # undef BOOST_CONTEXT_DECL
 #endif
 
-#if defined(BOOST_HAS_DECLSPEC)
-# if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CONTEXT_DYN_LINK)
-#  if ! defined(BOOST_DYN_LINK)
-#   define BOOST_DYN_LINK
-#  endif
-#  if defined(BOOST_CONTEXT_SOURCE)
-#   define BOOST_CONTEXT_DECL BOOST_SYMBOL_EXPORT
-#  else 
-#   define BOOST_CONTEXT_DECL BOOST_SYMBOL_IMPORT
-#  endif
+#if (defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CONTEXT_DYN_LINK) ) && ! defined(BOOST_CONTEXT_STATIC_LINK)
+# if defined(BOOST_CONTEXT_SOURCE)
+#  define BOOST_CONTEXT_DECL BOOST_SYMBOL_EXPORT
+#  define BOOST_CONTEXT_BUILD_DLL
+# else
+#  define BOOST_CONTEXT_DECL BOOST_SYMBOL_IMPORT
 # endif
 #endif
 

Modified: branches/release/libs/context/build/Jamfile.v2
==============================================================================
--- branches/release/libs/context/build/Jamfile.v2	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/build/Jamfile.v2	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -15,11 +15,13 @@
 import architecture ;
 
 project boost/context
-    : source-location ../src
     : requirements
       <os>SOLARIS:<define>_XOPEN_SOURCE=600
+      <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
+      <define>BOOST_CONTEXT_SOURCE
     : usage-requirements
       <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
+    : source-location ../src
     ;
 
 local rule default_binary_format ( )
@@ -459,7 +461,6 @@
 
 lib boost_context
    : select_asm_context_sources
-   : <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
    ;
 
 boost-install boost_context ;

Modified: branches/release/libs/context/example/Jamfile.v2
==============================================================================
--- branches/release/libs/context/example/Jamfile.v2	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/example/Jamfile.v2	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -32,7 +32,6 @@
 project boost/context/example
     : requirements
       <library>/boost/context//boost_context
-      <define>BOOST_ALL_NO_LIB=1
       <link>static
     ;
 

Modified: branches/release/libs/context/src/asm/jump_arm_aapcs_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/jump_arm_aapcs_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/jump_arm_aapcs_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -71,3 +71,6 @@
                                     @ and as first arg in context function
     ldmia   a2, {v1-v8,sp-pc}       @ restore v1-V8,SP-PC
 .size jump_fcontext,.-jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/jump_i386_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/jump_i386_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/jump_i386_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -70,3 +70,6 @@
 
     jmp     *%edx                   /* indirect jump to context */
 .size jump_fcontext,.-jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/jump_mips32_o32_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/jump_mips32_o32_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/jump_mips32_o32_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -94,3 +94,6 @@
     jr      $t9             # jump to context
 .end jump_fcontext
 .size jump_fcontext, .-jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -178,3 +178,6 @@
 
     bctr                        # jump to context
 .size jump_fcontext, .-jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -199,3 +199,6 @@
 
     bctr                        # jump to context
 .size .jump_fcontext, .-.jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/jump_sparc64_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/jump_sparc64_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/jump_sparc64_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -134,3 +134,6 @@
     mov %o2, %o0    // return arg as result
 
 .size jump_fcontext,.-jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/jump_sparc_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/jump_sparc_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/jump_sparc_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -130,3 +130,6 @@
     mov %o2, %o0    // return arg as result
 
 .size jump_fcontext,.-jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -80,3 +80,6 @@
 
     jmp      *%rcx                  /* indirect jump to context */
 .size jump_fcontext,.-jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/make_arm_aapcs_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_arm_aapcs_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/make_arm_aapcs_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -74,3 +74,6 @@
     mov     a1, #0          @ exit code is zero
     bl      _exit_at_PLT       @ exit application
 .size make_fcontext,.-make_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/make_i386_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_i386_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/make_i386_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -75,3 +75,6 @@
     call   _exit_at_PLT                    /* exit application */
     hlt
 .size make_fcontext,.-make_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/make_mips32_o32_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_mips32_o32_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/make_mips32_o32_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -83,3 +83,6 @@
     jalr    $t9                       # exit application
 .end make_fcontext
 .size make_fcontext, .-make_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/make_ppc32_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_ppc32_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/make_ppc32_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -109,3 +109,6 @@
     li      %r3,  0             # exit code is zero
     bl      _exit_at_plt           # exit application
 .size make_fcontext, .-make_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/make_ppc64_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_ppc64_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/make_ppc64_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -131,3 +131,6 @@
     bl      _exit               # exit application
     nop
 .size .make_fcontext, .-.make_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/make_sparc64_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_sparc64_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/make_sparc64_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -84,3 +84,6 @@
      nop
 
 .size make_fcontext,.-make_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/make_sparc_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_sparc_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/make_sparc_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -80,3 +80,6 @@
      nop
 
 .size make_fcontext,.-make_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits

Modified: branches/release/libs/context/src/asm/make_x86_64_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_x86_64_sysv_elf_gas.S	Thu Jul 25 21:02:26 2013	(r85161)
+++ branches/release/libs/context/src/asm/make_x86_64_sysv_elf_gas.S	2013-07-26 11:24:15 EDT (Fri, 26 Jul 2013)	(r85162)
@@ -72,3 +72,5 @@
     hlt
 .size make_fcontext,.-make_fcontext
 
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits