diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2017-10-26 15:32:09 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2017-11-01 15:05:26 -0700 |
| commit | 6594213cfa332be88551596bf56cf01538339f37 (patch) | |
| tree | 3d273663c334fa3d715cd8964b73dcfdf46696cc | |
| parent | 1f2640bfa940362c7550cdd065d37555f21c8ae8 (diff) | |
svga: Use __asm__ instead of asm
__asm__ is portable, and allows the svga driver to be compiled with the
c99 standard instead of requiring the gnu99 standard.
I have compile tested this with GCC and Clang on Linux.
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Tested-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/gallium/drivers/svga/Makefile.am | 3 | ||||
| -rwxr-xr-x | src/gallium/drivers/svga/svga_msg.c | 10 | ||||
| -rw-r--r-- | src/gallium/winsys/svga/drm/Makefile.am | 3 |
3 files changed, 5 insertions, 11 deletions
diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am index 1ad5e0f91e6..2e5220e9f27 100644 --- a/src/gallium/drivers/svga/Makefile.am +++ b/src/gallium/drivers/svga/Makefile.am @@ -30,9 +30,6 @@ AM_CFLAGS = \ $(GALLIUM_DRIVER_CFLAGS) \ $(MSVC2013_COMPAT_CFLAGS) -#On some systems -std= must be added to CFLAGS to be the last -std= -CFLAGS += -std=gnu99 - noinst_HEADERS = $(SVGA_H_FILES) noinst_LTLIBRARIES = libsvga.la diff --git a/src/gallium/drivers/svga/svga_msg.c b/src/gallium/drivers/svga/svga_msg.c index e0346dee751..8b63132cb57 100755 --- a/src/gallium/drivers/svga/svga_msg.c +++ b/src/gallium/drivers/svga/svga_msg.c @@ -83,7 +83,7 @@ port_num, magic, \ ax, bx, cx, dx, si, di) \ ({ \ - asm volatile ("inl %%dx, %%eax;" : \ + __asm__ volatile ("inl %%dx, %%eax;" : \ "=a"(ax), \ "=b"(bx), \ "=c"(cx), \ @@ -128,7 +128,7 @@ typedef uint64_t VMW_REG; port_num, magic, bp, \ ax, bx, cx, dx, si, di) \ ({ \ - asm volatile ("push %%rbp;" \ + __asm__ volatile ("push %%rbp;" \ "movq %12, %%rbp;" \ "rep outsb;" \ "pop %%rbp;" : \ @@ -152,7 +152,7 @@ typedef uint64_t VMW_REG; port_num, magic, bp, \ ax, bx, cx, dx, si, di) \ ({ \ - asm volatile ("push %%rbp;" \ + __asm__ volatile ("push %%rbp;" \ "movq %12, %%rbp;" \ "rep insb;" \ "pop %%rbp" : \ @@ -183,7 +183,7 @@ typedef uint32_t VMW_REG; port_num, magic, bp, \ ax, bx, cx, dx, si, di) \ ({ \ - asm volatile ("push %%ebp;" \ + __asm__ volatile ("push %%ebp;" \ "mov %12, %%ebp;" \ "rep outsb;" \ "pop %%ebp;" : \ @@ -208,7 +208,7 @@ typedef uint32_t VMW_REG; port_num, magic, bp, \ ax, bx, cx, dx, si, di) \ ({ \ - asm volatile ("push %%ebp;" \ + __asm__ volatile ("push %%ebp;" \ "mov %12, %%ebp;" \ "rep insb;" \ "pop %%ebp" : \ diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am index dfa97367650..ac9de18d3df 100644 --- a/src/gallium/winsys/svga/drm/Makefile.am +++ b/src/gallium/winsys/svga/drm/Makefile.am @@ -29,9 +29,6 @@ AM_CFLAGS = \ $(GALLIUM_WINSYS_CFLAGS) \ $(LIBDRM_CFLAGS) -#On some systems -std= must be added to CFLAGS to be the last -std= -CFLAGS += -std=gnu99 - noinst_LTLIBRARIES = libsvgadrm.la libsvgadrm_la_SOURCES = $(C_SOURCES) |