diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 80d1c46b..770b59cb 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -12,7 +12,6 @@ import indirect ; import modules ; import os ; import toolset ; -import architecture ; feature.feature segmented-stacks : on : optional propagated composite ; feature.compose on : BOOST_USE_SEGMENTED_STACKS ; @@ -806,13 +805,6 @@ alias asm_context_sources explicit asm_context_sources ; -alias select_asm_context_sources - : asm_context_sources - : [ architecture.architecture ] - [ architecture.address-model ] - ; - - alias stack_traits_sources : windows/stack_traits.cpp : windows @@ -826,7 +818,7 @@ explicit stack_traits_sources ; lib boost_context - : select_asm_context_sources + : asm_context_sources stack_traits_sources execution_context.cpp ; diff --git a/config/32.cpp b/config/32.cpp deleted file mode 100644 index d3d2dba2..00000000 --- a/config/32.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// 32.cpp -// -// Copyright (c) 2012 Steven Watanabe -// -// Distributed under the Boost Software License Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -int test[sizeof(void*) == 4? 1 : -1]; diff --git a/config/64.cpp b/config/64.cpp deleted file mode 100644 index 5a33bc64..00000000 --- a/config/64.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// 64.cpp -// -// Copyright (c) 2012 Steven Watanabe -// -// Distributed under the Boost Software License Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -int test[sizeof(void*) == 8? 1 : -1]; diff --git a/config/Jamfile.jam b/config/Jamfile.jam deleted file mode 100644 index 204c6ede..00000000 --- a/config/Jamfile.jam +++ /dev/null @@ -1,19 +0,0 @@ -# Jamfile.jam -# -# Copyright 2012 Steven Watanabe -# -# Distributed under the Boost Software License Version 1.0. (See -# accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -project /boost/architecture ; - -obj 32 : 32.cpp ; -obj 64 : 64.cpp ; - -obj arm : arm.cpp ; -obj combined : combined.cpp ; -obj mips1 : mips1.cpp ; -obj power : power.cpp ; -obj sparc : sparc.cpp ; -obj x86 : x86.cpp ; diff --git a/config/arm.cpp b/config/arm.cpp deleted file mode 100644 index 6a83737f..00000000 --- a/config/arm.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// arm.cpp -// -// Copyright (c) 2012 Steven Watanabe -// -// Distributed under the Boost Software License Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#if !defined(__arm__) && !defined(__thumb__) && \ - !defined(__TARGET_ARCH_ARM) && !defined(__TARGET_ARCH_THUMB) && \ - !defined(_ARM) && !defined(_M_ARM) -#error "Not ARM" -#endif diff --git a/config/combined.cpp b/config/combined.cpp deleted file mode 100644 index 4e5a387b..00000000 --- a/config/combined.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// combined.cpp -// -// Copyright (c) 2012 Steven Watanabe -// 2014 Oliver Kowalke -// -// Distributed under the Boost Software License Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#if !defined(i386) && !defined(__i386__) && !defined(__i386) \ - && !defined(__i486__) && !defined(__i586__) && !defined(__i686__) \ - && !defined(_M_IX86) && !defined(__X86__) && !defined(_X86_) \ - && !defined(__THW_INTEL__) && !defined(__I86__) && !defined(__INTEL__) \ - && !defined(__amd64__) && !defined(__x86_64__) && !defined(__amd64) \ - && !defined(__x86_64) && !defined(_M_X64) \ - && !defined(__powerpc) && !defined(__powerpc__) && !defined(__ppc) \ - && !defined(__ppc__) && !defined(_M_PPC) && !defined(_ARCH_PPC) \ - && !defined(__POWERPC__) && !defined(__PPCGECKO__) \ - && !defined(__PPCBROADWAY) && !defined(_XENON) -#error "Not combined" -#endif diff --git a/config/mips1.cpp b/config/mips1.cpp deleted file mode 100644 index adc4a61d..00000000 --- a/config/mips1.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// mips1.cpp -// -// Copyright (c) 2012 Steven Watanabe -// -// Distributed under the Boost Software License Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#if !((defined(__mips) && __mips == 1) || defined(_MIPS_ISA_MIPS1) || defined(_R3000)) -#error "Not MIPS1" -#endif diff --git a/config/power.cpp b/config/power.cpp deleted file mode 100644 index 0551194a..00000000 --- a/config/power.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// power.cpp -// -// Copyright (c) 2012 Steven Watanabe -// -// Distributed under the Boost Software License Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#if !defined(__powerpc) && !defined(__powerpc__) && !defined(__ppc) \ - && !defined(__ppc__) && !defined(_M_PPC) && !defined(_ARCH_PPC) \ - && !defined(__POWERPC__) && !defined(__PPCGECKO__) \ - && !defined(__PPCBROADWAY) && !defined(_XENON) -#error "Not PPC" -#endif diff --git a/config/sparc.cpp b/config/sparc.cpp deleted file mode 100644 index 3df2df84..00000000 --- a/config/sparc.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// power.cpp -// -// Copyright (c) 2012 Steven Watanabe -// -// Distributed under the Boost Software License Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#if !defined(__sparc__) && !defined(__sparc) -#error "Not SPARC" -#endif diff --git a/config/x86.cpp b/config/x86.cpp deleted file mode 100644 index 0d2f9c2e..00000000 --- a/config/x86.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// x86.cpp -// -// Copyright (c) 2012 Steven Watanabe -// -// Distributed under the Boost Software License Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#if !defined(i386) && !defined(__i386__) && !defined(__i386) \ - && !defined(__i486__) && !defined(__i586__) && !defined(__i686__) \ - && !defined(_M_IX86) && !defined(__X86__) && !defined(_X86_) \ - && !defined(__THW_INTEL__) && !defined(__I86__) && !defined(__INTEL__) \ - && !defined(__amd64__) && !defined(__x86_64__) && !defined(__amd64) \ - && !defined(__x86_64) && !defined(_M_X64) -#error "Not x86" -#endif