diff options
| -rwxr-xr-x | configure.py | 229 | ||||
| -rw-r--r-- | doc/building.rst | 62 | ||||
| -rw-r--r-- | src/build-data/cc/clang.txt | 15 | ||||
| -rw-r--r-- | src/build-data/cc/gcc.txt | 17 | ||||
| -rw-r--r-- | src/configs/pylint.rc | 2 | ||||
| -rw-r--r-- | src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp | 8 | ||||
| -rw-r--r-- | src/lib/tls/tls_blocking.cpp | 8 | ||||
| -rw-r--r-- | src/lib/utils/compiler.h | 6 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 3 |
9 files changed, 96 insertions, 254 deletions
diff --git a/configure.py b/configure.py index 564c4fad4..2333ff7ac 100755 --- a/configure.py +++ b/configure.py @@ -3,7 +3,7 @@ """ Configuration program for botan -(C) 2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 Jack Lloyd +(C) 2009-2020 Jack Lloyd (C) 2015,2016,2017 Simon Warta (Kullo GmbH) Botan is released under the Simplified BSD License (see license.txt) @@ -206,10 +206,8 @@ class BuildPaths(object): # pylint: disable=too-many-instance-attributes self.internal_headers = sorted(flatten([m.internal_headers() for m in modules])) self.external_headers = sorted(flatten([m.external_headers() for m in modules])) - if options.amalgamation: - self.lib_sources = ['botan_all.cpp'] - else: - self.lib_sources = [normalize_source_path(s) for s in sorted(flatten([mod.sources() for mod in modules]))] + # this is overwritten if amalgamation is used + self.lib_sources = [normalize_source_path(s) for s in sorted(flatten([mod.sources() for mod in modules]))] self.public_headers = sorted(flatten([m.public_headers() for m in modules])) @@ -409,9 +407,8 @@ def process_command_line(args): # pylint: disable=too-many-locals,too-many-state default=False, action='store_true', help='use amalgamation to build') - build_group.add_option('--single-amalgamation-file', - default=False, action='store_true', - help='build single file instead of splitting on ABI') + build_group.add_option('--name-amalgamation', metavar='NAME', default='botan_all', + help='specify alternate name for amalgamation files') build_group.add_option('--with-build-dir', metavar='DIR', default='', help='setup the build in DIR') @@ -1127,7 +1124,7 @@ class CompilerInfo(InfoObject): # pylint: disable=too-many-instance-attributes infofile, [], ['cpu_flags', 'cpu_flags_no_debug', 'so_link_commands', 'binary_link_commands', - 'mach_abi_linking', 'isa_flags', 'isa_targets', 'sanitizers', 'lib_flags'], + 'mach_abi_linking', 'isa_flags', 'sanitizers', 'lib_flags'], { 'binary_name': None, 'linker_name': None, @@ -1177,7 +1174,6 @@ class CompilerInfo(InfoObject): # pylint: disable=too-many-instance-attributes self.coverage_flags = lex.coverage_flags self.debug_info_flags = lex.debug_info_flags self.isa_flags = lex.isa_flags - self.isa_targets = lex.isa_targets self.lang_flags = lex.lang_flags self.lib_flags = lex.lib_flags self.linker_name = lex.linker_name @@ -1238,17 +1234,6 @@ class CompilerInfo(InfoObject): # pylint: disable=too-many-instance-attributes return None - def get_isa_target_name(self, isa, arch): - if isa in self.isa_targets: - return self.isa_targets[isa] - - arch_isa = '%s:%s' % (arch, isa) - if arch_isa in self.isa_targets: - return self.isa_targets[arch_isa] - - # default... - return isa - def get_isa_specific_flags(self, isas, arch, options): flags = set() @@ -1741,7 +1726,7 @@ def process_template_string(template_text, variables, template_source): def process_template(template_file, variables): return process_template_string(read_textfile(template_file), variables, template_file) -def yield_objectfile_list(sources, obj_dir, obj_suffix): +def yield_objectfile_list(sources, obj_dir, obj_suffix, options): obj_suffix = '.' + obj_suffix for src in sources: @@ -1750,7 +1735,7 @@ def yield_objectfile_list(sources, obj_dir, obj_suffix): if 'src' in parts: parts = parts[parts.index('src')+2:] - elif filename.find('botan_all') != -1: + elif options.amalgamation and filename.find(options.name_amalgamation) != -1: parts = [] else: raise InternalError("Unexpected file '%s/%s'" % (directory, filename)) @@ -1802,10 +1787,6 @@ def generate_build_info(build_paths, modules, cc, arch, osinfo, options): return cc.get_isa_specific_flags(isas, arch, options) - if src.startswith('botan_all_'): - isas = src.replace('botan_all_', '').replace('.cpp', '').split('_') - return cc.get_isa_specific_flags(isas, arch, options) - return '' def _build_info(sources, objects, target_type): @@ -1844,7 +1825,7 @@ def generate_build_info(build_paths, modules, cc, arch, osinfo, options): if src_list is not None: src_list.sort() - objects = list(yield_objectfile_list(src_list, src_dir, osinfo.obj_suffix)) + objects = list(yield_objectfile_list(src_list, src_dir, osinfo.obj_suffix, options)) build_info = _build_info(src_list, objects, t) for b in build_info: @@ -2137,7 +2118,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, ), 'cmake_link_to': ' '.join( - [lib for lib in link_to('libs')] + + link_to('libs') + [('"' + cc.add_framework_option + fw + '"') for fw in link_to('frameworks')] ), @@ -2513,6 +2494,7 @@ class AmalgamationHelper(object): # Only matches at the beginning of the line. By convention, this means that the include # is not wrapped by condition macros _unconditional_any_include = re.compile(r'^#include <(.*)>') + # stddef.h is included in ffi.h _unconditional_std_include = re.compile(r'^#include <([^/\.]+|stddef.h)>') @staticmethod @@ -2547,6 +2529,16 @@ class AmalgamationHelper(object): else: return None + @staticmethod + def write_banner(fd): + fd.write("""/* +* Botan %s Amalgamation +* (C) 1999-2020 The Botan Authors +* +* Botan is released under the Simplified BSD License (see license.txt) +*/ +""" % (Version.as_string())) + class AmalgamationHeader(object): def __init__(self, input_filepaths): @@ -2600,40 +2592,16 @@ class AmalgamationHeader(object): else: yield line - @staticmethod - def write_banner(fd): - fd.write("""/* -* Botan %s Amalgamation -* (C) 1999-2018 The Botan Authors -* -* Botan is released under the Simplified BSD License (see license.txt) -*/ -""" % (Version.as_string())) - - @staticmethod - def _write_start_include_guard(fd, title): - fd.write(""" -#ifndef %s -#define %s - -""" % (title, title)) - - @staticmethod - def _write_end_include_guard(fd, title): - fd.write("\n#endif // %s\n" % (title)) - def write_to_file(self, filepath, include_guard): with open(filepath, 'w') as f: - self.write_banner(f) - self._write_start_include_guard(f, include_guard) + AmalgamationHelper.write_banner(f) + f.write("\n#ifndef %s\n#define %s\n\n" % (include_guard, include_guard)) f.write(self.header_includes) f.write(self.contents) - self._write_end_include_guard(f, include_guard) + f.write("\n#endif // %s\n" % (include_guard)) class AmalgamationGenerator(object): - filename_prefix = 'botan_all' - _header_guard_pattern = re.compile(r'^#define BOTAN_.*_H_\s*$') _header_endif_pattern = re.compile(r'^#endif.*$') @@ -2675,122 +2643,43 @@ class AmalgamationGenerator(object): return lines - def __init__(self, cc, arch, build_paths, modules, options): - self._cc = cc - self._arch = arch + def __init__(self, prefix, build_paths, modules, options): + self._filename_prefix = prefix self._build_paths = build_paths self._modules = modules self._options = options - def _target_for_module(self, mod): - target = '' - if not self._options.single_amalgamation_file: - isas = mod.isas_needed(self._options.arch) - if isas != []: - target = '_'.join(sorted(isas)) - if target == 'sse2' and self._options.arch == 'x86_64': - target = '' # SSE2 is always available on x86-64 - - if self._options.arch == 'x86_32' and 'simd' in mod.requires: - target = 'sse2' - return target + def generate(self): + encoding_kwords = {} + if sys.version_info[0] == 3: + encoding_kwords['encoding'] = 'utf8' - def _isas_for_target(self, target): - for mod in sorted(self._modules, key=lambda module: module.basename): - # Only first module for target is considered. Does this make sense? - if self._target_for_module(mod) == target: - out = set() - for isa in mod.isas_needed(self._options.arch): - if isa == 'aesni': - isa = "aes,pclmul" - elif isa == 'rdrand': - isa = 'rdrnd' - out.add(isa) - return out - # Return set such that we can also iterate over result in the NA case - return set() - - def _generate_headers(self): pub_header_amalag = AmalgamationHeader(self._build_paths.public_headers) - header_name = '%s.h' % (AmalgamationGenerator.filename_prefix) - logging.info('Writing amalgamation header to %s' % (header_name)) - pub_header_amalag.write_to_file(header_name, "BOTAN_AMALGAMATION_H_") + amalgamation_header_fsname = '%s.h' % (self._filename_prefix) + logging.info('Writing amalgamation header to %s' % (amalgamation_header_fsname)) + pub_header_amalag.write_to_file(amalgamation_header_fsname, "BOTAN_AMALGAMATION_H_") - isa_headers = {} internal_headers_list = [] - def known_isa_header(hdr): - if self._options.single_amalgamation_file: - return None - if hdr == 'simd_avx2.h': - return 'avx2' - return None - for hdr in self._build_paths.internal_headers: - isa = known_isa_header(os.path.basename(hdr)) - if isa: - isa_headers[isa] = ''.join([line for line in AmalgamationGenerator.read_header(hdr) - if AmalgamationHelper.is_botan_include(line) is None]) - else: - internal_headers_list.append(hdr) - - internal_headers = AmalgamationHeader(internal_headers_list) - header_int_name = '%s_internal.h' % (AmalgamationGenerator.filename_prefix) - logging.info('Writing amalgamation header to %s' % (header_int_name)) - internal_headers.write_to_file(header_int_name, "BOTAN_AMALGAMATION_INTERNAL_H_") - - header_files = [header_name, header_int_name] - included_in_headers = pub_header_amalag.all_std_includes | internal_headers.all_std_includes - return header_files, included_in_headers, isa_headers - - def _generate_sources(self, amalgamation_headers, included_in_headers, isa_headers): - #pylint: disable=too-many-locals,too-many-branches - encoding_kwords = {} - if sys.version_info[0] == 3: - encoding_kwords['encoding'] = 'utf8' - - # target to filepath map - amalgamation_sources = {} - for mod in self._modules: - target = self._target_for_module(mod) - amalgamation_sources[target] = '%s%s.cpp' % ( - AmalgamationGenerator.filename_prefix, - '_' + target if target else '') + internal_headers_list.append(hdr) # file descriptors for all `amalgamation_sources` - amalgamation_files = {} - for target, filepath in amalgamation_sources.items(): - logging.info('Writing amalgamation source to %s' % (filepath)) - amalgamation_files[target] = open(filepath, 'w', **encoding_kwords) - - for target, f in amalgamation_files.items(): - AmalgamationHeader.write_banner(f) - f.write('\n') - for header in amalgamation_headers: - f.write('#include "%s"\n' % (header)) - f.write('\n') - - for isa in self._isas_for_target(target): + amalgamation_fsname = '%s.cpp' % (self._filename_prefix) + logging.info('Writing amalgamation source to %s' % (amalgamation_fsname)) - if isa in isa_headers: - f.write(isa_headers[isa]) + amalgamation_file = open(amalgamation_fsname, 'w', **encoding_kwords) - pragma_str = self._cc.get_isa_target_name(isa, self._arch.basename) + AmalgamationHelper.write_banner(amalgamation_file) + amalgamation_file.write('\n#include "%s"\n\n' % (amalgamation_header_fsname)) - if pragma_str != '': - f.write('#if defined(__GNUG__) && !defined(__clang__)\n') - f.write('#pragma GCC target ("%s")\n' % (pragma_str)) - f.write('#endif\n') - else: - print("No pragma for %s???", isa) + internal_headers = AmalgamationHeader(internal_headers_list) + amalgamation_file.write(internal_headers.header_includes) + amalgamation_file.write(internal_headers.contents) - # target to include header map - unconditional_headers_written = {} - for target, _ in amalgamation_sources.items(): - unconditional_headers_written[target] = included_in_headers.copy() + unconditional_headers = set([]) for mod in sorted(self._modules, key=lambda module: module.basename): - tgt = self._target_for_module(mod) for src in sorted(mod.source): with open(src, 'r', **encoding_kwords) as f: for line in f: @@ -2798,24 +2687,18 @@ class AmalgamationGenerator(object): # Botan headers are inlined in amalgamation headers continue - if AmalgamationHelper.is_any_include(line) in unconditional_headers_written[tgt]: + if AmalgamationHelper.is_any_include(line) in unconditional_headers: # This include (conditional or unconditional) was unconditionally added before continue - amalgamation_files[tgt].write(line) + amalgamation_file.write(line) unconditional_header = AmalgamationHelper.is_unconditional_any_include(line) if unconditional_header: - unconditional_headers_written[tgt].add(unconditional_header) + unconditional_headers.add(unconditional_header) - for f in amalgamation_files.values(): - f.close() + amalgamation_file.close() - return set(amalgamation_sources.values()) - - def generate(self): - amalgamation_headers, included_in_headers, isa_headers = self._generate_headers() - amalgamation_sources = self._generate_sources(amalgamation_headers, included_in_headers, isa_headers) - return (sorted(amalgamation_sources), sorted(amalgamation_headers)) + return ([amalgamation_fsname], [amalgamation_header_fsname]) def have_program(program): @@ -2883,7 +2766,7 @@ def load_info_files(search_dir, descr, filename_matcher, class_t): info[info_obj.basename] = info_obj if info: - infotxt_basenames = ' '.join(sorted([key for key in info])) + infotxt_basenames = ' '.join(sorted(info.keys())) logging.debug('Loaded %d %s files: %s' % (len(info), descr, infotxt_basenames)) else: logging.warning('Failed to load any %s files' % (descr)) @@ -3087,10 +2970,15 @@ def canonicalize_options(options, info_os, info_arch): # This method DOES NOT change options on behalf of the user but explains # why the given configuration does not work. def validate_options(options, info_os, info_cc, available_module_policies): - # pylint: disable=too-many-branches + # pylint: disable=too-many-branches,too-many-statements + + if options.name_amalgamation != 'botan_all': + if options.name_amalgamation == '': + raise UserError('Amalgamation basename must be non-empty') - if options.single_amalgamation_file and not options.amalgamation: - raise UserError("--single-amalgamation-file requires --amalgamation.") + acceptable_name_re = re.compile('^[a-zA-Z0-9_]+$') + if acceptable_name_re.match(options.name_amalgamation) is None: + raise UserError("Amalgamation basename must match [a-zA-Z0-9_]+") if options.os == "java": raise UserError("Jython detected: need --os and --cpu to set target") @@ -3298,7 +3186,8 @@ def do_io_for_build(cc, arch, osinfo, using_mods, build_paths, source_paths, tem build_paths.external_include_dir) if options.amalgamation: - (amalg_cpp_files, amalg_headers) = AmalgamationGenerator(cc, arch, build_paths, using_mods, options).generate() + (amalg_cpp_files, amalg_headers) = AmalgamationGenerator( + options.name_amalgamation, build_paths, using_mods, options).generate() build_paths.lib_sources = amalg_cpp_files template_vars['generated_files'] = ' '.join(amalg_cpp_files + amalg_headers) diff --git a/doc/building.rst b/doc/building.rst index fa2d1b40f..4d906f59b 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -306,34 +306,34 @@ The Amalgamation Build You can also configure Botan to be built using only a single source file; this is quite convenient if you plan to embed the library into another application. -To generate the amalgamation, run ``configure.py`` with whatever -options you would ordinarily use, along with the option -``--amalgamation``. This will create two (rather large) files, -``botan_all.h`` and ``botan_all.cpp``, plus (unless the option -``--single-amalgamation-file`` is used) also some number of files like -``botan_all_aesni.cpp`` and ``botan_all_sse2.cpp`` which need to be -compiled with the appropriate compiler flags to enable that -instruction set. The ISA specific files are only generated if there is -code that requires them, so you can simplify your build. The -``--minimized-build`` option (described elsewhere in this documentation) -is also quite useful with the amalgamation. +To generate the amalgamation, run ``configure.py`` with whatever options you +would ordinarily use, along with the option ``--amalgamation``. This will create +two (rather large) files, ``botan_all.h`` and ``botan_all.cpp``. + +.. note:: + + The library will as usual be configured to target some specific operating + system and CPU architecture. You can use the CPU target "generic" if you need + to target multiple CPU architectures, but this has the effect of disabling + *all* CPU specific features such as SIMD, AES instruction sets, or inline + assembly. If you need to ship amalgamations for multiple targets, it would be + better to create different amalgamation files for each individual target. Whenever you would have included a botan header, you can then include -``botan_all.h``, and include ``botan_all.cpp`` along with the rest of -the source files in your build. If you want to be able to easily -switch between amalgamated and non-amalgamated versions (for instance -to take advantage of prepackaged versions of botan on operating -systems that support it), you can instead ignore ``botan_all.h`` and -use the headers from ``build/include`` as normal. - -You can also build the library using Botan's build system (as normal) -but utilizing the amalgamation instead of the individual source files -by running something like ``./configure.py --amalgamation && make``. -This is essentially a very simple form of link time optimization; -because the entire library source is visible to the compiler, it has -more opportunities for interprocedural optimizations. -Additionally, amalgamation builds usually have significantly shorter -compile times for full rebuilds. +``botan_all.h``, and include ``botan_all.cpp`` along with the rest of the source +files in your build. If you want to be able to easily switch between amalgamated +and non-amalgamated versions (for instance to take advantage of prepackaged +versions of botan on operating systems that support it), you can instead ignore +``botan_all.h`` and use the headers from ``build/include`` as normal. + +You can also build the library using Botan's build system (as normal) but +utilizing the amalgamation instead of the individual source files by running +something like ``./configure.py --amalgamation && make``. This is essentially a +very simple form of link time optimization; because the entire library source is +visible to the compiler, it has more opportunities for interprocedural +optimizations. Additionally (assuming you are not making use of a compiler +cache such as ``ccache`` or ``sccache``) amalgamation builds usually have +significantly shorter compile times for full rebuilds. Modules Relying on Third Party Libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -753,16 +753,6 @@ Enable debug info and disable optimizations Use amalgamation to build -``--single-amalgamation-file`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -By default the amalgamation file is split up into several files, -because using intrinsics requires enabling the relevant instruction -set extension. This option selects generating a single file instead. - -This requires either MSVC, or a fairly recent version of GCC/Clang -which supports the ``target`` attribute. - ``--system-cert-bundle`` ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt index 7521f0918..b183f60ef 100644 --- a/src/build-data/cc/clang.txt +++ b/src/build-data/cc/clang.txt @@ -67,21 +67,6 @@ arm32:neon -> "-mfpu=neon" arm64:neon -> "" </isa_flags> -<isa_targets> -sse41 -> sse4.1 -sse42 -> sse4.2 - -rdrand -> rdrnd - -armv8crypto -> "+crypto" -armv8sm4 -> "+sm4" - -powercrypto -> "crypto" - -arm32:neon -> "fpu=neon" -arm64:neon -> "+simd" -</isa_targets> - <cpu_flags> llvm -> "-emit-llvm -fno-use-cxa-atexit" </cpu_flags> diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 401e68ddc..a653fe47e 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -78,23 +78,6 @@ arm32:neon -> "-mfpu=neon" arm64:neon -> "" </isa_flags> -# Values used in BOTAN_FUNC_ISA eg __attribute__((target("X"))) -# values not set are assumed identical to basename; sse2 -> sse2 -<isa_targets> -sse41 -> sse4.1 -sse42 -> sse4.2 - -rdrand -> rdrnd - -armv8crypto -> "+crypto" -armv8sm4 -> "+sm4" - -powercrypto -> "crypto" - -arm32:neon -> "fpu=neon" -arm64:neon -> "+simd" -</isa_targets> - # Flags set here are included at compile and link time <mach_abi_linking> all!haiku,qnx -> "-pthread" diff --git a/src/configs/pylint.rc b/src/configs/pylint.rc index ae9d2e24c..14020880b 100644 --- a/src/configs/pylint.rc +++ b/src/configs/pylint.rc @@ -60,7 +60,7 @@ confidence= # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" -disable=missing-docstring,no-else-return,logging-not-lazy,locally-disabled +disable=missing-docstring,no-else-return,logging-not-lazy,locally-disabled,import-outside-toplevel [REPORTS] diff --git a/src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp b/src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp index b91004aea..a0326f211 100644 --- a/src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp +++ b/src/lib/block/sm4/sm4_armv8/sm4_armv8.cpp @@ -41,8 +41,8 @@ inline uint32x4_t bqswap_32(uint32x4_t B) } -BOTAN_FUNC_ISA("+sm4") -void SM4::sm4_armv8_encrypt(const uint8_t input8[], uint8_t output8[], size_t blocks) const +void BOTAN_FUNC_ISA("arch=armv8.2-a+sm4") +SM4::sm4_armv8_encrypt(const uint8_t input8[], uint8_t output8[], size_t blocks) const { const uint32x4_t K0 = vld1q_u32(&m_RK[ 0]); const uint32x4_t K1 = vld1q_u32(&m_RK[ 4]); @@ -102,8 +102,8 @@ void SM4::sm4_armv8_encrypt(const uint8_t input8[], uint8_t output8[], size_t bl } } -BOTAN_FUNC_ISA("+sm4") -void SM4::sm4_armv8_decrypt(const uint8_t input8[], uint8_t output8[], size_t blocks) const +void BOTAN_FUNC_ISA("arch=armv8.2-a+sm4") +SM4::sm4_armv8_decrypt(const uint8_t input8[], uint8_t output8[], size_t blocks) const { const uint32x4_t K0 = qswap_32(vld1q_u32(&m_RK[ 0])); const uint32x4_t K1 = qswap_32(vld1q_u32(&m_RK[ 4])); diff --git a/src/lib/tls/tls_blocking.cpp b/src/lib/tls/tls_blocking.cpp index d89c11a2c..b9c699dc0 100644 --- a/src/lib/tls/tls_blocking.cpp +++ b/src/lib/tls/tls_blocking.cpp @@ -12,8 +12,6 @@ namespace Botan { namespace TLS { -using namespace std::placeholders; - Blocking_Client::Blocking_Client(read_fn reader, write_fn writer, Session_Manager& session_manager, @@ -31,9 +29,9 @@ Blocking_Client::Blocking_Client(read_fn reader, */ TLS::Compat_Callbacks::SILENCE_DEPRECATION_WARNING::PLEASE, writer, - std::bind(&Blocking_Client::data_cb, this, _1, _2), - std::function<void (Alert)>(std::bind(&Blocking_Client::alert_cb, this, _1)), - std::bind(&Blocking_Client::handshake_cb, this, _1) + std::bind(&Blocking_Client::data_cb, this, std::placeholders::_1, std::placeholders::_2), + std::function<void (Alert)>(std::bind(&Blocking_Client::alert_cb, this, std::placeholders::_1)), + std::bind(&Blocking_Client::handshake_cb, this, std::placeholders::_1) )), m_channel(*m_callbacks.get(), session_manager, diff --git a/src/lib/utils/compiler.h b/src/lib/utils/compiler.h index 3f1dc4f8b..e30ecda71 100644 --- a/src/lib/utils/compiler.h +++ b/src/lib/utils/compiler.h @@ -103,7 +103,7 @@ #define BOTAN_DEPRECATED(msg) __attribute__ ((deprecated(msg))) #define BOTAN_DEPRECATED_HEADER(hdr) _Pragma("message \"this header is deprecated\"") - #if !defined(BOTAN_IS_BEING_BUILT) + #if !defined(BOTAN_IS_BEING_BUILT) && !defined(BOTAN_AMALGAMATION_H_) #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) _Pragma("message \"this header will be made internal in the future\"") #endif @@ -111,7 +111,7 @@ #define BOTAN_DEPRECATED(msg) __declspec(deprecated(msg)) #define BOTAN_DEPRECATED_HEADER(hdr) __pragma(message("this header is deprecated")) - #if !defined(BOTAN_IS_BEING_BUILT) + #if !defined(BOTAN_IS_BEING_BUILT) && !defined(BOTAN_AMALGAMATION_H_) #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) __pragma(message("this header will be made internal in the future")) #endif @@ -120,7 +120,7 @@ #define BOTAN_DEPRECATED(msg) __attribute__ ((deprecated(msg))) #define BOTAN_DEPRECATED_HEADER(hdr) _Pragma("GCC warning \"this header is deprecated\"") - #if !defined(BOTAN_IS_BEING_BUILT) + #if !defined(BOTAN_IS_BEING_BUILT) && !defined(BOTAN_AMALGAMATION_H_) #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) _Pragma("GCC warning \"this header will be made internal in the future\"") #endif #endif diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index d10fc173b..99dc343db 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -86,9 +86,6 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, # Arbitrarily test amalgamation with the static lib builds flags += ['--amalgamation'] - if target_cc == 'msvc': - flags += ['--single-amalgamation-file'] - if target in ['bsi', 'nist']: # Arbitrarily test disable static on module policy builds # tls is optional for bsi/nist but add it so verify tests work with these minimized configs |