From patchwork Fri Dec 31 16:42:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Add VxWorks options from specs to vxworks.opt From: "Joseph S. Myers" X-Patchwork-Id: 77091 Message-Id: To: gcc-patches@gcc.gnu.org Cc: Nathan Sidwell Date: Fri, 31 Dec 2010 16:42:59 +0000 (UTC) In preparation for the driver only accepting options listed in .opt files, and not other options that simply happen to match some spec, this patch adds VxWorks options matched by specs in vxworks.h to vxworks.opt. None of the options are matched by specs in vxworksae.h and so Condition settings are used as for the other options in vxworks.opt. Note that before this patch -Bdynamic and -Bstatic would have added various search paths based on the strings "dynamic" and "static" in addition to having the effects from specs passing them to the linker. Now they will only have the effects from specs, without also being handled as -B options; this seems in accord with the intended semantics as I interpret them. Tested building cc1 and xgcc for crosses to: arm-wrs-vxworks i686-wrs-vxworks i686-wrs-vxworksae mips-wrs-vxworks powerpc-wrs-vxworks powerpc-wrs-vxworksae sh-wrs-vxworks sparc-wrs-vxworks. OK to commit? 2010-12-31 Joseph Myers * config/vxworks.opt (Bdynamic, Bstatic, Xbind-lazy, Xbind-now, non-static): New Driver options. Index: gcc/config/vxworks.opt =================================================================== --- gcc/config/vxworks.opt (revision 168378) +++ gcc/config/vxworks.opt (working copy) @@ -1,6 +1,6 @@ ; Processor-independent options for VxWorks. ; -; Copyright (C) 2005, 2007 Free Software Foundation, Inc. +; Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc. ; Contributed by CodeSourcery, LLC. ; ; This file is part of GCC. @@ -19,6 +19,18 @@ ; along with GCC; see the file COPYING3. If not see ; . +Bdynamic +Driver Condition(VXWORKS_KIND == VXWORKS_KIND_NORMAL) + +Bstatic +Driver Condition(VXWORKS_KIND == VXWORKS_KIND_NORMAL) + +Xbind-lazy +Driver Condition(VXWORKS_KIND == VXWORKS_KIND_NORMAL) + +Xbind-now +Driver Condition(VXWORKS_KIND == VXWORKS_KIND_NORMAL) + mrtp Target Report RejectNegative Mask(VXWORKS_RTP) Condition(VXWORKS_KIND == VXWORKS_KIND_NORMAL) Assume the VxWorks RTP environment @@ -29,3 +41,6 @@ Assume the VxWorks RTP environment mvthreads Target RejectNegative Condition(VXWORKS_KIND == VXWORKS_KIND_AE) Assume the VxWorks vThreads environment + +non-static +Driver Condition(VXWORKS_KIND == VXWORKS_KIND_NORMAL)