Ensure configured module specific and application specific defines are used

[openssl.git] / crypto / ia64cpuid.S

diff --git a/crypto/ia64cpuid.S b/crypto/ia64cpuid.S
index ffd6d6ca6f1388df1c9f239bcbefd4b030c14d38..a09f8556372d58e40ee126ef2b3baac73e2f6e5a 100644 (file)
--- a/crypto/ia64cpuid.S
+++ b/crypto/ia64cpuid.S
@@ -1,6 +1,6 @@
-// Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
+// Copyright 2004-2017 The OpenSSL Project Authors. All Rights Reserved.
 //
-// Licensed under the OpenSSL license (the "License").  You may not use
+// Licensed under the Apache License 2.0 (the "License").  You may not use
 // this file except in compliance with the License.  You can obtain a copy
 // in the file LICENSE in the source distribution or at
 // https://www.openssl.org/source/license.html
@@ -75,7 +75,7 @@ OPENSSL_wipe_cpu:
 { .mii;        add             r9=96*8-8,r9
        mov             ar.ec=1         };;
 
-// One can sweep double as fast, but then we can't quarantee
+// One can sweep double as fast, but then we can't guarantee
 // that backing storage is wiped...
 .L_wipe_top:
 { .mfi;        st8             [r9]=r0,-8