Changeset 5641:cfd2cf3d0475 in roaraudio

Timestamp:

09/10/12 17:53:11 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Changed default linkage model for ELF to indirect (Closes: #281)

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (5 diffs)

ChangeLog

@@ -9 +9 @@
         * Removed support for roard's proto support
           (replaced by CPI) (Closes: #278)
+        * Changed default linkage model for ELF to indirect (Closes: #281)
 
 v. 1.0beta5 - Mon Aug 20 2012 23:52 CEST

configure

@@ -50 +50 @@
 rdynamic=true
 MMCU=''
-LINK_DEPS=full
+LINK_DEPS=auto
 PKG_CONFIG=false
 RUNTIME_DETECT=false
@@ -228 +228 @@
    echo '--ldflags FLAGS             - Sets additional linker flags (default: '"$LDFLAGS"')'
    echo '--opti LEVEL                - Sets optimizer level (default: '"$OPTI_O"')'
-   echo '--link-deps MODE            - Model for linking dependencies: full or indirect'
+   echo '--link-deps MODE            - Model for linking dependencies: auto, full or indirect'
    echo
    echo '--cc CC                     - Set name of C compiler (CC) to CC'
@@ -1329 +1329 @@
 }
 
+test_bin_format() {
+ echo -n "checking for binary format... "
+ echo "TEST BIN FORMAT:" >&5
+
+ {
+  echo "#include <stdio.h>"
+  echo
+  echo "int main (void) {"
+  echo " char buf[512];"
+  echo " size_t len;"
+  echo
+  echo " len = fread(buf, 1, sizeof(buf), stdin);"
+  echo " if ( len < 4 )"
+  echo "  return 1;"
+  echo
+  echo " if ( buf[0] == '\\177' && buf[1] == 'E' && buf[2] == 'L' && buf[3] == 'F' ) {"
+  echo '  printf("ELF\n");'
+  echo "  return 0;"
+  echo " }"
+  echo
+  echo " if ( buf[0] == 'M' && buf[1] == 'Z' ) {"
+  echo '  printf("MZ\n");'
+  echo "  return 0;"
+  echo " }"
+  echo
+  echo " return 1;"
+  echo "}"
+ } > $TF_C
+
+ echo "--- BEGIN OF CODE BLOCK ---" >&5
+ cat $TF_C >&5
+ echo "--- END OF CODE BLOCK ---" >&5
+
+ echo "BIN FORMAT() HAS COMPILER/LINKER OUTPUT:" >&5
+ echo "--- BEGIN OF CHILD OUTPUT BLOCK ---" >&5
+ $CCTF >&5 2>&5;
+ R=$?
+ echo "--- END OF CHILD OUTPUT BLOCK ---" >&5
+
+ if [ "$R" = '0' ]
+ then
+  BIN_FORMAT=`$EXEC_HELPER $TF_E < $TF_E 2> /dev/null`
+  R=$?
+  if [ "$R" = '0' ]
+  then
+   echo "$BIN_FORMAT"
+   echo "BIN FORMAT() IS '$BIN_FORMAT'" >&5
+  else
+   BIN_FORMAT=unknown
+   echo 'unknown'
+   echo "BIN FORMAT() NOT KNOWN" >&5
+  fi
+ else
+  BIN_FORMAT=unknown
+  echo 'unknown'
+  echo "BIN FORMAT() NOT KNOWN" >&5
+ fi
+}
+
 exec 3> config.h 4> Makefile.conf 5> config.log
 
@@ -1478 +1537 @@
  echo
  echo "OPTI_O=-O$OPTI_O"
- echo "LINK_DEPS=$LINK_DEPS"
  echo
  [ "$CFLAGS"  != '' ] && echo "CFLAGS  += $CFLAGS"
@@ -1608 +1666 @@
  echo
 } >&3
+
+# test binary format.
+test_bin_format
+
+if [ "$LINK_DEPS" = 'auto' ]
+then
+ if [ "$BIN_FORMAT" = 'ELF' ]
+ then
+  LINK_DEPS='indirect'
+ else
+  LINK_DEPS='full'
+ fi
+fi
+
+echo "LINK_DEPS=$LINK_DEPS" >&4
+echo "checking for linkage model... $LINK_DEPS"
 
 #                 #define                   name         cmds...