[patch] dlloader patch that hopefully applies cleanly here?

hardened4.patch (text/plain), 1.63 KB, created by Scott Taylor (RETIRED) on 2004-09-28 23:22:45 UTC

--- programs/Xserver/Imakefile.swt	2004-09-28 23:28:38.607686472 -0600
+++ programs/Xserver/Imakefile	2004-09-28 23:28:45.632126787 -0600
@@ -684,10 +684,13 @@
 
 #if defined(XorgServer) && XorgServer
 XCOMM
 XCOMM Xorg Server
 XCOMM
+#if defined(HardenedGccSpecs) && HardenedGccSpecs && DoLoadableServer
+LOCAL_LDFLAGS += -nonow
+#endif
 FBSUBDIR = fb
 MFBSUBDIR  = mfb
 CFB8SUBDIR = cfb
 CFB16SUBDIR = cfb16
 CFB24SUBDIR = cfb24
--- config/cf/Imake.rules.swt	2004-09-28 23:32:11.134702820 -0600
+++ config/cf/Imake.rules	2004-09-28 23:38:10.037855168 -0600
@@ -3491,20 +3491,24 @@
 #define DepLibraryModuleTarget(module,deplist,objects)			@@\
 NormalDepLibraryTarget(module, deplist, objects)
 #endif
 #endif
 
+#if defined(HardenedGccSpecs) && HardenedGccSpecs
+LDBIND_FLAGS = -nonow
+#endif
+
 /*
  * DynamicModuleTarget - build a module to be dynamically loaded
  */
 #ifndef DynamicModuleTarget
 #define DynamicModuleTarget(module,modlist)				@@\
 AllTarget(module)							@@\
 									@@\
 module: modlist								@@\
 	RemoveFile($@)							@@\
-	$(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib modlist			@@\
+	$(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib $(LDBIND_FLAGS) modlist   @@\
 									@@\
 clean::									@@\
 	RemoveFile(module)
 #endif /* DynamicModuleTarget */
 
@@ -3515,11 +3519,11 @@
 #define DepDynamicModuleTarget(module,deplist,modlist)			@@\
 AllTarget(module)							@@\
 									@@\
 module: deplist								@@\
 	RemoveFile($@)							@@\
-	$(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib modlist			@@\
+	$(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib $(LDBIND_FLAGS) modlist   @@\
 									@@\
 clean::									@@\
 	RemoveFile(module)
 #endif /* DepDynamicModuleTarget */