Changeset bc73be3 in mainline for uspace/lib/c/arch/arm64/src/tls.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

• uspace/lib/c/arch/arm64/src/tls.c (moved) (moved from uspace/lib/draw/codec/tga.h ) (2 diffs)

uspace/lib/c/arch/arm64/src/tls.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Decky
- * Copyright (c) 2011 Petr Koupy
+ * Copyright (c) 2015 Petr Pavlu
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup draw
- * @{
+/** @addtogroup libcarm64
  */
-/**
- * @file
+/** @file
+ * @brief Thread-local storage.
  */
 
-#ifndef DRAW_CODEC_TGA_H_
-#define DRAW_CODEC_TGA_H_
+#include <tls.h>
+#include <stddef.h>
 
-#include <stddef.h>
-#include "../surface.h"
+tcb_t *tls_alloc_arch(size_t size, size_t align)
+{
+        return tls_alloc_variant_1(size, align);
+}
 
-extern surface_t *decode_tga(void *, size_t, surface_flags_t);
-extern bool encode_tga(surface_t *, void **, size_t *);
-
-#endif
+void tls_free_arch(tcb_t *tcb, size_t size, size_t align)
+{
+        tls_free_variant_1(tcb, size, align);
+}
 
 /** @}