[llvm-commits] CVS: llvm-test/MultiSource/Applications/siod/Makefile slibu.c

[Jeff Cohen]

Changes in directory llvm-test/MultiSource/Applications/siod:

Makefile updated: 1.8 -> 1.9
slibu.c updated: 1.5 -> 1.6
---
Log message:

Make it work on FreeBSD (and any other platform where dlopen isn't in libdl).

---
Diffs of the changes:  (+6 -2)

 Makefile |    2 +-
 slibu.c  |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Applications/siod/Makefile
diff -u llvm-test/MultiSource/Applications/siod/Makefile:1.8 llvm-test/MultiSource/Applications/siod/Makefile:1.9
--- llvm-test/MultiSource/Applications/siod/Makefile:1.8	Fri Apr 29 03:36:36 2005
+++ llvm-test/MultiSource/Applications/siod/Makefile	Sat Apr  7 15:56:03 2007
@@ -1,7 +1,7 @@
 LEVEL = ../../..
 PROG     = siod
 CPPFLAGS = -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix
-LDFLAGS  = -lm -ldl $(TOOLLINKOPTS)
+LDFLAGS  = -lm $(TOOLLINKOPTS)
 
 RUN_OPTIONS = -v1 $(PROJ_SRC_DIR)/test.scm
 


Index: llvm-test/MultiSource/Applications/siod/slibu.c
diff -u llvm-test/MultiSource/Applications/siod/slibu.c:1.5 llvm-test/MultiSource/Applications/siod/slibu.c:1.6
--- llvm-test/MultiSource/Applications/siod/slibu.c:1.5	Wed Jun  2 18:06:37 2004
+++ llvm-test/MultiSource/Applications/siod/slibu.c	Sat Apr  7 15:56:03 2007
@@ -98,7 +98,7 @@
 
 static void init_slibu_version(void)
 {setvar(cintern("*slibu-version*"),
-	cintern("$Id: slibu.c,v 1.5 2004/06/02 23:06:37 lattner Exp $"),
+	cintern("$Id: slibu.c,v 1.6 2007/04/07 20:56:03 jeffc Exp $"),
 	NIL);}
 
 
@@ -1518,6 +1518,9 @@
    {put_st("so-loading ");
     put_st(get_c_string(fname));
     put_st("\n");}
+#if 0
+/* Too platform-dependent for llvm-test to handle, and the test doesn't
+ * use it anyway. */
 #if defined(__osf__) || defined(sun) || defined(linux) || defined(sgi)
 #if !defined(__osf__)
  /* Observed bug: values of LD_LIBRARY_PATH established with putenv
@@ -1565,6 +1568,7 @@
  if (!(fcn = (LPVOID)GetProcAddress(handle,get_c_string(init_name))))
    err("GetProcAddress",init_name);
 #endif
+#endif
  if (fcn)
    (*fcn)();
  else