From: simonmar Date: Wed, 11 Dec 2002 16:37:17 +0000 (+0000) Subject: [project @ 2002-12-11 16:37:16 by simonmar] X-Git-Tag: Approx_11550_changesets_converted~1362 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a13a41c241bbfad4bc3be3fdd686be826e0d7ac6;p=ghc-hetmet.git [project @ 2002-12-11 16:37:16 by simonmar] Remove tests for text/data section boundary symbols. --- diff --git a/acconfig.h b/acconfig.h index d61c783..a8ddb7d 100644 --- a/acconfig.h +++ b/acconfig.h @@ -351,12 +351,6 @@ /* Define if code lives before data in memory */ #undef CODE_BEFORE_DATA -/* Define as the symbol which marks the end of the data section */ -#undef DATA_SECTION_END_MARKER - -/* Define as the decl which terminates the data section */ -#undef DATA_SECTION_END_MARKER_DECL - /* Define if time.h or sys/time.h define the altzone variable */ #undef HAVE_ALTZONE @@ -573,12 +567,6 @@ /* Define if C Symbols have a leading underscore added by the compiler */ #undef LEADING_UNDERSCORE -/* Define as the symbol which marks the end of the text section */ -#undef TEXT_SECTION_END_MARKER - -/* Define to decl that terminates text section. */ -#undef TEXT_SECTION_END_MARKER_DECL - /* Define to the type of the timezone variable (usually long or time_t) */ #undef TYPE_TIMEZONE diff --git a/aclocal.m4 b/aclocal.m4 index 423393c..6fb47cb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.108 2002/12/04 23:41:15 dons Exp $ +dnl $Id: aclocal.m4,v 1.109 2002/12/11 16:37:16 simonmar Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -761,130 +761,12 @@ 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,false)]) -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], - [fptools_cv_end_of_text="" - not_done=1 - for i in data_start _data_start etext _etext __etext; do - FPTOOLS_IN_SCOPE($i,$i,fptools_end_of_text) - if test "$fptools_end_of_text" = yes; then - fptools_cv_end_of_text=$i - not_done=0 - break - fi - done - if test "$not_done" = 1; then - FPTOOLS_IN_SCOPE(etext asm("etext"),etext,fptools_end_of_text) - if test "$fptools_end_of_text" = yes; then - fptools_cv_end_of_text="etext" - fi - fi]) - if test -n "$fptools_cv_end_of_text"; then - AC_DEFINE_UNQUOTED([TEXT_SECTION_END_MARKER], $fptools_cv_end_of_text) - else - AC_DEFINE_UNQUOTED([TEXT_SECTION_END_MARKER], dunno_end_of_text) - fi - AC_CACHE_CHECK([for end of text section marker declaration], - [fptools_cv_end_of_text_decl], - [fptools_cv_end_of_text_decl="" - not_done=1 - for i in data_start _data_start etext _etext __etext; do - FPTOOLS_IN_SCOPE($i,$i,fptools_end_of_text_decl) - if test "$fptools_end_of_text_decl" = yes; then - fptools_cv_end_of_text_decl=$i - not_done=0 - break - fi - done - if test "$not_done" = 1; then - FPTOOLS_IN_SCOPE(etext asm("etext"),etext,fptools_end_of_text_decl) - if test "$fptools_end_of_text_decl" = yes; then - fptools_cv_end_of_text_decl="etext asm(\"etext\")" - fi - fi]) - if test -n "$fptools_cv_end_of_text_decl"; then - AC_DEFINE_UNQUOTED([TEXT_SECTION_END_MARKER_DECL], $fptools_cv_end_of_text_decl) - else - AC_DEFINE_UNQUOTED([TEXT_SECTION_END_MARKER_DECL], dunno_end_of_text_decl) - 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], - [fptools_cv_end_of_data="" - not_done=1 - for i in end _end __end; do - FPTOOLS_IN_SCOPE($i,$i,fptools_end_of_data) - if test "$fptools_end_of_data" = yes; then - fptools_cv_end_of_data=$i - not_done=0 - break - fi - done - if test "$not_done" = 1; then - FPTOOLS_IN_SCOPE(end asm("end"),end,fptools_end_of_data) - if test "$fptools_end_of_data" = yes; then - fptools_cv_end_of_data="end" - fi - fi]) - if test -n "$fptools_cv_end_of_data"; then - AC_DEFINE_UNQUOTED([DATA_SECTION_END_MARKER], $fptools_cv_end_of_data) - else - AC_DEFINE_UNQUOTED([DATA_SECTION_END_MARKER], dunno_end_of_data) - fi - AC_CACHE_CHECK([for end of data section marker declaration], - [fptools_cv_end_of_data_decl], - [fptools_cv_end_of_data_decl="" - not_done=1 - for i in end _end __end; do - FPTOOLS_IN_SCOPE($i,$i,fptools_end_of_data_decl) - if test "$fptools_end_of_data_decl" = yes; then - fptools_cv_end_of_data_decl=$i - not_done=0 - break - fi - done - if test "$not_done" = 1; then - FPTOOLS_IN_SCOPE(end asm("end"),end,fptools_end_of_data_decl) - if test "$fptools_end_of_data_decl" = yes; then - fptools_cv_end_of_data_decl="end asm(\"end\")" - fi - fi]) - if test -n "$fptools_cv_end_of_data_decl"; then - AC_DEFINE_UNQUOTED([DATA_SECTION_END_MARKER_DECL], $fptools_cv_end_of_data_decl) - else - AC_DEFINE_UNQUOTED([DATA_SECTION_END_MARKER_DECL], dunno_end_of_data_decl) - fi -]) - dnl Based on AC_TRY_LINK - run iftrue if links cleanly with no warning diff --git a/configure.in b/configure.in index 019fb5d..01bf39f 100644 --- a/configure.in +++ b/configure.in @@ -1226,15 +1226,6 @@ errprint(if you are using 2.13 or earlier, you may get a (harmless) warning mess dnl ** check for leading underscores in symbol names FPTOOLS_UNDERSCORE -dnl ** how is the end of text section signalled? -FPTOOLS_END_TEXT_SECTION - -dnl ** how is the end of data section signalled? -FPTOOLS_END_DATA_SECTION - -dnl ** code before data? -FPTOOLS_CODE_BEFORE_DATA - dnl ** check for ld, and whether ld has -x option AC_PATH_PROG(LdCmdRaw, ld) case $HostOS_CPP in