From patchwork Tue Mar 23 17:43:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ronny Kotzschmar X-Patchwork-Id: 1457391 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=rPXuJPPw; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F4f15151xz9sTD for ; Wed, 24 Mar 2021 04:46:00 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Type:List-Help: Reply-To:List-Archive:List-Unsubscribe:List-Subscribe:From:List-Post:List-Id: Message-ID:MIME-Version:Date:Subject:To:Cc:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=tZLvx+48JWrztUqIBVGfk+VO8by9CFlOXosbSDnkOvc=; b=rPXuJPPw33S4Q4lmxlglCbKiJF TKaFUiTkI9lDqlCDpAv3jiAJ4beJEJiYmOm34UwkW50jaj75Hrzq3ITgyjGwCDYKHJ8a4jBgHpimQ KU8kBkU+U55aaPJfVC1x7QxYiA6HBtOg3xgceULSXuiRnhNkLVGjhrtdVtQXHNcuhQIJWWBAr6due BX/L9TbYAzvyL2qa4bIBIyJOyUhINWfiBwm0kSPZkH7iI9JeRltGDMoaoY73XdtzIpDeWvH/6irFL 9vQRQ1Z5GD3JIM1rlw42prHdUxCWmpGURwMVHiVcbuWXQEoeIA3otELFdRj++Ayva1RAV/xqGziyl S0YLklpg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lOl4a-00FRXl-0f; Tue, 23 Mar 2021 17:44:08 +0000 To: openwrt-devel@lists.openwrt.org Subject: [PATCH] Revert "build: fix kernel 5.4 on macos" Date: Tue, 23 Mar 2021 18:43:08 +0100 MIME-Version: 1.0 Message-ID: List-Id: OpenWrt Development List List-Post: X-Patchwork-Original-From: Ronny Kotzschmar via openwrt-devel From: Ronny Kotzschmar Precedence: list X-Mailman-Version: 2.1.34 X-BeenThere: openwrt-devel@lists.openwrt.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Ronny Kotzschmar List-Help: Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. This reverts commit 0a06fcf608ddf1f5db389decf266283392344784. With this commit uboot-rockchip does not build on macos. There are some missing definitions for unsigned types: HOSTCC tools/aisimage.o In file included from tools/aisimage.c:9: In file included from include/image.h:19: In file included from ./arch/arm/include/asm/byteorder.h:29: In file included from include/linux/byteorder/little_endian.h:13: include/linux/types.h:146:9: error: unknown type name '__u64'; did you mean '__s64'? typedef __u64 __bitwise __le64; ^ /work/openwrt/staging_dir/host/include/asm/types.h:19:44: note: '__s64' declared here __extension__ typedef __signed__ long long __s64; ^ There is no build error without this commit. build tested on macos 11.2.3-x86_64 and debian buster with target friendlyarm_nanopi-r2s Signed-off-by: Ronny Kotzschmar diff --git a/tools/Makefile b/tools/Makefile index 8752a3e2b5..a0997b8ce1 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -133,10 +133,6 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build mkdir -p $(BUILD_DIR_HOST)/stamp $(STAGING_DIR_HOST)/include/sys $(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/ $(INSTALL_DATA) $(TOPDIR)/tools/include/sys/*.h $(STAGING_DIR_HOST)/include/sys/ -ifneq ($(HOST_OS),Linux) - mkdir -p $(STAGING_DIR_HOST)/include/asm - $(INSTALL_DATA) $(TOPDIR)/tools/include/asm/*.h $(STAGING_DIR_HOST)/include/asm/ -endif ln -snf lib $(STAGING_DIR_HOST)/lib64 touch $@ diff --git a/tools/include/asm/types.h b/tools/include/asm/types.h deleted file mode 100644 index 2c91232619..0000000000 --- a/tools/include/asm/types.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* - * asm-generic/int-ll64.h - * - * Integer declarations for architectures which use "long long" - * for 64-bit types. - */ - -#ifndef _ASM_GENERIC_INT_LL64_H -#define _ASM_GENERIC_INT_LL64_H - -typedef __signed__ char __s8; - -typedef __signed__ short __s16; - -typedef __signed__ int __s32; - -#ifdef __GNUC__ -__extension__ typedef __signed__ long long __s64; -#else -typedef __signed__ long long __s64; -#endif - -#endif /* _ASM_GENERIC_INT_LL64_H */