Blame allegro-4.2.1-noexecmod.patch
|
 |
ebca71b |
--- allegro-4.2.1/src/x/xdga2s.s~ 2006-12-22 16:14:41.000000000 +0100
|
|
|
ebca71b |
+++ allegro-4.2.1/src/x/xdga2s.s 2006-12-22 16:14:41.000000000 +0100
|
|
|
ebca71b |
@@ -24,7 +24,7 @@
|
|
|
ebca71b |
|
|
|
ebca71b |
.text
|
|
|
ebca71b |
|
|
|
ebca71b |
-
|
|
|
ebca71b |
+#if 0 /* this is non PIC and we have a C alternative, so don't use it! */
|
|
|
ebca71b |
#if (!defined ALLEGRO_NO_ASM) && (defined ALLEGRO_XWINDOWS_WITH_XF86DGA2)
|
|
|
ebca71b |
#if (!defined ALLEGRO_WITH_MODULES) || (defined ALLEGRO_MODULE)
|
|
|
ebca71b |
|
|
|
ebca71b |
@@ -50,5 +50,6 @@
|
|
|
ebca71b |
|
|
|
ebca71b |
#endif
|
|
|
ebca71b |
#endif
|
|
|
ebca71b |
+#endif
|
|
|
ebca71b |
.section .note.GNU-stack,"",@progbits
|
|
|
ebca71b |
|
|
|
ebca71b |
--- allegro-4.2.1/src/x/xdga2.c~ 2006-12-22 16:17:40.000000000 +0100
|
|
|
ebca71b |
+++ allegro-4.2.1/src/x/xdga2.c 2006-12-22 16:17:40.000000000 +0100
|
|
|
ebca71b |
@@ -49,7 +49,7 @@
|
|
|
ebca71b |
static void _xdga2_acquire(BITMAP *bmp);
|
|
|
ebca71b |
static GFX_MODE_LIST *_xdga2_fetch_mode_list(void);
|
|
|
ebca71b |
|
|
|
ebca71b |
-#ifdef ALLEGRO_NO_ASM
|
|
|
ebca71b |
+#if 1 /* the asm is non PIC and we have a C alternative, so don't use it! */
|
|
|
ebca71b |
uintptr_t _xdga2_write_line(BITMAP *bmp, int line);
|
|
|
ebca71b |
#else
|
|
|
ebca71b |
uintptr_t _xdga2_write_line_asm(BITMAP *bmp, int line);
|
|
|
ebca71b |
@@ -559,7 +559,7 @@
|
|
|
ebca71b |
/* Hardware acceleration has been requested */
|
|
|
ebca71b |
|
|
|
ebca71b |
/* Updates line switcher to accommodate framebuffer synchronization */
|
|
|
ebca71b |
-#ifdef ALLEGRO_NO_ASM
|
|
|
ebca71b |
+#if 1 /* the asm is non PIC and we have a C alternative, so don't use it! */
|
|
|
ebca71b |
bmp->write_bank = _xdga2_write_line;
|
|
|
ebca71b |
bmp->read_bank = _xdga2_write_line;
|
|
|
ebca71b |
#else
|
|
|
ebca71b |
@@ -816,7 +816,7 @@
|
|
|
ebca71b |
}
|
|
|
ebca71b |
|
|
|
ebca71b |
|
|
|
ebca71b |
-#ifdef ALLEGRO_NO_ASM
|
|
|
ebca71b |
+#if 1 /* the asm is non PIC and we have a C alternative, so don't use it! */
|
|
|
ebca71b |
|
|
|
ebca71b |
/* _xdga2_write_line:
|
|
|
ebca71b |
* Returns new line and synchronizes framebuffer if needed.
|