diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 23:01:10 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:53 +0200 |
| commit | 30478c97837a026ba56718f98d490adf7bce2760 (patch) | |
| tree | 10166f933851346d6f4fd6387394087843ce26a3 /Configurations/15-ios.conf | |
| parent | 3a561b06d9e897a7613843f2bd0752297ab56dd7 (diff) | |
Configure: final cleanup of asm related things
Remove the *_asm templates in Configurations/00-base-templates.conf,
all attempts to inherit them, and the asm() perl function.
[extended tests]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'Configurations/15-ios.conf')
| -rw-r--r-- | Configurations/15-ios.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/15-ios.conf b/Configurations/15-ios.conf index 1e3bd9cdcb..a95f808c54 100644 --- a/Configurations/15-ios.conf +++ b/Configurations/15-ios.conf @@ -13,7 +13,7 @@ my %targets = ( disable => [ "engine", "async" ], }, "ios-xcrun" => { - inherit_from => [ "ios-common", asm("armv4_asm") ], + inherit_from => [ "ios-common" ], # It should be possible to go below iOS 6 and even add -arch armv6, # thus targeting iPhone pre-3GS, but it's assumed to be irrelevant # at this point. @@ -23,7 +23,7 @@ my %targets = ( perlasm_scheme => "ios32", }, "ios64-xcrun" => { - inherit_from => [ "ios-common", asm("aarch64_asm") ], + inherit_from => [ "ios-common" ], CC => "xcrun -sdk iphoneos cc", cflags => add("-arch arm64 -mios-version-min=7.0.0 -fno-common"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", |