Changeset 4588

Timestamp:

Sep 5, 2013 2:15:19 AM (11 years ago)

Author:

ming

Message:

Closed #1576: Add support for clang compiler. Configure-iphone will now try to use clang as the default

Location:

pjproject/trunk

Files:

• configure-iphone (modified) (3 diffs)
• third_party/srtp/crypto/cipher/aes_icm.c (modified) (1 diff)
• third_party/srtp/crypto/math/datatypes.c (modified) (1 diff)

pjproject/trunk/configure-iphone

@@ -19 +19 @@
   echo "             SDK."
   echo "  ARCH       Optional flags to specify target architecture, e.g."
-  echo "                ARCH='-arch armv6'"
+  echo "             ARCH='-arch armv6'. Default is armv7."
   echo ""
   exit 0
@@ -75 +75 @@
 
 if test "${CC}" = ""; then
-  # Try to use llvm-gcc if available
+  # Try to use clang if available
+  ccpath="${DEVPATH}/../../../Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
+  # Next, try to use llvm-gcc
   gccpath="${DEVPATH}/usr/bin/llvm-gcc"
-  if test -e ${gccpath}; then
+  if test -e ${ccpath}; then
+    export CC="${ccpath}" 
+  elif test -e ${gccpath}; then
     export CC="${gccpath}"
-
-    if test "${ARCH}" = ""; then
-       export ARCH="-arch armv7"
-       echo "$F: ARCH is not specified, choosing ${ARCH}"
-    fi
   else
     for archpath in `ls -d ${SDKPATH}/usr/lib/gcc/arm-apple-darwin*`; do
@@ -103 +102 @@
     echo "$F error: unable to find gcc for ${IPHONESDK}. If you think you have the right gcc, set the full path in CC environment variable."
     exit 1
+fi
+
+if test "${ARCH}" = ""; then
+  export ARCH="-arch armv7"
+  echo "$F: ARCH is not specified, choosing ${ARCH}"
 fi
 

pjproject/trunk/third_party/srtp/crypto/cipher/aes_icm.c

@@ -284 +284 @@
  */
   
-inline void
+static inline void
 aes_icm_advance_ismacryp(aes_icm_ctx_t *c, uint8_t forIsmacryp) {
   /* fill buffer with new keystream */

pjproject/trunk/third_party/srtp/crypto/math/datatypes.c

@@ -125 +125 @@
 }
 
-inline int
+static inline int
 hex_char_to_nibble(uint8_t c) {
   switch(c) {