intel/compiler: Test compaction on Gen <= 12

[mesa.git] / src / mesa / x86 / read_rgba_span_x86.S

diff --git a/src/mesa/x86/read_rgba_span_x86.S b/src/mesa/x86/read_rgba_span_x86.S
index 3be4515b114f94f53638c93aa391d4bacc52ffc2..9a68ab83e34e33c22d5f52cc49bfec50dd452489 100644 (file)
--- a/src/mesa/x86/read_rgba_span_x86.S
+++ b/src/mesa/x86/read_rgba_span_x86.S
@@ -29,9 +29,15 @@
  *
  * \author Ian Romanick <idr@us.ibm.com>
  */
+/* Control flow enforcement support */
+#ifdef HAVE_CET_H
+#include <cet.h>
+#else
+#define _CET_ENDBR
+#endif
 
        .file   "read_rgba_span_x86.S"
-#if !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */
+#if !defined(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */
 /* Kevin F. Quinn 2nd July 2006
  * Replaced data segment constants with text-segment instructions.
  */
@@ -65,7 +71,7 @@
        movl    (%ebx), %eax ; \
        bswap   %eax          /* ARGB -> BGRA */ ; \
        rorl    $8, %eax      /* BGRA -> ABGR */ ; \
-       movl    %eax, (%ecx)  /* ABGR -> R, G, B, A */ ; \
+       movl    %eax, (%ecx)  /* ABGR -> R, G, B, A */ ;
 
 
 /**
@@ -77,11 +83,10 @@
  */
 
 .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
-#ifndef USE_DRICORE
 .hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
-#endif
        .type   _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
 _generic_read_RGBA_span_BGRA8888_REV_MMX:
+       _CET_ENDBR
        pushl   %ebx
 
 #ifdef USE_INNER_EMMS
@@ -174,11 +179,10 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX:
  */
 
 .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
-#ifndef USE_DRICORE
 .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
-#endif
        .type   _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
 _generic_read_RGBA_span_BGRA8888_REV_SSE:
+       _CET_ENDBR
        pushl   %esi
        pushl   %ebx
        pushl   %ebp
@@ -339,11 +343,10 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE:
 
        .text
 .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
-#ifndef USE_DRICORE
 .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
-#endif
        .type   _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
 _generic_read_RGBA_span_BGRA8888_REV_SSE2:
+       _CET_ENDBR
        pushl   %esi
        pushl   %ebx
 
@@ -500,13 +503,11 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
 
        .text
        .globl  _generic_read_RGBA_span_RGB565_MMX
-#ifndef USE_DRICORE
         .hidden _generic_read_RGBA_span_RGB565_MMX
-#endif
        .type   _generic_read_RGBA_span_RGB565_MMX, @function
 
 _generic_read_RGBA_span_RGB565_MMX:
-
+       _CET_ENDBR
 #ifdef USE_INNER_EMMS
        emms
 #endif
@@ -679,7 +680,7 @@ _generic_read_RGBA_span_RGB565_MMX:
        emms
 #endif
        ret
-#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) */
+#endif /* !defined(__MINGW32__) && !defined(__APPLE__) */
        
 #if defined (__ELF__) && defined (__linux__)
        .section .note.GNU-stack,"",%progbits