[LibOS] Cleanup of shim_tls.h

LibOS/shim/include/shim_tls.h

@@ -1,11 +1,8 @@
 #ifndef _SHIM_TLS_H_
 #define _SHIM_TLS_H_
 
-#ifndef __ASSEMBLER__
-
 #ifdef IN_SHIM
 
-#include <shim_defs.h>
 #include <atomic.h>
 
 #else  /* !IN_SHIM */
@@ -21,16 +18,6 @@ struct atomic_int {
 
 #define SHIM_TLS_CANARY 0xdeadbeef
 
-struct lock_record {
-    enum { NO_LOCK, SEM_LOCK, READ_LOCK, WRITE_LOCK } type;
-    void * lock;
-    const char * filename;
-    int lineno;
-};
-
-#define NUM_LOCK_RECORD      32
-#define NUM_LOCK_RECORD_MASK (NUM_LOCK_RECORD - 1)
-
 struct shim_regs {
     unsigned long           orig_rax;
     unsigned long           rsp;
@@ -132,6 +119,4 @@ static inline __libc_tcb_t * shim_libc_tcb(void)
 
 #endif /* IN_SHIM */
 
-#endif /* !__ASSEMBLER__ */
-
 #endif /* _SHIM_H_ */

LibOS/shim/src/syscallas.S

@@ -20,7 +20,6 @@
  * This file contains the entry point of system call table in library OS.
  */
 
-#include <shim_tls.h>
 #include <shim_unistd_defs.h>
 
 #include "asm-offsets.h"