From patchwork Thu Mar 26 15:46:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Roberts X-Patchwork-Id: 11460561 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2CD6714B4 for ; Thu, 26 Mar 2020 15:46:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0EAA32076A for ; Thu, 26 Mar 2020 15:46:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="apsTpayE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728024AbgCZPqw (ORCPT ); Thu, 26 Mar 2020 11:46:52 -0400 Received: from mail-pj1-f54.google.com ([209.85.216.54]:40227 "EHLO mail-pj1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727835AbgCZPqw (ORCPT ); Thu, 26 Mar 2020 11:46:52 -0400 Received: by mail-pj1-f54.google.com with SMTP id kx8so2561197pjb.5 for ; Thu, 26 Mar 2020 08:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=379I/KUxSx4oNFrnAUGdjmHQN7B3tOrpWyok/DGd000=; b=apsTpayEXTPN8h8QXSJ925sh6Djl0z8w7Iy871P3ma8HV6U7fakeSwHG2q804jqSDB E2drn2bqbT88p9icmXFNfu+HnD5ARnTiv7tbyy4aEHcluKSPQgzWYeZDBiytxxBBB2dN jsaTf2rY+uzBreJ7aJa+gDEX1QxgGU2tqhD8kR0VC2xlccfVLEE97prwLJ+5XE5I/9TX 1y4kjNBHbYHFHt7vNjFtAwE+oZGnFtH5+OWdcLPBG5tQKJX5i6Jd3I7HEbVD/FUBSrBN sXe4aU5xiE3VeeQRhkn4plIcvovDBvRDg1jWwN0uEgpBvOjvBcmva+DuPkclpsf/qs/T 3/kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=379I/KUxSx4oNFrnAUGdjmHQN7B3tOrpWyok/DGd000=; b=cf4aiX+4BR2BNxMYkNgp29sptpbZ3tT+Tn2jiggC0Uunm9a6eo99ibSIVM1rDe+uoz 4fyuDU9yjrodkLIKlvXC9MM43VaQ3dEOLOq3p62mQt+vyVNgyRcU9ZcsEzzDFU9A83EU x0zsGkLs1Rs4jfsD0Wp2EP2AXQALRIEChgzEZ4ujhn0myxNNKMQ2qLgzP4KAoSl1EZ9C SLaXo88kGrtA3qpzBONMYakWPYDSp5IEqTh+tXZlJYNENSQgQzLFoQCv2YZEOivg6tKW ha+0VK3LFnthWXKFWPkOfe/Iar5wiZkLkL0ZEb+TwWwf3ZSney1YfMDPmiNASEsyPlI2 OiJg== X-Gm-Message-State: ANhLgQ1hLUFOcS8Z3589cSVF3TMVUAezHoFqFiTZ51S2JMs0LTgf9P15 P5jZvY9V3QunLDHVR/M3ZVQ= X-Google-Smtp-Source: ADFU+vsQ6Ide3bJBqoo1WzYEYvG7aLXCMqaTcJFAJdjwn5Jfyrj1BkROK53J3bPCX9xsMJ6pzrTHqg== X-Received: by 2002:a17:902:ed03:: with SMTP id b3mr8290896pld.247.1585237611045; Thu, 26 Mar 2020 08:46:51 -0700 (PDT) Received: from localhost.localdomain ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id s62sm934359pgb.94.2020.03.26.08.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 08:46:50 -0700 (PDT) From: bill.c.roberts@gmail.com X-Google-Original-From: william.c.roberts@intel.com To: joshua.brindle@crunchydata.com Cc: bill.c.roberts@gmail.com, omosnace@redhat.com, selinux@vger.kernel.org, stephen.smalley.work@gmail.com, william.c.roberts@intel.com Subject: [PATCH 1/2] cil: rm dead dso.h file Date: Thu, 26 Mar 2020 10:46:40 -0500 Message-Id: <20200326154641.7253-2-william.c.roberts@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200326154641.7253-1-william.c.roberts@intel.com> References: <20200326154641.7253-1-william.c.roberts@intel.com> Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org From: William Roberts Signed-off-by: William Roberts --- libsepol/cil/src/dso.h | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 libsepol/cil/src/dso.h diff --git a/libsepol/cil/src/dso.h b/libsepol/cil/src/dso.h deleted file mode 100644 index 64a162cef86b..000000000000 --- a/libsepol/cil/src/dso.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _SEPOL_DSO_H -#define _SEPOL_DSO_H 1 - -#if !defined(SHARED) || defined(ANDROID) || defined(__APPLE__) - #define DISABLE_SYMVER 1 -#endif - -#ifdef SHARED -# define hidden __attribute__ ((visibility ("hidden"))) -# define hidden_proto(fct) __hidden_proto (fct, fct##_internal) -# define __hidden_proto(fct, internal) \ - extern __typeof (fct) internal; \ - extern __typeof (fct) fct __asm (#internal) hidden; -# if defined(__alpha__) || defined(__mips__) -# define hidden_def(fct) \ - asm (".globl " #fct "\n" #fct " = " #fct "_internal"); -# else -# define hidden_def(fct) \ - asm (".globl " #fct "\n.set " #fct ", " #fct "_internal"); -#endif -#else -# define hidden -# define hidden_proto(fct) -# define hidden_def(fct) -#endif - -#endif From patchwork Thu Mar 26 15:46:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Roberts X-Patchwork-Id: 11460563 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F05FC14B4 for ; Thu, 26 Mar 2020 15:46:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0D9E20737 for ; Thu, 26 Mar 2020 15:46:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EK4tYDed" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727934AbgCZPqy (ORCPT ); Thu, 26 Mar 2020 11:46:54 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38157 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727835AbgCZPqy (ORCPT ); Thu, 26 Mar 2020 11:46:54 -0400 Received: by mail-pg1-f196.google.com with SMTP id x7so3065765pgh.5 for ; Thu, 26 Mar 2020 08:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V4R+2m0SslUGosRISq6fCCA+ryxQy4LzW0+qTno59YM=; b=EK4tYDed7I7TmVsHNQj1MaFauow+Ghv6fqyuMS07YEsVKzuvpmYC8aNlsGECyYuLFc Tqmd1RbLPbMEjkSljyDU/I121wxz7FHXOMz6oCV6Lg0xAGaKIniaqBwRco183AcyOHkA iL7/oCx5yHI/0h7QntTbvKYzVn5/jXWy2TQjlgUcnsnUY6v4bahw3YtqsyBVK/27NsVC +HFAxjW41nOrvOsqf7nZE76a6+3FA+NkvG4prvGf0bbm7FuXe4LGkbllti+CTvJ9HCNE NUDOK0yaKMVitrbwgDuwbJ/F3becam2bYplT/VyOEHCFamaEg3GZQWdFK6ZSnrCnW3fJ va3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=V4R+2m0SslUGosRISq6fCCA+ryxQy4LzW0+qTno59YM=; b=kncLefPWDlpc0DUMun8jTMi8Zoh8z3Jzmr86hsMz6zJtWRRsz9GLBZILgdYj/wVZFh AeZK6hibteOkH3zPqYDsRUfnOnE5GmtzbGy1deK1ilI+B5W/cYPLu9VirzNpmkJhuB86 Fh5q223kgeSU4CVcCrl9dTh/D+4gnN6M6ZZr5P4ZJBRLg27oUiwem+GhstPqYy+hgDr5 adpANfaglJRPavW1pEaeoeIBi4MReuwADXqJt15/1wDpQ7SFEex+yogXvJf6FkP7apbz rIQNB5CetDxI7knQYsLPAv0PW9dLS5pjQkzOWS7SsKdVurUrfbnJyjKMmFiCBzLJlIGt zoIg== X-Gm-Message-State: ANhLgQ02fczXDcYxAnU034dazJB95XPgVhuM9/drpPi+HmvjA5SnS2ha FOLGRVFKhiYCDnH3R3wkmY66WwN8aSE= X-Google-Smtp-Source: ADFU+vtO1JNXl/bpTpred2fBL/irZ8mZitbgWHMcAxcAmQNgFVWGYocTs/mFWspPQDhSvA+/S7c+0A== X-Received: by 2002:a63:257:: with SMTP id 84mr8877052pgc.304.1585237613000; Thu, 26 Mar 2020 08:46:53 -0700 (PDT) Received: from localhost.localdomain ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id s62sm934359pgb.94.2020.03.26.08.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 08:46:52 -0700 (PDT) From: bill.c.roberts@gmail.com X-Google-Original-From: william.c.roberts@intel.com To: joshua.brindle@crunchydata.com Cc: bill.c.roberts@gmail.com, omosnace@redhat.com, selinux@vger.kernel.org, stephen.smalley.work@gmail.com, william.c.roberts@intel.com Subject: [PATCH 2/2] cil: re-enable DISABLE_SYMVER define Date: Thu, 26 Mar 2020 10:46:41 -0500 Message-Id: <20200326154641.7253-3-william.c.roberts@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200326154641.7253-1-william.c.roberts@intel.com> References: <20200326154641.7253-1-william.c.roberts@intel.com> Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org From: William Roberts Fix issues like: :1:1: error: unknown directive .symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0 Which was caused by the DISABLE_SYMVER define not being defined for static, Mac or Android builds. Signed-off-by: William Roberts --- libsepol/cil/src/cil.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libsepol/cil/src/cil.c b/libsepol/cil/src/cil.c index 12cc28eff389..c8e27c04c954 100644 --- a/libsepol/cil/src/cil.c +++ b/libsepol/cil/src/cil.c @@ -51,6 +51,10 @@ #include "cil_policy.h" #include "cil_strpool.h" +#if !defined(SHARED) || defined(ANDROID) || defined(__APPLE__) + #define DISABLE_SYMVER 1 +#endif + #ifndef DISABLE_SYMVER asm(".symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0"); asm(".symver cil_build_policydb_create_pdb, cil_build_policydb@@LIBSEPOL_1.1");