From 865c181fbd4f34d6ecfbe5d2ced4dc36c02fc5fb Mon Sep 17 00:00:00 2001 From: Wolfgang Bremer Date: Fri, 11 Apr 2014 13:30:03 +0200 Subject: Make objcopy config test cross platform functional This removes the old objcopy.test script and adds a cross platform qmake project for auto detection. Change-Id: Icc7c40d72fb0ff751d214b7351e20652f7b15945 Reviewed-by: Oswald Buddenhagen --- config.tests/unix/objcopy.test | 29 ---------------------- config.tests/unix/objcopy/objcopy.cpp | 45 +++++++++++++++++++++++++++++++++++ config.tests/unix/objcopy/objcopy.pro | 10 ++++++++ configure | 18 +++++++------- 4 files changed, 65 insertions(+), 37 deletions(-) delete mode 100755 config.tests/unix/objcopy.test create mode 100644 config.tests/unix/objcopy/objcopy.cpp create mode 100644 config.tests/unix/objcopy/objcopy.pro diff --git a/config.tests/unix/objcopy.test b/config.tests/unix/objcopy.test deleted file mode 100755 index 9eb6e22ab0..0000000000 --- a/config.tests/unix/objcopy.test +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -TEST_PATH=`dirname "$0"` -SEP_DEBUG_SUPPORT=no -COMPILER=$1 -QMAKE_OBJCOPY=$2 -VERBOSE=$3 - -if [ -n "$QMAKE_OBJCOPY" ]; then - echo "int main() { return 0; }" > objcopy_test.cpp - if $TEST_PATH/which.test "$QMAKE_OBJCOPY" >/dev/null 2>&1 && $COMPILER $SYSROOT_FLAG -g -o objcopy_test objcopy_test.cpp >/dev/null 2>&1; then - "$QMAKE_OBJCOPY" --only-keep-debug objcopy_test objcopy_test.debug >/dev/null 2>&1 \ - && "$QMAKE_OBJCOPY" --strip-debug objcopy_test >/dev/null 2>&1 \ - && "$QMAKE_OBJCOPY" --add-gnu-debuglink=objcopy_test.debug objcopy_test >/dev/null 2>&1 \ - && SEP_DEBUG_SUPPORT=yes - fi - rm -f objcopy_test objcopy_test.debug objcopy_test.cpp -else - [ "$VERBOSE" = "yes" ] && echo "Separate debug info check skipped, QMAKE_OBJCOPY is unset."; -fi - -# done -if [ "$SEP_DEBUG_SUPPORT" != "yes" ]; then - [ "$VERBOSE" = "yes" ] && echo "Separate debug info support disabled." - exit 0 -else - [ "$VERBOSE" = "yes" ] && echo "Separate debug info support enabled." - exit 1 -fi diff --git a/config.tests/unix/objcopy/objcopy.cpp b/config.tests/unix/objcopy/objcopy.cpp new file mode 100644 index 0000000000..66b261bd6d --- /dev/null +++ b/config.tests/unix/objcopy/objcopy.cpp @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2014 BlackBerry Limited. All rights reserved. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the config.tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +int main() +{ + return 0; +} diff --git a/config.tests/unix/objcopy/objcopy.pro b/config.tests/unix/objcopy/objcopy.pro new file mode 100644 index 0000000000..d2f9c738f6 --- /dev/null +++ b/config.tests/unix/objcopy/objcopy.pro @@ -0,0 +1,10 @@ +SOURCES = objcopy.cpp +CONFIG -= qt + +all.depends += only_keep_debug strip_debug add_gnu_debuglink + +only_keep_debug.commands = $$QMAKE_OBJCOPY --only-keep-debug objcopy objcopy.debug +strip_debug.commands = $$QMAKE_OBJCOPY --strip-debug objcopy +add_gnu_debuglink.commands = $$QMAKE_OBJCOPY --add-gnu-debuglink=objcopy.debug objcopy + +QMAKE_EXTRA_TARGETS += all only_keep_debug strip_debug add_gnu_debuglink diff --git a/configure b/configure index 89c2318d82..67a5a4b537 100755 --- a/configure +++ b/configure @@ -3178,7 +3178,7 @@ if [ "$CFG_PRECOMPILE" = "auto" ]; then fi fi -# auto-detect support for separate debug info in objcopy +# sanity-check for separate debug info if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then if [ "$CFG_SHARED" = "no" ]; then echo "ERROR: -separate-debug-info is incompatible with -static" @@ -3188,13 +3188,6 @@ if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then echo "ERROR: -separate-debug-info needs -debug, -debug-and-release, or -force-debug-info" exit 1 fi - TEST_OBJCOPY=`getXQMakeConf QMAKE_OBJCOPY` - COMPILER_WITH_FLAGS="$TEST_COMPILER $TEST_COMPILER_CXXFLAGS" - if "$unixtests/objcopy.test" "$COMPILER_WITH_FLAGS" "$TEST_OBJCOPY" "$OPT_VERBOSE"; then - echo "ERROR: -separate-debug-info was requested but this binutils does not support it." - echo "Re-run configure with -v for more information" - exit 1 - fi fi # auto-detect -fvisibility support @@ -3936,6 +3929,15 @@ fi # functionality tests #------------------------------------------------------------------------------- +# Detect objcopy support +if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then + if ! compileTest unix/objcopy "objcopy"; then + echo "ERROR: -separate-debug-info was requested but this binutils does not support it." + echo "Re-run configure with -v for more information" + exit 1 + fi +fi + # Detect C++11 support if [ "$CFG_CXX11" != "no" ]; then # Configure detects compiler features based on cross compiler, so we need -- cgit v1.2.3