[{"id":2501,"web_url":"https://patchwork.libcamera.org/comment/2501/","msgid":"<8cb0a7db-2ce9-d2d2-baff-1a8d6250b932@ideasonboard.com>","date":"2019-08-21T11:12:14","subject":"Re: [libcamera-devel] [PATCH v2 2/2] meson: Define _FORTIFY_SOURCE\n\tfor optimised builds","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 19/08/2019 18:02, Laurent Pinchart wrote:\n> _FORTIFY_SOURCE adds useful checks during compilation. The option is\n> enabled by default by gcc on all non-optimised builds (as it requires\n> -O1 or higher). Enable it explicitly for clang.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> Changes since v1:\n> \n> - Condition _FORTIFY_SOURCE on the optimisation level, not the build\n> type\n> - Enable _FORTIFY_SOURCE on clang only as gcc does it by default\n> \n> This patch has been tested with gcc5, gcc6, gcc7, gcc8, gcc9, clang7 and\n> clang8, with all the meson built types (plain, debug, debugoptimized,\n> release and minsize).\n> \n> ---\n> meson.build | 22 ++++++++++++++++------\n> 1 file changed, 16 insertions(+), 6 deletions(-)\n> \n> diff --git a/meson.build b/meson.build\n> index 13d0605f903c..c30287e262a5 100644\n> --- a/meson.build\n> +++ b/meson.build\n> @@ -38,12 +38,22 @@ common_arguments = [\n> c_arguments = common_arguments\n> cpp_arguments = common_arguments\n> \n> -# Use libc++ by default if available instead of libstdc++ when compiling with\n> -# clang.\n> -if cc.get_id() == 'clang' and cc.find_library('libc++', required: false).found()\n> - cpp_arguments += [\n> - '-stdlib=libc++',\n> - ]\n> +if cc.get_id() == 'clang'\n> + # Turn _FORTIFY_SOURCE by default on optimised builds (as it requires -O1\n> + # or higher). This is needed on clang only as gcc enables it by default.\n> + if get_option('optimization') != '0'\n> + common_arguments += [\n> + '-D_FORTIFY_SOURCE=1',\n\nGCC enables _FORTIFY_SOURCE level 2 by default.\nShould we match that here with clang ?\n\n$ g++ -dM -E -x c++ -O2 - < /dev/null | grep -i FORT\n#define _FORTIFY_SOURCE 2\n\n\nAlso note, that gcc only does this for C++ builds (which shouldn't\nmatter in our case, until we start adding C-bindings) ...\n\n$ gcc -dM -E - < /dev/null | grep -i FORT\n$\n\nOtherwise though,\n\nAcked-by: Kieran Bingham \n\nNow we just need more build options covered by the automated builds at\nlinuxtv.org ...\n\n> + ]\n> + endif\n> +\n> + # Use libc++ by default if available instead of libstdc++ when compiling\n> + # with clang.\n> + if cc.find_library('libc++', required: false).found()\n> + cpp_arguments += [\n> + '-stdlib=libc++',\n> + ]\n> + endif\n> endif\n> \n> add_project_arguments(c_arguments, language : 'c')\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 353F060C05\n\tfor ;\n\tWed, 21 Aug 2019 13:12:17 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8DB4033D;\n\tWed, 21 Aug 2019 13:12:16 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1566385936;\n\tbh=kAgy3fGm0MFgOjzDKiFjnRYgViHodTOoS1gU1waAx8Y=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=sjrY8k1JH8bQXfCvv5Mx+2XHai0sDTnHyR0srIq5uWmpJvtHok8gr4ekaP8iVpUBQ\n\tuUwhEp2IVUBC9fniNzj4nuM9ZYQHxmrBzjx8Ua4/rrMExbFOz9U/scLGkPVquOu6sK\n\t7SgQJoI0KQvYR2cbAFhzDtt0m/WBTenVCTaK+ZME=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20190819170249.11177-1-laurent.pinchart@ideasonboard.com>\n\t<20190819170249.11177-2-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"<8cb0a7db-2ce9-d2d2-baff-1a8d6250b932@ideasonboard.com>","Date":"Wed, 21 Aug 2019 12:12:14 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.8.0","MIME-Version":"1.0","In-Reply-To":"<20190819170249.11177-2-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v2 2/2] meson: Define _FORTIFY_SOURCE\n\tfor optimised builds","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 21 Aug 2019 11:12:17 -0000"}},{"id":2502,"web_url":"https://patchwork.libcamera.org/comment/2502/","msgid":"<20190821135055.GA5433@pendragon.ideasonboard.com>","date":"2019-08-21T13:50:55","subject":"Re: [libcamera-devel] [PATCH v2 2/2] meson: Define _FORTIFY_SOURCE\n\tfor optimised builds","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Wed, Aug 21, 2019 at 12:12:14PM +0100, Kieran Bingham wrote:\n> On 19/08/2019 18:02, Laurent Pinchart wrote:\n> > _FORTIFY_SOURCE adds useful checks during compilation. The option is\n> > enabled by default by gcc on all non-optimised builds (as it requires\n> > -O1 or higher). Enable it explicitly for clang.\n> > \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > Changes since v1:\n> > \n> > - Condition _FORTIFY_SOURCE on the optimisation level, not the build\n> > type\n> > - Enable _FORTIFY_SOURCE on clang only as gcc does it by default\n> > \n> > This patch has been tested with gcc5, gcc6, gcc7, gcc8, gcc9, clang7 and\n> > clang8, with all the meson built types (plain, debug, debugoptimized,\n> > release and minsize).\n> > \n> > ---\n> > meson.build | 22 ++++++++++++++++------\n> > 1 file changed, 16 insertions(+), 6 deletions(-)\n> > \n> > diff --git a/meson.build b/meson.build\n> > index 13d0605f903c..c30287e262a5 100644\n> > --- a/meson.build\n> > +++ b/meson.build\n> > @@ -38,12 +38,22 @@ common_arguments = [\n> > c_arguments = common_arguments\n> > cpp_arguments = common_arguments\n> > \n> > -# Use libc++ by default if available instead of libstdc++ when compiling with\n> > -# clang.\n> > -if cc.get_id() == 'clang' and cc.find_library('libc++', required: false).found()\n> > - cpp_arguments += [\n> > - '-stdlib=libc++',\n> > - ]\n> > +if cc.get_id() == 'clang'\n> > + # Turn _FORTIFY_SOURCE by default on optimised builds (as it requires -O1\n> > + # or higher). This is needed on clang only as gcc enables it by default.\n> > + if get_option('optimization') != '0'\n> > + common_arguments += [\n> > + '-D_FORTIFY_SOURCE=1',\n> \n> GCC enables _FORTIFY_SOURCE level 2 by default.\n> Should we match that here with clang ?\n\nI think so, that's a good point. I'll change it to 2 (after veriyfing\nthat it builds for all configurations :-)).\n\n> $ g++ -dM -E -x c++ -O2 - < /dev/null | grep -i FORT\n> #define _FORTIFY_SOURCE 2\n> \n> Also note, that gcc only does this for C++ builds (which shouldn't\n> matter in our case, until we start adding C-bindings) ...\n> \n> $ gcc -dM -E - < /dev/null | grep -i FORT\n\nYou're missing -O2 :-)\n\n$ gcc -dM -E -O0 - < /dev/null | grep -i FORT\n$ gcc -dM -E -O2 - < /dev/null | grep -i FORT\n#define _FORTIFY_SOURCE 2\n\n> $\n> \n> Otherwise though,\n> \n> Acked-by: Kieran Bingham \n> \n> Now we just need more build options covered by the automated builds at\n> linuxtv.org ...\n> \n> > + ]\n> > + endif\n> > +\n> > + # Use libc++ by default if available instead of libstdc++ when compiling\n> > + # with clang.\n> > + if cc.find_library('libc++', required: false).found()\n> > + cpp_arguments += [\n> > + '-stdlib=libc++',\n> > + ]\n> > + endif\n> > endif\n> > \n> > add_project_arguments(c_arguments, language : 'c')","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CF10E60C1E\n\tfor ;\n\tWed, 21 Aug 2019 15:51:02 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 32ACC33D;\n\tWed, 21 Aug 2019 15:51:02 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1566395462;\n\tbh=u9jrgTvPBign4geOJlK19qE3JIiLXKn76m4609z6/JU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=VtIFMy4/4nYcXi8oxU+j0z840mpCS6318EDPOwEVqoLGRR4geKc2s3Vg8nG00HTok\n\tOERJJYf3aSOYd5c4MMSLcyYOh+iGbJo/0k+kYtiVKImToz9B4ycA/Vjy+WjvWx2+qk\n\tkZpQI7VFC9A7e+lxL74Dn78J25kc8csmYigf3xcY=","Date":"Wed, 21 Aug 2019 16:50:55 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190821135055.GA5433@pendragon.ideasonboard.com>","References":"<20190819170249.11177-1-laurent.pinchart@ideasonboard.com>\n\t<20190819170249.11177-2-laurent.pinchart@ideasonboard.com>\n\t<8cb0a7db-2ce9-d2d2-baff-1a8d6250b932@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<8cb0a7db-2ce9-d2d2-baff-1a8d6250b932@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v2 2/2] meson: Define _FORTIFY_SOURCE\n\tfor optimised builds","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 21 Aug 2019 13:51:03 -0000"}}]