Fix some build errors

This commit is contained in:
Justine Tunney 2023-06-05 15:50:15 -07:00
parent 7558549d44
commit 5b908bc756
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
8 changed files with 19 additions and 11 deletions

View file

@ -726,6 +726,7 @@ void abort(void) wontreturn;
#if __GNUC__ + 0 >= 9 #if __GNUC__ + 0 >= 9
#pragma GCC diagnostic ignored /* "always true" breaks dce */ "-Waddress" #pragma GCC diagnostic ignored /* "always true" breaks dce */ "-Waddress"
#if __GNUC__ >= 11 #if __GNUC__ >= 11
#pragma GCC diagnostic ignored /* annoying */ "-Wattributes"
#pragma GCC diagnostic ignored /* orwellian */ "-Wold-style-definition" #pragma GCC diagnostic ignored /* orwellian */ "-Wold-style-definition"
#endif /* GCC11+ */ #endif /* GCC11+ */
#endif /* GCC9+ */ #endif /* GCC9+ */

View file

@ -1,4 +0,0 @@
#ifndef COSMOPOLITAN_LIBC_ISYSTEM_VAESINTRIN_INTERNAL_H_
#define COSMOPOLITAN_LIBC_ISYSTEM_VAESINTRIN_INTERNAL_H_
#include "third_party/intel/vaesintrin.internal.h"
#endif /* COSMOPOLITAN_LIBC_ISYSTEM_VAESINTRIN_INTERNAL_H_ */

View file

@ -24,6 +24,7 @@
#include "libc/mem/mem.h" #include "libc/mem/mem.h"
#include "libc/nexgen32e/cachesize.h" #include "libc/nexgen32e/cachesize.h"
#include "libc/nexgen32e/x86feature.h" #include "libc/nexgen32e/x86feature.h"
#include "libc/runtime/runtime.h"
#include "libc/stdio/rand.h" #include "libc/stdio/rand.h"
#include "libc/stdio/stdio.h" #include "libc/stdio/stdio.h"
#include "libc/str/str.h" #include "libc/str/str.h"
@ -505,14 +506,16 @@ dontinline int strcasecmp_pure(const char *a, const char *b) {
return tolower(*a & 0xff) - tolower(*b & 0xff); return tolower(*a & 0xff) - tolower(*b & 0xff);
} }
char *randomize_buf2str(size_t size, char data[size]) { char *randomize_buf2str(size_t size, char *data) {
assert(data);
rngset(data, size, _rand64, -1); rngset(data, size, _rand64, -1);
data[size - 1] = '\0'; data[size - 1] = '\0';
return data; return data;
} }
char *longstringislong(size_t size, char data[size]) { char *longstringislong(size_t size, char *data) {
unsigned i; unsigned i;
assert(data);
randomize_buf2str(size, data); randomize_buf2str(size, data);
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
data[i] |= 1u << (i & 5); data[i] |= 1u << (i & 5);

View file

@ -1,5 +1,8 @@
/* clang-format off */ /* clang-format off */
#if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0) #if defined(__x86_64__) && !(__ASSEMBLER__ + __LINKER__ + 0)
#ifndef _IMMINTRIN_H_INCLUDED
# error "Never use <vaesintrin.h> directly; include <immintrin.h> instead."
#endif
#ifndef __VAESINTRIN_H_INCLUDED #ifndef __VAESINTRIN_H_INCLUDED
#define __VAESINTRIN_H_INCLUDED #define __VAESINTRIN_H_INCLUDED
#if !defined(__VAES__) || !defined(__AVX__) #if !defined(__VAES__) || !defined(__AVX__)

View file

@ -91,7 +91,7 @@ void log_analyzer( void *ctx, int level,
/* Invalid minor version used when not specifying a min/max version or expecting a test to fail */ /* Invalid minor version used when not specifying a min/max version or expecting a test to fail */
#define TEST_SSL_MINOR_VERSION_NONE -1 #define TEST_SSL_MINOR_VERSION_NONE -1
s
typedef struct handshake_test_options typedef struct handshake_test_options
{ {
const char *cipher; const char *cipher;
@ -2270,6 +2270,8 @@ void test_ssl_mock_sanity( )
unsigned char received[MSGLEN]; unsigned char received[MSGLEN];
mbedtls_mock_socket socket; mbedtls_mock_socket socket;
memset(message, 0, sizeof(message));
mbedtls_mock_socket_init( &socket ); mbedtls_mock_socket_init( &socket );
TEST_ASSERT( mbedtls_mock_tcp_send_b( &socket, message, MSGLEN ) < 0 ); TEST_ASSERT( mbedtls_mock_tcp_send_b( &socket, message, MSGLEN ) < 0 );
mbedtls_mock_socket_close( &socket ); mbedtls_mock_socket_close( &socket );

View file

@ -25,8 +25,8 @@
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "libc/str/str.h"
#include "third_party/musl/rand48.h" #include "third_party/musl/rand48.h"
#include "libc/str/str.h"
asm(".ident\t\"\\n\\n\ asm(".ident\t\"\\n\\n\
Musl libc (MIT License)\\n\ Musl libc (MIT License)\\n\
@ -87,7 +87,7 @@ long mrand48(void)
return jrand48(__seed48); return jrand48(__seed48);
} }
unsigned short *seed48(unsigned short *s) unsigned short *seed48(unsigned short s[3])
{ {
static unsigned short p[3]; static unsigned short p[3];
memcpy(p, __seed48, sizeof p); memcpy(p, __seed48, sizeof p);

View file

@ -16,9 +16,10 @@
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE. PERFORMANCE OF THIS SOFTWARE.
*/ */
#include "tool/build/lib/lines.h"
#include "libc/limits.h"
#include "libc/mem/mem.h" #include "libc/mem/mem.h"
#include "libc/str/str.h" #include "libc/str/str.h"
#include "tool/build/lib/lines.h"
struct Lines *NewLines(void) { struct Lines *NewLines(void) {
return calloc(1, sizeof(struct Lines)); return calloc(1, sizeof(struct Lines));
@ -46,7 +47,8 @@ void AppendLines(struct Lines *lines, const char *s) {
s = p + 1; s = p + 1;
} else { } else {
if (*s) { if (*s) {
AppendLine(lines, s, -1); // gcc11 whines about SIZE_MAX > PTRDIFF_MAX
AppendLine(lines, s, PTRDIFF_MAX);
} }
break; break;
} }

View file

@ -71,6 +71,7 @@
"__SSE2__" "__SSE2__"
"__SSE3__" "__SSE3__"
"__SSSE3__" "__SSSE3__"
"__SSE4A__"
"__SSE4_1__" "__SSE4_1__"
"__SSE4_2__" "__SSE4_2__"
"__XSAVE__" "__XSAVE__"