From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on gnuweeb.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NO_DNS_FOR_FROM,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from integral2.. (unknown [180.245.197.13]) by gnuweeb.org (Postfix) with ESMTPSA id E3015800EF; Wed, 29 Jun 2022 17:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1656525590; bh=sgazs96gJXhuLUrcrg8QV44lnrofUqELK9IkwXdhdvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDlS1y9uUown8thKLJr6nydxaHlAB/ZU4qJSQAPk9zwsRhsEfhct6zic4HHMsn1K5 pMcvUciDwREwTB5yu7TJp2JypmQxMF+BdCy28GxAfYDBhQuJOg4iHPwzedX+b2z98A iANx7McYCTkFY0HjCAiMVMCZb517LRW1WfLMqTrlIylO71J1clJ8ceXOiQ58XsLmDL MtxrZXAPIiEOwqTqdVwYFwt+7mME9dv08pU/sEvmf6f/HXqnHTn7h+xKB5FaBFxOUj tZIe2vB0uMmbg/7Urg57owi/LAL3wgByjPDTwFo5izJ8xDizLixP9nEXVRLvciKzC/ h3P7ioI50WDVA== From: Ammar Faizi To: Jens Axboe Cc: Ammar Faizi , Alviro Iskandar Setiawan , Fernanda Ma'rouf , Pavel Begunkov , Hao Xu , io-uring Mailing List , GNU/Weeb Mailing List Subject: [PATCH liburing v2 6/8] arch: Enable nolibc support for aarch64 Date: Thu, 30 Jun 2022 00:58:28 +0700 Message-Id: <20220629175255.1377052-7-ammar.faizi@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220629175255.1377052-1-ammar.faizi@intel.com> References: <20220629175255.1377052-1-ammar.faizi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: From: Ammar Faizi Support nolibc build for aarch64. While in there, don't indent the block inside #if / #elif / #else / #endif. Signed-off-by: Ammar Faizi --- src/lib.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/lib.h b/src/lib.h index e5f3680..399467c 100644 --- a/src/lib.h +++ b/src/lib.h @@ -7,28 +7,30 @@ #include #if defined(__x86_64__) || defined(__i386__) - #include "arch/x86/lib.h" +#include "arch/x86/lib.h" +#elif defined(__aarch64__) +#include "arch/aarch64/lib.h" #else - /* - * We don't have nolibc support for this arch. Must use libc! - */ - #ifdef CONFIG_NOLIBC - #error "This arch doesn't support building liburing without libc" - #endif - /* libc wrappers. */ - #include "arch/generic/lib.h" +/* + * We don't have nolibc support for this arch. Must use libc! + */ +#ifdef CONFIG_NOLIBC +#error "This arch doesn't support building liburing without libc" +#endif +/* libc wrappers. */ +#include "arch/generic/lib.h" #endif #ifndef offsetof - #define offsetof(TYPE, FIELD) ((size_t) &((TYPE *)0)->FIELD) +#define offsetof(TYPE, FIELD) ((size_t) &((TYPE *)0)->FIELD) #endif #ifndef container_of - #define container_of(PTR, TYPE, FIELD) ({ \ - __typeof__(((TYPE *)0)->FIELD) *__FIELD_PTR = (PTR); \ - (TYPE *)((char *) __FIELD_PTR - offsetof(TYPE, FIELD)); \ - }) +#define container_of(PTR, TYPE, FIELD) ({ \ + __typeof__(((TYPE *)0)->FIELD) *__FIELD_PTR = (PTR); \ + (TYPE *)((char *) __FIELD_PTR - offsetof(TYPE, FIELD)); \ +}) #endif void *__uring_malloc(size_t len); -- Ammar Faizi