intel/disasm: brw_label and support functions

[mesa.git] / src / mesa / x86 / assyntax.h

diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
index f2192cc220e4022b8a95c04e5962036a5b407c41..f269cb45ce7a43042aa2f06f7bc83b3b505aa309 100644 (file)
--- a/src/mesa/x86/assyntax.h
+++ b/src/mesa/x86/assyntax.h
@@ -255,7 +255,7 @@
 #endif /* ACK_ASSEMBLER */
 
 
-#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) && !defined(__DJGPP__) && !defined(__MINGW32__)
+#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) && !defined(__MINGW32__)
 #define GLNAME(a)      a
 #else
 #define GLNAME(a)      CONCAT(_,a)
@@ -920,17 +920,9 @@
 #define D_BYTE         db
 /* #define SPACE */
 /* #define COMM */
-#if defined(__WATCOMC__)
-SECTION _TEXT public align=16 class=CODE use32 flat
-SECTION _DATA public align=16 class=DATA use32 flat
-#define SEG_TEXT       SECTION _TEXT
-#define SEG_DATA       SECTION _DATA
-#define SEG_BSS                SECTION .bss
-#else
 #define SEG_DATA       SECTION .data
 #define SEG_TEXT       SECTION .text
 #define SEG_BSS                SECTION .bss
-#endif
 
 #define D_SPACE(n)     db n REP 0
 
@@ -985,7 +977,8 @@ SECTION _DATA public align=16 class=DATA use32 flat
 
 #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \
  || (defined(__linux__) || defined(__OS2ELF__)) && defined(__ELF__) \
- || defined(__FreeBSD__) && __FreeBSD__ >= 3
+ || (defined(__FreeBSD__) && __FreeBSD__ >= 3) \
+ || (defined(__NetBSD__) && defined(__ELF__))
 #define GLNAME(a)      a
 #else
 #define GLNAME(a)      CONCAT(_, a)
@@ -1730,11 +1723,24 @@ SECTION _DATA public align=16 class=DATA use32 flat
 #define TLBL(a)                CONCAT(a,$)
 #endif
 
-/* hidden symbol visibility support */
-#ifdef GNU_ASSEMBLER
-#define HIDDEN(a)       .hidden a
+/* Hidden symbol visibility support.
+ * If we build with gcc's -fvisibility=hidden flag, we'll need to change
+ * the symbol visibility mode to 'default'.
+ */
+#if defined(GNU_ASSEMBLER) && !defined(__MINGW32__) && !defined(__APPLE__)
+#  define HIDDEN(x) .hidden x
+#elif defined(__GNUC__) && !defined(__MINGW32__) && !defined(__APPLE__)
+#  pragma GCC visibility push(default)
+#  define HIDDEN(x) .hidden x
+#else
+#  define HIDDEN(x)
+#endif
+
+/* Control flow enforcement support */
+#ifdef HAVE_CET_H
+#include <cet.h>
 #else
-#define HIDDEN(a)
+#define _CET_ENDBR
 #endif
 
 #endif /* __ASSYNTAX_H__ */