More fixes to builds, still have to fix ancient assemblers.
More fixes to builds, still have to fix ancient assemblers.

PKRoma/s2n,awslabs/s2n,alexeblee/s2n,alexeblee/s2n,alexeblee/s2n,PKRoma/s2n,colmmacc/s2n,PKRoma/s2n,awslabs/s2n,colmmacc/s2n,alexeblee/s2n,wcs1only/s2n,wcs1only/s2n,alexeblee/s2n,colmmacc/s2n,colmmacc/s2n,wcs1only/s2n,wcs1only/s2n,awslabs/s2n,wcs1only/s2n,wcs1only/s2n,wcs1only/s2n,PKRoma/s2n,colmmacc/s2n,PKRoma/s2n,colmmacc/s2n,wcs1only/s2n,PKRoma/s2n,alexeblee/s2n,awslabs/s2n,PKRoma/s2n,awslabs/s2n,PKRoma/s2n,awslabs/s2n