From 7ab9b0d847946ad75d8c1b94edae781974598aff Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 1 Jun 2015 15:07:01 +0200 Subject: remove unsupported linux-armcc spec it was experimentally added in 2011. there is no evidence that anyone actually uses it. Change-Id: Ie3b131f3783cafe942d180b2623fcc64740d7a73 Reviewed-by: Joerg Bornemann --- mkspecs/common/armcc.conf | 44 ------------ mkspecs/unsupported/linux-armcc/qmake.conf | 29 -------- mkspecs/unsupported/linux-armcc/qplatformdefs.h | 92 ------------------------- 3 files changed, 165 deletions(-) delete mode 100644 mkspecs/common/armcc.conf delete mode 100644 mkspecs/unsupported/linux-armcc/qmake.conf delete mode 100644 mkspecs/unsupported/linux-armcc/qplatformdefs.h (limited to 'mkspecs') diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf deleted file mode 100644 index a52fefc106..0000000000 --- a/mkspecs/common/armcc.conf +++ /dev/null @@ -1,44 +0,0 @@ -# -# qmake configuration for armcc -# - -QMAKE_COMPILER = armcc - -CONFIG += rvct_linker -QMAKE_CC = armcc -QMAKE_CFLAGS += -QMAKE_CFLAGS_DEPS += -M -QMAKE_CFLAGS_WARN_ON += -QMAKE_CFLAGS_WARN_OFF += -W -QMAKE_CFLAGS_RELEASE += -O2 -QMAKE_CFLAGS_DEBUG += -g -O0 -QMAKE_CFLAGS_HIDESYMS += --visibility_inlines_hidden - -QMAKE_CXX = armcc -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --exceptions --exceptions_unwind -QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB -QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS - -QMAKE_LINK = armlink -QMAKE_LINK_SHLIB = armlink -QMAKE_LINK_C = armlink -QMAKE_LINK_C_SHLIB = armlink -QMAKE_LFLAGS += -QMAKE_LFLAGS_RELEASE += -QMAKE_LFLAGS_DEBUG += -QMAKE_LFLAGS_APP += -QMAKE_LFLAGS_SHLIB += -QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_THREAD += - -QMAKE_AR = armar --create -QMAKE_LIB = armar --create -QMAKE_RANLIB = - diff --git a/mkspecs/unsupported/linux-armcc/qmake.conf b/mkspecs/unsupported/linux-armcc/qmake.conf deleted file mode 100644 index 2c7eb7c2d8..0000000000 --- a/mkspecs/unsupported/linux-armcc/qmake.conf +++ /dev/null @@ -1,29 +0,0 @@ -# -# qmake configuration for linux-armcc -# - -MAKEFILE_GENERATOR = UNIX -CONFIG += incremental armcc_linker -QMAKE_INCREMENTAL_STYLE = sublib - -include(../../common/linux.conf) -include(../../common/armcc.conf) -load(qt_config) - -# use armcc for linking since armlink doesn't understand the arm_linux_config_file option -QMAKE_LINK = armcc -QMAKE_LINK_SHLIB = armcc -QMAKE_LINK_C = armcc -QMAKE_LINK_C_SHLIB = armcc - -QMAKE_LFLAGS_SHLIB += --apcs=/fpic --shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB - -QMAKE_LIBS += libstdc++.so librt.so - -CONFIG -= rvct_linker - -QMAKE_CFLAGS += --gnu --arm_linux --dllimport_runtime --thumb --cpu Cortex-A9 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths --apcs=/interwork --visibility_inlines_hidden --diag_suppress 1300,2523 -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --cpp - -QMAKE_LFLAGS += --diag_suppress 6331,6780,6439 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths diff --git a/mkspecs/unsupported/linux-armcc/qplatformdefs.h b/mkspecs/unsupported/linux-armcc/qplatformdefs.h deleted file mode 100644 index 946b4d2b90..0000000000 --- a/mkspecs/unsupported/linux-armcc/qplatformdefs.h +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPLATFORMDEFS_H -#define QPLATFORMDEFS_H - -// Get Qt defines/settings - -#include "qglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -// 1) need to reset default environment if _BSD_SOURCE is defined -// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 -// 3) it seems older glibc need this to include the X/Open stuff -#ifndef _GNU_SOURCE -# define _GNU_SOURCE -#endif - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - -#define QT_USE_XOPEN_LFS_EXTENSIONS -#include "../../common/posix/qplatformdefs.h" - -#undef QT_SOCKLEN_T - -#if defined(__GLIBC__) && (__GLIBC__ >= 2) -#define QT_SOCKLEN_T socklen_t -#else -#define QT_SOCKLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - -#endif // QPLATFORMDEFS_H -- cgit v1.2.3