summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortsi <tsi>2008-03-18 19:36:52 +0000
committertsi <tsi>2008-03-18 19:36:52 +0000
commite8667a0601040e0fe774971353324f0b7b29ff1e (patch)
tree193b643f876fd0014d6bf0600594d2c47bf3da2a
parent1b9e9c3e8122551a0d80aaf185d3da7e675dab2a (diff)
19. When building an XFree86 loader server with stack backtrace support, use
GCC's -fno-omit-frame-pointer flag to improve the accuracy of stack traces (Marc La France). 18. Fix (portably this time) X server links to ensure dependant subdirs are tranversed before the server linked (Marc La France).
-rw-r--r--config/cf/Imake.rules9
-rw-r--r--config/cf/Win32.rules8
-rw-r--r--programs/Xserver/hw/xfree86/CHANGELOG7
3 files changed, 19 insertions, 5 deletions
diff --git a/config/cf/Imake.rules b/config/cf/Imake.rules
index 93b27f752..d253e67c9 100644
--- a/config/cf/Imake.rules
+++ b/config/cf/Imake.rules
@@ -1,6 +1,6 @@
XCOMM ---------------------------------------------------------------------
XCOMM Imake rules for building libraries, programs, scripts, and data files
-XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.153tsi Exp $
+XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.154tsi Exp $
/*
* Copyright (c) 1994-2006 by The XFree86 Project, Inc.
* All rights reserved.
@@ -1139,7 +1139,12 @@ CplusplusProgramTargetHelper(program,SRCS10,OBJS10,DEPLIBS10,locallib,syslib)
#ifndef ServerTargetWithFlags
#define ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
AllTarget(ProgramTargetName(server)) @@\
-ProgramTargetName(server): subdirs /* objects libs */ @@\
+Concat(server,DEPS) = objects libs @@\
+ @@\
+$(Concat(server,DEPS)):: subdirs @@\
+ $(_NULLCMD_) @@\
+ @@\
+ProgramTargetName(server): objects libs @@\
MoveToBakFile($@) @@\
LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
@@\
diff --git a/config/cf/Win32.rules b/config/cf/Win32.rules
index f4fadde4e..015cd6565 100644
--- a/config/cf/Win32.rules
+++ b/config/cf/Win32.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/Win32.rules,v 1.7 2006/01/09 14:56:12 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Win32.rules,v 1.8tsi Exp $
#define HasSharedLibraries YES
#define NeedLibInsideFlag YES
@@ -506,7 +506,11 @@ LintLibReferences(varname,libname,libsource)
XVARdef0 = objects @@\
@@\
AllTarget(ProgramTargetName(server)) @@\
-ProgramTargetName(server): subdirs $(XVARuse0:.o=.obj) libs @@\
+ @@\
+$(XVARuse0:.o=.obj) libs:: subdirs @@\
+ $(_NULLCMD_) @@\
+ @@\
+ProgramTargetName(server): $(XVARuse0:.o=.obj) libs @@\
MoveToBakFile($@) @@\
LinkRule($@,$(LDOPTIONS),$(XVARuse0:.o=.obj),libs $(LDLIBS) syslibs) @@\
@@\
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index d251547cb..1c5364567 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,9 @@
XFree86 4.7.99.14 (xx March 2008)
+ 19. When building an XFree86 loader server with stack backtrace support, use
+ GCC's -fno-omit-frame-pointer flag to improve the accuracy of stack
+ traces (Marc La France).
+ 18. Fix (portably this time) X server links to ensure dependant subdirs are
+ tranversed before the server linked (Marc La France).
XFree86 4.7.99.13 (9 March 2008)
@@ -20653,4 +20658,4 @@ XFree86 3.0a (28 April 1994)
XFree86 3.0 (26 April 1994)
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3930 2008/02/23 12:02:53 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3931 2008/03/09 12:03:27 dawes Exp $