Wed Jan 1 09:33:19 2020 UTC ()
Fix build for non-__HAVE_UCAS_FULL platforms where the symbol dance for
assembler functions isn't needed.

Suggestion from maxv.  Thanks.


(skrll)
diff -r1.291 -r1.292 src/sys/sys/systm.h
cvs diff -r1.291 -r1.292 src/sys/sys/systm.h (expand / switch to unified diff)

--- src/sys/sys/systm.h 2019/11/15 12:18:46 1.291
+++ src/sys/sys/systm.h 2020/01/01 09:33:19 1.292
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: systm.h,v 1.291 2019/11/15 12:18:46 maxv Exp $ */ 1/* $NetBSD: systm.h,v 1.292 2020/01/01 09:33:19 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1982, 1988, 1991, 1993 4 * Copyright (c) 1982, 1988, 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * (c) UNIX System Laboratories, Inc. 6 * (c) UNIX System Laboratories, Inc.
7 * All or some portions of this file are derived from material licensed 7 * All or some portions of this file are derived from material licensed
8 * to the University of California by American Telephone and Telegraph 8 * to the University of California by American Telephone and Telegraph
9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
10 * the permission of UNIX System Laboratories, Inc. 10 * the permission of UNIX System Laboratories, Inc.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -373,42 +373,42 @@ int ustore_8(uint8_t *, uint8_t); @@ -373,42 +373,42 @@ int ustore_8(uint8_t *, uint8_t);
373int ustore_16(uint16_t *, uint16_t); 373int ustore_16(uint16_t *, uint16_t);
374int ustore_32(uint32_t *, uint32_t); 374int ustore_32(uint32_t *, uint32_t);
375#ifdef _LP64 375#ifdef _LP64
376int ustore_64(uint64_t *, uint64_t); 376int ustore_64(uint64_t *, uint64_t);
377#endif 377#endif
378int ustore_char(unsigned char *, unsigned char); 378int ustore_char(unsigned char *, unsigned char);
379int ustore_short(unsigned short *, unsigned short); 379int ustore_short(unsigned short *, unsigned short);
380int ustore_int(unsigned int *, unsigned int); 380int ustore_int(unsigned int *, unsigned int);
381int ustore_long(unsigned long *, unsigned long); 381int ustore_long(unsigned long *, unsigned long);
382int ustore_ptr(void **, void *); 382int ustore_ptr(void **, void *);
383 383
384#ifdef __UCAS_PRIVATE 384#ifdef __UCAS_PRIVATE
385 385
386#if defined(KASAN) 386#if defined(__HAVE_UCAS_FULL) && defined(KASAN)
387int kasan__ucas_32(volatile uint32_t *, uint32_t, uint32_t, uint32_t *); 387int kasan__ucas_32(volatile uint32_t *, uint32_t, uint32_t, uint32_t *);
388#ifdef __HAVE_UCAS_MP 388#ifdef __HAVE_UCAS_MP
389int kasan__ucas_32_mp(volatile uint32_t *, uint32_t, uint32_t, uint32_t *); 389int kasan__ucas_32_mp(volatile uint32_t *, uint32_t, uint32_t, uint32_t *);
390#endif /* __HAVE_UCAS_MP */ 390#endif /* __HAVE_UCAS_MP */
391#ifdef _LP64 391#ifdef _LP64
392int kasan__ucas_64(volatile uint64_t *, uint64_t, uint64_t, uint64_t *); 392int kasan__ucas_64(volatile uint64_t *, uint64_t, uint64_t, uint64_t *);
393#ifdef __HAVE_UCAS_MP 393#ifdef __HAVE_UCAS_MP
394int kasan__ucas_64_mp(volatile uint64_t *, uint64_t, uint64_t, uint64_t *); 394int kasan__ucas_64_mp(volatile uint64_t *, uint64_t, uint64_t, uint64_t *);
395#endif /* __HAVE_UCAS_MP */ 395#endif /* __HAVE_UCAS_MP */
396#endif /* _LP64 */ 396#endif /* _LP64 */
397#define _ucas_32 kasan__ucas_32 397#define _ucas_32 kasan__ucas_32
398#define _ucas_32_mp kasan__ucas_32_mp 398#define _ucas_32_mp kasan__ucas_32_mp
399#define _ucas_64 kasan__ucas_64 399#define _ucas_64 kasan__ucas_64
400#define _ucas_64_mp kasan__ucas_64_mp 400#define _ucas_64_mp kasan__ucas_64_mp
401#elif defined(KMSAN) 401#elif defined(__HAVE_UCAS_FULL) && defined(KMSAN)
402int kmsan__ucas_32(volatile uint32_t *, uint32_t, uint32_t, uint32_t *); 402int kmsan__ucas_32(volatile uint32_t *, uint32_t, uint32_t, uint32_t *);
403#ifdef __HAVE_UCAS_MP 403#ifdef __HAVE_UCAS_MP
404int kmsan__ucas_32_mp(volatile uint32_t *, uint32_t, uint32_t, uint32_t *); 404int kmsan__ucas_32_mp(volatile uint32_t *, uint32_t, uint32_t, uint32_t *);
405#endif /* __HAVE_UCAS_MP */ 405#endif /* __HAVE_UCAS_MP */
406#ifdef _LP64 406#ifdef _LP64
407int kmsan__ucas_64(volatile uint64_t *, uint64_t, uint64_t, uint64_t *); 407int kmsan__ucas_64(volatile uint64_t *, uint64_t, uint64_t, uint64_t *);
408#ifdef __HAVE_UCAS_MP 408#ifdef __HAVE_UCAS_MP
409int kmsan__ucas_64_mp(volatile uint64_t *, uint64_t, uint64_t, uint64_t *); 409int kmsan__ucas_64_mp(volatile uint64_t *, uint64_t, uint64_t, uint64_t *);
410#endif /* __HAVE_UCAS_MP */ 410#endif /* __HAVE_UCAS_MP */
411#endif /* _LP64 */ 411#endif /* _LP64 */
412#define _ucas_32 kmsan__ucas_32 412#define _ucas_32 kmsan__ucas_32
413#define _ucas_32_mp kmsan__ucas_32_mp 413#define _ucas_32_mp kmsan__ucas_32_mp
414#define _ucas_64 kmsan__ucas_64 414#define _ucas_64 kmsan__ucas_64