ifeq ($(subdir),misc)
sysdep_headers += sys/ifunc.h
-sysdep_routines += __mtag_address_get_tag \
- __mtag_tag_zero_region \
+sysdep_routines += __mtag_tag_zero_region \
__mtag_new_tag \
__mtag_tag_region
+++ /dev/null
-/* Copyright (C) 2020-2021 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <sysdep.h>
-
-#ifdef USE_MTAG
-#define ptr x0
-
- .arch armv8.5-a
- .arch_extension memtag
-
-ENTRY (__libc_mtag_address_get_tag)
-
- ldg ptr, [ptr]
- ret
-END (__libc_mtag_address_get_tag)
-#endif /* USE_MTAG */
#define __MTAG_MMAP_FLAGS PROT_MTE
/* Set the tags for a region of memory, which must have size and alignment
- that are multiples of __MTAG_GRANULE_SIZE. Size cannot be zero.
- void *__libc_mtag_tag_region (const void *, size_t) */
+ that are multiples of __MTAG_GRANULE_SIZE. Size cannot be zero. */
void *__libc_mtag_tag_region (void *, size_t);
/* Optimized equivalent to __libc_mtag_tag_region followed by memset to 0. */
void *__libc_mtag_tag_zero_region (void *, size_t);
/* Convert address P to a pointer that is tagged correctly for that
- location.
- void *__libc_mtag_address_get_tag (void*) */
-void *__libc_mtag_address_get_tag (void *);
+ location. */
+static __always_inline void *
+__libc_mtag_address_get_tag (void *p)
+{
+ register void *x0 asm ("x0") = p;
+ asm (".inst 0xd9600000 /* ldg x0, [x0] */" : "+r" (x0));
+ return x0;
+}
/* Assign a new (random) tag to a pointer P (does not adjust the tag on
the memory addressed).