From f8d2ab2553ef1022bdf1a3407a47d22d94f0bc5a Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Wed, 16 Jan 2019 04:47:27 +0000 Subject: [PATCH] Teach ucode identify about aarch64. Also make this always return a string here, so it doesn't crash on boot if it hasn't been taught about new compiled code types. --- src/microcode/utabmd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/microcode/utabmd.c b/src/microcode/utabmd.c index c18e2fa9d..5d612d222 100644 --- a/src/microcode/utabmd.c +++ b/src/microcode/utabmd.c @@ -106,11 +106,7 @@ make_microcode_identification_vector (void) VECTOR_SET (v, ID_FLONUM_EXP_MAX, (LONG_TO_FIXNUM (DBL_MAX_EXP - 1))); VECTOR_SET (v, ID_NONNEG_FIXNUM_LENGTH, (ULONG_TO_FIXNUM (FIXNUM_LENGTH))); VECTOR_SET (v, ID_NONNEG_FIXNUM_MASK, (ULONG_TO_FIXNUM (FIXNUM_MASK))); - { - const char * name = (cc_arch_name ()); - if (name != 0) - VECTOR_SET (v, ID_CC_ARCH, (char_pointer_to_string (name))); - } + VECTOR_SET (v, ID_CC_ARCH, (char_pointer_to_string (cc_arch_name ()))); return (v); } @@ -124,7 +120,8 @@ cc_arch_name (void) case COMPILER_C_TYPE: return ("c"); case COMPILER_SVM_TYPE: return ("svm1"); case COMPILER_X86_64_TYPE: return ("x86-64"); - default: return (0); + case COMPILER_AARCH64_TYPE: return ("aarch64"); + default: return ("unknown"); } } -- 2.25.1