Magellan Linux

Contents of /trunk/xorg-old/patches-6.8.2-r10/9910_all_use-nonow-ldflag-for-hardenedgccspecs.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 167 - (show annotations) (download)
Tue May 8 20:58:51 2007 UTC (17 years ago) by niro
File size: 1348 byte(s)
-import

1 diff -urN xc.orig/config/cf/Imake.rules xc/config/cf/Imake.rules
2 --- xc.orig/config/cf/Imake.rules 2004-08-13 10:21:43.000000000 -0700
3 +++ xc/config/cf/Imake.rules 2004-10-11 01:58:56.556395456 -0700
4 @@ -3493,6 +3493,10 @@
5 #endif
6 #endif
7
8 +#if defined(HardenedGccSpecs) && HardenedGccSpecs
9 +LDBIND_FLAGS = -nonow
10 +#endif
11 +
12 /*
13 * DynamicModuleTarget - build a module to be dynamically loaded
14 */
15 @@ -3502,7 +3506,7 @@
16 @@\
17 module: modlist @@\
18 RemoveFile($@) @@\
19 - $(CC) -o $@ $(SHLIBLDFLAGS) modlist @@\
20 + $(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib $(LDBIND_FLAGS) modlist @@\
21 @@\
22 clean:: @@\
23 RemoveFile(module)
24 @@ -3517,7 +3521,7 @@
25 @@\
26 module: deplist @@\
27 RemoveFile($@) @@\
28 - $(CC) -o $@ $(SHLIBLDFLAGS) modlist @@\
29 + $(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib $(LDBIND_FLAGS) modlist @@\
30 @@\
31 clean:: @@\
32 RemoveFile(module)
33 diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
34 --- xc.orig/programs/Xserver/Imakefile 2004-10-11 01:51:58.590935864 -0700
35 +++ xc/programs/Xserver/Imakefile 2004-10-11 01:56:44.395486968 -0700
36 @@ -686,6 +686,9 @@
37 XCOMM
38 XCOMM Xorg Server
39 XCOMM
40 +#if defined(HardenedGccSpecs) && HardenedGccSpecs && DoLoadableServer
41 +LOCAL_LDFLAGS += -nonow
42 +#endif
43 FBSUBDIR = fb
44 MFBSUBDIR = mfb
45 CFB8SUBDIR = cfb