diff mbox series

Revert "build: fix kernel 5.4 on macos"

Message ID mailman.5896.1616521446.1246568.openwrt-devel@lists.openwrt.org
State Not Applicable
Delegated to: Petr Štetiar
Headers show
Series Revert "build: fix kernel 5.4 on macos" | expand

Commit Message

Ronny Kotzschmar March 23, 2021, 5:43 p.m. UTC 
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 <ro.ok@me.com>
diff mbox series

Patch

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 */