andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
xserver-multidpi/os/Makefile.am

70 lines
1.2 KiB
Makefile
Raw Permalink Normal View History

Revert "os: Prevent backtrace from being stopped in noreturn functions." This reverts commit 579715f830fbbca9e1ecb17dc18176132f5969e7. The patch is not needed anymore. I haven't encountered backtrace problems with GCC 4.3.3. Even if the problems still persisted, this commit should be removed and instead the definition of _X_NORETURN should be modified to be empty if GCC/ARM is used. However, currently it seems that ARM backtraces are OK even if _X_NORETURN is used and -mapcs-frame is not defined in CFLAGS. Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2010-06-15 14:44:38 +02:00
noinst_LTLIBRARIES = libos.la
Adding initial build system.
2005-07-01 22:29:53 +02:00
Move SHA1 computation from render/glyph.c to os/ Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Rémi Cardona <remi@gentoo.org>
2009-10-14 23:20:44 +02:00
AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_CFLAGS)
Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere.
2005-07-02 20:59:44 +02:00
Actually build Secure RPC authentication support (missed in modularization)
2007-08-18 00:29:16 +02:00
SECURERPC_SRCS = rpcauth.c
automake: avoid use of reserved _SOURCES keyword (bug #8866) Avoid using _SOURCES unless we're directly referencing a program or library to be built; use _SRCS instead. Shuts automake 1.10 up.
2006-11-04 17:59:39 +01:00
XDMCP_SRCS = xdmcp.c
Revert "os: Prevent backtrace from being stopped in noreturn functions." This reverts commit 579715f830fbbca9e1ecb17dc18176132f5969e7. The patch is not needed anymore. I haven't encountered backtrace problems with GCC 4.3.3. Even if the problems still persisted, this commit should be removed and instead the definition of _X_NORETURN should be modified to be empty if GCC/ARM is used. However, currently it seems that ARM backtraces are OK even if _X_NORETURN is used and -mapcs-frame is not defined in CFLAGS. Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2010-06-15 14:44:38 +02:00
XORG_SRCS = log.c
Trap SIGBUS to handle truncated shared memory segments If a client passes a section of memory via file descriptor and then subsequently truncates that file, the underlying pages will be freed and the addresses invalidated. Subsequent accesses to the page will fail with a SIGBUS error. Trap that SIGBUS, figure out which segment was causing the error and then allocate new pages to fill in for that region. Mark the offending shared segment as invalid and free the resource ID so that the client will be able to tell when subsequently attempting to use the segment. Signed-off-by: Keith Packard <keithp@keithp.com> v2: Use MAP_FIXED to simplify the recovery logic (Mark Kettenis) v3: Also catch errors in ShmCreateSegment Conflicts: include/dix-config.h.in include/xorg-config.h.in
2013-11-03 22:12:40 +01:00
BUSFAULT_SRCS = busfault.c
Adding initial build system.
2005-07-01 22:29:53 +02:00
os: Add poll emulation for mingw [v2] v2: rename as 'xserver_poll' to avoid potential library name collisions. Provide 'xserver_poll.h' which uses the system poll where available and falls back to this emulation otherwise. Autodetects when this is required, building the emulation only then Source: https://github.com/bmc/poll Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-07-12 00:30:05 +02:00
XSERVER_POLL_SRCS=xserver_poll.c
Adding initial build system.
2005-07-01 22:29:53 +02:00
libos_la_SOURCES = \
WaitFor.c \
access.c \
auth.c \
Move xorg_backtrace() up to the OS level so we can call it from DIX.
2008-10-10 21:53:48 +02:00
backtrace.c \
os: Add facilities for client ID tracking. An interface is provided for figuring out the PID and process name of a client. Make some existing functionality from SELinux and IA extensions available for general use. Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi> Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2010-12-22 15:51:09 +01:00
client.c \
Adding initial build system.
2005-07-01 22:29:53 +02:00
connection.c \
Create a threaded mechanism for input [v7] The current SIGIO signal handler method, used at generation of input events, has a bunch of oddities. This patch introduces an alternative way using a thread, which is used to select() all input device file descriptors. A mutex was used to control the access to input structures by the main and input threads. Two pipes to emit alert events (such hotplug ones) and guarantee the proper communication between them was also used. Co-authored-by: Fernando Carrijo <fcarrijo@freedesktop.org> Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> v2: Fix non-Xorg link. Enable where supported by default. This also splits out the actual enabling of input threads to DDX-specific patches which follow v3: Make the input lock recursive v4: Use regular RECURSIVE_MUTEXes instead of rolling our own Respect the --disable-input-thread configuration option by providing stubs that expose the same API/ABI. Respond to style comments from Peter Hutterer. v5: use __func__ in inputthread debug and error mesages. Respond to style comments from Peter Hutterer. v6: use AX_PTHREAD instead of inlining pthread tests. Suggested by Emil Velikov <emil.l.velikov@gmail.com> v7: Use pthread_sigmask instead of sigprocmask when using threads Suggested by Adam Jackson <ajax@redhat.com> Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2015-12-08 20:37:51 +01:00
inputthread.c \
Adding initial build system.
2005-07-01 22:29:53 +02:00
io.c \
mitauth.c \
oscolor.c \
osdep.h \
osinit.c \
os: Add ospoll interface [v2] This provides a wrapper around poll or epoll providing a callback-based interface for monitoring activity on a large set of file descriptors. v2: use xserver_poll API instead of poll. Don't use WSAPoll as that is broken. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-05-26 19:20:45 +02:00
ospoll.c \
os: Add 'ospoll.h' to Makefile.am Distribute this source file. Signed-off-by: Keith Packard <keithp@keithp.com>
2016-09-16 19:56:15 +02:00
ospoll.h \
Adding initial build system.
2005-07-01 22:29:53 +02:00
utils.c \
xdmauth.c \
Move SHA1 computation from render/glyph.c to os/ Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Rémi Cardona <remi@gentoo.org>
2009-10-14 23:20:44 +02:00
xsha1.c \
Adding initial build system.
2005-07-01 22:29:53 +02:00
xstrans.c \
Revert "os: Prevent backtrace from being stopped in noreturn functions." This reverts commit 579715f830fbbca9e1ecb17dc18176132f5969e7. The patch is not needed anymore. I haven't encountered backtrace problems with GCC 4.3.3. Even if the problems still persisted, this commit should be removed and instead the definition of _X_NORETURN should be modified to be empty if GCC/ARM is used. However, currently it seems that ARM backtraces are OK even if _X_NORETURN is used and -mapcs-frame is not defined in CFLAGS. Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2010-06-15 14:44:38 +02:00
xprintf.c \
$(XORG_SRCS)
Move to autoconf standard function name checks & defines Replace multiple methods of checking for functions with AC_CHECK_FUNCS Replace multiple methods of selecting fallback funcs with AC_REPLACE_FUNCS Replace HAS_* and NEED_* #defines with autogenerated HAVE_* Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-12-01 07:20:09 +01:00
libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) $(LTLIBOBJS)
Bugzilla #5219 <https://bugs.freedesktop.org/show_bug.cgi?id=5219> Make sure all optional sources are included in EXTRA_DIST, even if they aren't used on the platform the distballs are made on.
2005-12-06 16:50:35 +01:00
Actually build Secure RPC authentication support (missed in modularization)
2007-08-18 00:29:16 +02:00
if SECURE_RPC
libos_la_SOURCES += $(SECURERPC_SRCS)
endif
os: Add poll emulation for mingw [v2] v2: rename as 'xserver_poll' to avoid potential library name collisions. Provide 'xserver_poll.h' which uses the system poll where available and falls back to this emulation otherwise. Autodetects when this is required, building the emulation only then Source: https://github.com/bmc/poll Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-07-12 00:30:05 +02:00
if POLL
else
libos_la_SOURCES += $(XSERVER_POLL_SRCS)
endif
Bugzilla #5219 <https://bugs.freedesktop.org/show_bug.cgi?id=5219> Make sure all optional sources are included in EXTRA_DIST, even if they aren't used on the platform the distballs are made on.
2005-12-06 16:50:35 +01:00
if XDMCP
automake: avoid use of reserved _SOURCES keyword (bug #8866) Avoid using _SOURCES unless we're directly referencing a program or library to be built; use _SRCS instead. Shuts automake 1.10 up.
2006-11-04 17:59:39 +01:00
libos_la_SOURCES += $(XDMCP_SRCS)
Bugzilla #5219 <https://bugs.freedesktop.org/show_bug.cgi?id=5219> Make sure all optional sources are included in EXTRA_DIST, even if they aren't used on the platform the distballs are made on.
2005-12-06 16:50:35 +01:00
endif
os: use libunwind to generate backtraces Libunwind generates backtraces much more reliably than glibc's "backtrace". Before: 0: /opt/xserver/bin/X (0x400000+0x18ce36) [0x58ce36] 1: /opt/xserver/bin/X (xorg_backtrace+0x9) [0x58d119] 2: /opt/xserver/bin/X (0x400000+0x190d69) [0x590d69] 3: /lib64/libpthread.so.0 (0x7fb904268000+0x10a90) [0x7fb904278a90] 4: /lib64/libc.so.6 (ioctl+0x7) [0x7fb902fbf987] 5: /usr/lib64/libdrm.so.2 (drmIoctl+0x28) [0x7fb90405ffa8] 6: /usr/lib64/libdrm.so.2 (drmCommandWrite+0x1b) [0x7fb90406235b] 7: /usr/lib64/libdrm_nouveau.so.2 (nouveau_bo_wait+0x89) [0x7fb902009719] 8: /opt/xserver/lib/xorg/modules/drivers/nouveau_drv.so (0x7fb90220e000+0x76f3) [0x7fb9022156f3] 9: /opt/xserver/lib/xorg/modules/libexa.so (0x7fb9019c7000+0xbae0) [0x7fb9019d2ae0] 10: /opt/xserver/bin/X (0x400000+0x17d2b3) [0x57d2b3] 11: /opt/xserver/bin/X (0x400000+0xc9930) [0x4c9930] 12: /opt/xserver/bin/X (0x400000+0x3a81a) [0x43a81a] 13: /opt/xserver/bin/X (0x400000+0x3d6a1) [0x43d6a1] 14: /opt/xserver/bin/X (0x400000+0x2c2ca) [0x42c2ca] 15: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x7fb902f019b5] 16: /opt/xserver/bin/X (0x400000+0x2c60d) [0x42c60d] 17: ?? [0x0] After: 0: /opt/xserver/bin/X (OsSigHandler+0x39) [0x590d69] 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x7fb904278a8f] 2: /lib64/libc.so.6 (ioctl+0x7) [0x7fb902fbf987] 3: /usr/lib64/libdrm.so.2 (drmIoctl+0x28) [0x7fb90405ffa8] 4: /usr/lib64/libdrm.so.2 (drmCommandWrite+0x1b) [0x7fb90406235b] 5: /usr/lib64/libdrm_nouveau.so.2 (nouveau_bo_wait+0x89) [0x7fb902009719] 6: /opt/xserver/lib/xorg/modules/drivers/nouveau_drv.so (nouveau_exa_download_from_screen+0x1a3) [0x7fb9022156f3] 7: /opt/xserver/lib/xorg/modules/libexa.so (exaGetImage+0x1f0) [0x7fb9019d2ae0] 8: /opt/xserver/bin/X (miSpriteGetImage+0x173) [0x57d2b3] 9: /opt/xserver/bin/X (compGetImage+0xb0) [0x4c9930] 10: /opt/xserver/bin/X (ProcGetImage+0x55a) [0x43a81a] 11: /opt/xserver/bin/X (Dispatch+0x341) [0x43d6a1] 12: /opt/xserver/bin/X (main+0x3ba) [0x42c2ca] 13: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x7fb902f019b5] 14: /opt/xserver/bin/X (_start+0x29) [0x42c60d] 15: ? (?+0x29) [0x29] Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Knut Petersen <knut.petersen@t-online.de>
2013-02-21 00:02:44 +01:00
if HAVE_LIBUNWIND
AM_CFLAGS += $(LIBUNWIND_CFLAGS)
libos_la_LIBADD += $(LIBUNWIND_LIBS)
endif
Trap SIGBUS to handle truncated shared memory segments If a client passes a section of memory via file descriptor and then subsequently truncates that file, the underlying pages will be freed and the addresses invalidated. Subsequent accesses to the page will fail with a SIGBUS error. Trap that SIGBUS, figure out which segment was causing the error and then allocate new pages to fill in for that region. Mark the offending shared segment as invalid and free the resource ID so that the client will be able to tell when subsequently attempting to use the segment. Signed-off-by: Keith Packard <keithp@keithp.com> v2: Use MAP_FIXED to simplify the recovery logic (Mark Kettenis) v3: Also catch errors in ShmCreateSegment Conflicts: include/dix-config.h.in include/xorg-config.h.in
2013-11-03 22:12:40 +01:00
if BUSFAULT
libos_la_SOURCES += $(BUSFAULT_SRCS)
endif
Move to autoconf standard function name checks & defines Replace multiple methods of checking for functions with AC_CHECK_FUNCS Replace multiple methods of selecting fallback funcs with AC_REPLACE_FUNCS Replace HAS_* and NEED_* #defines with autogenerated HAVE_* Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-12-01 07:20:09 +01:00
EXTRA_DIST = $(SECURERPC_SRCS) $(XDMCP_SRCS)
Add DTrace probe points for X server <-> client communications See http://people.freedesktop.org/~alanc/dtrace/ for more details
2006-11-03 21:54:43 +01:00
Add platform tests for Dtrace linker magic Replaces special handling for Xquartz DDX and scales better to handling the multiple platforms that now have some level of Dtrace support available. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2009-10-06 01:52:19 +02:00
if SPECIAL_DTRACE_OBJECTS
Add DTrace probe points for X server <-> client communications See http://people.freedesktop.org/~alanc/dtrace/ for more details
2006-11-03 21:54:43 +01:00
# Generate dtrace object code for probes in libos & libdix
dtrace: Move Xserver.d from dix/ to include/ dix/ is typically not in the include path, and this properly belongs in include anyway since it's needed from os/ too.
2019-08-27 21:48:59 +02:00
dtrace.o: $(top_srcdir)/include/Xserver.d libos.la
$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/include/Xserver.d .libs/*.o ../dix/.libs/*.o
Add DTrace probe points for X server <-> client communications See http://people.freedesktop.org/~alanc/dtrace/ for more details
2006-11-03 21:54:43 +01:00
Tell automake to STFU about the *.O files automake will not stop whining about the *.O files not being in normal library name format, so just tell automake they are PROGRAMS so it builds them without bitching.
2006-12-01 04:53:29 +01:00
noinst_PROGRAMS = os.O
Add DTrace probe points for X server <-> client communications See http://people.freedesktop.org/~alanc/dtrace/ for more details
2006-11-03 21:54:43 +01:00
Don't use empty source files When an empty _SOURCES variable is declared, automake will recognize that only linking is needed. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-15 02:21:48 +02:00
os_O_SOURCES =
os,dix: Depend custom libs on libs, not objects The custom os/os.O library reuses *.o files of os/libos.la. The current rule assumes automake puts all the objects into per-target am__*_la_OBJECTS variable. At least with AC_REPLACE_FUNCS, this no longer holds (as wanted objects are put into LTLIBOBJS instead). Depend on automake's result, the *.la library instead, to express demand of any its dependencies being built. Should be fixing randomly occuring "undefined reference to `strlcpy'" errors when linking Xvfb and other DDX-es that could use os.O. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2016-12-29 08:37:18 +01:00
os.O: dtrace.o libos.la
Use $(AM_V_GEN) to silence more commands when AM_SILENT_RULES is active Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Eric Anholt <eric@anholt.net> Acked-by: Dan Nicholson <dbn.lists@gmail.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-03 06:54:53 +02:00
$(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
Add DTrace probe points for X server <-> client communications See http://people.freedesktop.org/~alanc/dtrace/ for more details
2006-11-03 21:54:43 +01:00
endif