Attempting a smaller diff

Author: padelsbach

include/target.h.in

@@ -37,13 +37,11 @@
 #ifdef WOLFBOOT_FIXED_PARTITIONS
 
 #if defined(ARCH_SIM) && !defined(WOLFBOOT_PARTITION_FILENAME)
-#ifndef __ASSEMBLER__
     #include <stdint.h>
     /* use runtime ram base for simulator */
     extern uint8_t *sim_ram_base;
     #undef  ARCH_FLASH_OFFSET
     #define ARCH_FLASH_OFFSET ((size_t)sim_ram_base)
-#endif /* !__ASSEMBLER__ */
     #define WOLFBOOT_PART_USE_ARCH_OFFSET
 #endif
 

include/user_settings.h

@@ -46,7 +46,7 @@
 /* Stdlib Types */
 #define CTYPE_USER /* don't let wolfCrypt types.h include ctype.h */
 
-#if !defined(WOLFSSL_ARMASM) && !defined(__ASSEMBLER__)
+#ifndef WOLFSSL_ARMASM
 #ifndef toupper
 extern int toupper(int c);
 #endif
@@ -353,13 +353,6 @@ extern int tolower(int c);
 #       endif
 #   else
 #       define SP_WORD_SIZE 32
-#   endif
-
-    /* x86_64 ASM 4096-bit routines use 2048-bit helpers internally,
-     * so ensure 2048-bit asm is not excluded when 4096-bit is needed */
-#   if defined(WOLFSSL_SP_X86_64_ASM) && defined(WOLFSSL_SP_4096) && \
-       defined(WOLFSSL_SP_NO_2048)
-#       undef WOLFSSL_SP_NO_2048
 #   endif
 
     /* SP Math needs to understand long long */