X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=e8e36950ca3f77a14755bc424ce684b9de336a81;hb=83c008fa70e1e3c47db6d8fea304d326bb7bbff5;hp=af28baab8b5e11c79bda43d775d9a9fd7944eb8a;hpb=38f89fbe99659e6d63937b37bd87a3edd8aba687;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index af28baa..e8e3695 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.26 1998/08/16 16:25:21 sof Exp $
+dnl $Id: aclocal.m4,v 1.30 1998/10/07 12:41:42 simonm Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -57,6 +57,11 @@ dnl underscore.
 dnl 
 dnl We assume that they _haven't_ if anything goes wrong.
 dnl
+dnl Some nlist implementations seem to try to be compatible by ignoring
+dnl a leading underscore sometimes (eg. FreeBSD).  We therefore have
+dnl to work around this by checking for *no* leading underscore first.
+dnl Sigh.  --SDM
+dnl
 AC_DEFUN(FPTOOLS_UNDERSCORE,
 [AC_CHECK_LIB(elf, nlist, LIBS="-lelf $LIBS")dnl
 AC_CACHE_CHECK([leading underscore in symbol names], fptools_cv_lead_uscore,
@@ -69,13 +74,15 @@ changequote(<<, >>)dnl
 <<
 case $HostPlatform in
 alpha-dec-osf*) fptools_cv_lead_uscore='no';;
+*cygwin32)      fptools_cv_lead_uscore='yes';;
 *) >>
 changequote([, ])dnl
 AC_TRY_RUN([#ifdef HAVE_NLIST_H
 #include <nlist.h>
 changequote(<<, >>)dnl
 <<
-struct nlist xYzzY[] = {{"_xYzzY", 0},{0}};
+struct nlist xYzzY1[] = {{"xYzzY1", 0},{0}};
+struct nlist xYzzY2[] = {{"_xYzzY2", 0},{0}};
 #endif
 
 main(argc, argv)
@@ -83,7 +90,9 @@ int argc;
 char **argv;
 {
 #ifdef HAVE_NLIST_H
-    if(nlist(argv[0], xYzzY) == 0 && xYzzY[0].n_value != 0)
+    if(nlist(argv[0], xYzzY1) == 0 && xYzzY1[0].n_value != 0)
+        exit(1);
+    if(nlist(argv[0], xYzzY2) == 0 && xYzzY2[0].n_value != 0)
         exit(0);>>
 changequote([, ])dnl
 #endif
@@ -280,7 +289,7 @@ AC_DEFUN(FPTOOLS_PROG_GNUCPP,
 	echo > conftest.c
 	gcc -v -E conftest.c >/dev/null 2>conftest.out
 	# \x5c = backslash
-	echo 'tr/\x5c/\//; /(\S+\/cpp)/ && print "[$]1";' > conftest.pl
+	echo 'tr/\x5c/\//; /(\S+\/)cpp/ && print "[$]{1}cpp -iprefix [$]1";' > conftest.pl
 	fptools_cv_gnu_cpp="`eval $PerlCmd -n conftest.pl conftest.out`"
 	rm -fr conftest*
  else
@@ -407,8 +416,11 @@ AC_CACHE_VAL(fptools_cv_have_o_binary,
 [
 AC_LANG_SAVE
 AC_LANG_C
-AC_TRY_COMPILE(,[#include <fcntl.h>
-x = O_BINARY;],
+AC_TRY_COMPILE(,
+[#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+int x = O_BINARY;],
 fptools_cv_have_o_binary=yes,
 fptools_cv_have_o_binary=no)
 AC_LANG_RESTORE
@@ -418,3 +430,71 @@ if test "$fptools_cv_have_o_binary" = yes; then
 AC_DEFINE(HAVE_O_BINARY)
 fi
 ])
+
+dnl *** Which one comes first, .text or .data? ***
+dnl 
+AC_DEFUN(FPTOOLS_CODE_BEFORE_DATA,
+[AC_CACHE_CHECK([if code section appears before data], fptools_cv_code_bef_data,
+[AC_TRY_RUN([
+int f() { return 1; }
+int i;
+int main() { return ((char*)&f > (char*)&i); }
+
+],
+fptools_cv_code_bef_data=yes, fptools_cv_code_bef_data=no)])
+if test "$fptools_cv_code_bef_data" = yes; then
+  AC_DEFINE(CODE_BEFORE_DATA)
+fi
+])
+
+dnl *** Helper function **
+dnl 
+AC_DEFUN(FPTOOLS_IN_SCOPE,AC_TRY_LINK([extern char* $1;],[return (int)&$2], $3=yes, $3=no))
+
+dnl *** What's the end-of-text-section marker called? ***
+dnl
+AC_DEFUN(FPTOOLS_END_TEXT_SECTION,
+[AC_CACHE_CHECK([for end of text section marker], fptools_cv_end_of_text,
+[
+not_done=1
+for i in etext _etext __etext; do
+  FPTOOLS_IN_SCOPE($i,$i,fptools_cv_end_of_text)
+  if test "$fptools_cv_end_of_text" = yes; then
+   AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER, $i)
+   not_done=0
+   break
+  fi
+done
+if test "$not_done" = 1; then
+FPTOOLS_IN_SCOPE(etext asm("etext"),etext,fptools_cv_end_of_text);
+if test "$fptools_cv_end_of_text" = yes; then
+  AC_DEFINE(TEXT_SECTION_END_MARKER, etext asm("etext"))
+else
+  AC_DEFINE(TEXT_SECTION_END_MARKER, dunno_what_it_is)
+fi
+fi
+])])
+
+dnl *** What's the end-of-data-section marker called? ***
+dnl
+AC_DEFUN(FPTOOLS_END_DATA_SECTION,
+[AC_CACHE_CHECK([for end of data section marker], fptools_cv_end_of_data,
+[
+not_done=1
+for i in end _end __end; do
+  FPTOOLS_IN_SCOPE($i,$i,fptools_cv_end_of_data)
+  if test "$fptools_cv_end_of_data" = yes; then
+   AC_DEFINE_UNQUOTED(DATA_SECTION_END_MARKER, $i)
+   not_done=0
+   break
+  fi
+done
+if test "$not_done" = 1; then
+FPTOOLS_IN_SCOPE(end asm("end"),end,fptools_cv_end_of_data);
+if test "$fptools_cv_end_of_data" = yes; then
+  AC_DEFINE(DATA_SECTION_END_MARKER, end asm("end"))
+else
+  AC_DEFINE(DATA_SECTION_END_MARKER, dunno_what_it_is)
+fi
+fi
+])])