* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input because of whitespace problems in concatenation macros. normally the use of these macros as they are wouldn't be a problem except we are receiving -traditional-cpp from share/mk and the spaces are being passed. XXX further discussion needs to occur in order for this to be properly fixed
This commit is contained in:
parent
4e07a05b2d
commit
d1bddf3bf4
6
external/mit/xorg/TODO
vendored
6
external/mit/xorg/TODO
vendored
@ -13,6 +13,12 @@ libs - done
|
||||
-- many libs may not install manuals yet.
|
||||
-- many libs should have pkg-config files generated/installed?
|
||||
this will apparently help with pkgsrc.
|
||||
-- libGL has has glapi_x86.S commented out from the
|
||||
build because it spews when eating -traditional-cpp
|
||||
cheap whitespace hacks have been discussed or
|
||||
phone suggested we only pass -traditional-cpp to
|
||||
platforms where assemblers do things with '#'.
|
||||
|
||||
tools - done
|
||||
share - done
|
||||
bin - done
|
||||
|
15
external/mit/xorg/lib/libGL/Makefile
vendored
15
external/mit/xorg/lib/libGL/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2008/08/02 13:26:26 rtr Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -17,12 +17,13 @@ SRCS.glx= glcontextmodes.c clientattrib.c compsize.c eval.c glxcmds.c \
|
||||
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
|
||||
SRCS.glx+= glapi.c glthread.c
|
||||
|
||||
.if ${MACHINE} == "i386"
|
||||
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/x86
|
||||
SRCS.glx+= glapi_x86.S
|
||||
CPPFLAGS+= -DUSE_X86_ASM -I${X11SRCDIR.MesaLib}/src/mesa/x86
|
||||
# -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
|
||||
.endif
|
||||
# XXX see TODO
|
||||
#.if ${MACHINE} == "i386"
|
||||
#.PATH: ${X11SRCDIR.MesaLib}/src/mesa/x86
|
||||
#SRCS.glx+= glapi_x86.S
|
||||
#CPPFLAGS+= -DUSE_X86_ASM -I${X11SRCDIR.MesaLib}/src/mesa/x86
|
||||
## -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
|
||||
#.endif
|
||||
|
||||
|
||||
.if ${X11DRI} != "no"
|
||||
|
Loading…
Reference in New Issue
Block a user