Attachment 652642 Details for Bug 866051 – changes for building in Fedora

[patch] changes for building in Fedora

carlfw-fedora.patch (text/plain), 6.80 KB, created by Dan Horák on 2012-11-27 12:09:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Horák

Created: 2012-11-27 12:09:09 UTC

Size: 6.80 KB

patch

obsolete

>From 5bcea0df2246f37d7a57eeaac6d12944994fbcb5 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
>Date: Fri, 6 Apr 2012 11:10:18 +0200
>Subject: [PATCH 1/5] proposed solution with sh-linux-gnu toolchain
>
>---
> carlfw/include/config.h  |    3 +++
> carlfw/include/printf.h  |    1 -
> extra/sh-elf-linux.cmake |   16 ++++++++--------
> include/linux/types.h    |    3 +--
> 4 files changed, 12 insertions(+), 11 deletions(-)
>
>diff --git a/carlfw/include/config.h b/carlfw/include/config.h
>index e7c358d..14a1faf 100644
>--- a/carlfw/include/config.h
>+++ b/carlfw/include/config.h
>@@ -61,4 +61,7 @@ static inline void __config_check(void)
> 	BUILD_BUG_ON(CARL9170_INTF_NUM >= AR9170_MAX_VIRTUAL_MAC);
> }
> 
>+extern void *memset (void *__s, int __c, size_t __n);
>+extern void *memcpy (void *__dest, __const void *__src, size_t __n);
>+
> #endif /* __CARL9170FW_CONFIG_H */
>diff --git a/carlfw/include/printf.h b/carlfw/include/printf.h
>index dd4559e..c0912d2 100644
>--- a/carlfw/include/printf.h
>+++ b/carlfw/include/printf.h
>@@ -27,7 +27,6 @@
> #define __CARL9170FW_PRINTF_H
> 
> #include <stdarg.h>
>-#include <string.h>
> #include "config.h"
> #include "carl9170.h"
> #include "uart.h"
>diff --git a/extra/sh-elf-linux.cmake b/extra/sh-elf-linux.cmake
>index 2429436..82aca93 100644
>--- a/extra/sh-elf-linux.cmake
>+++ b/extra/sh-elf-linux.cmake
>@@ -5,16 +5,16 @@ set_property(DIRECTORY PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
> 
> set(CMAKE_FIND_ROOT_PATH ${CMAKE_SOURCE_DIR}/toolchain/inst/)
> 
>-set(CMAKE_C_FLAGS "-m2 -ml -Os -ffreestanding -nostartfiles")
>+set(CMAKE_C_FLAGS "-m2 -ml -Os -ffreestanding -fleading-underscore -nostartfiles")
> set(CMAKE_C_LINK_FLAGS "-Wl,-static,-EL,-x,--gc-sections")
> 
>-set(OBJCOPY ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-objcopy)
>-set(CMAKE_C_COMPILER "${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-gcc")
>-set(CMAKE_AR ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-ar)
>-set(CMAKE_ASM_COMPILER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-as)
>-set(CMAKE_ASM-ATT_COMPILER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-as)
>-set(CMAKE_LINKER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-ld)
>-set(CMAKE_C_LINK_EXECUTABLE "${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-gcc <OBJECTS> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> -o <TARGET>")
>+set(OBJCOPY sh-linux-gnu-objcopy)
>+set(CMAKE_C_COMPILER sh-linux-gnu-gcc)
>+set(CMAKE_AR sh-linux-gnu-ar)
>+set(CMAKE_ASM_COMPILER sh-linux-gnu-as)
>+set(CMAKE_ASM-ATT_COMPILER sh-linux-gnu-as)
>+set(CMAKE_LINKER sh-linux-gnu-ld)
>+set(CMAKE_C_LINK_EXECUTABLE "sh-linux-gnu-gcc <OBJECTS> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> -o <TARGET>")
> 
> set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
> set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
>diff --git a/include/linux/types.h b/include/linux/types.h
>index 3f45f0f..5d70796 100644
>--- a/include/linux/types.h
>+++ b/include/linux/types.h
>@@ -19,8 +19,7 @@
> 
> #include <stdint.h>
> #include <stdbool.h>
>-#include <stdlib.h>
>-#include <sys/param.h>
>+#include <stddef.h>
> 
> #if BYTE_ORDER == BIG_ENDIAN
> #error	"big endian is not supported by target"
>-- 
>1.7.7.6
>
>
>From 54d465aaaa1c7d4494e8082ec219ed2bc00e9e2c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
>Date: Tue, 27 Nov 2012 12:56:37 +0100
>Subject: [PATCH 2/5] BYTE_ORDER is not set anywhere so the condition fails
> always
>
>---
> include/linux/types.h |    4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
>diff --git a/include/linux/types.h b/include/linux/types.h
>index 5d70796..29fa258 100644
>--- a/include/linux/types.h
>+++ b/include/linux/types.h
>@@ -21,10 +21,6 @@
> #include <stdbool.h>
> #include <stddef.h>
> 
>-#if BYTE_ORDER == BIG_ENDIAN
>-#error	"big endian is not supported by target"
>-#endif
>-
> typedef uint16_t	__le16;
> typedef uint32_t	__le32;
> typedef uint64_t	__le64;
>-- 
>1.7.7.6
>
>
>From d3777d9690f9c026a70d1c97458c8194dc964025 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
>Date: Tue, 27 Nov 2012 12:57:25 +0100
>Subject: [PATCH 3/5] discard build-id sections
>
>---
> carlfw/carl9170.lds |    2 ++
> minifw/miniboot.lds |    2 ++
> 2 files changed, 4 insertions(+), 0 deletions(-)
>
>diff --git a/carlfw/carl9170.lds b/carlfw/carl9170.lds
>index 97dda68..ebb8dab 100644
>--- a/carlfw/carl9170.lds
>+++ b/carlfw/carl9170.lds
>@@ -56,4 +56,6 @@ SECTIONS
> 	.data	: { *(.data*) } > pram
> 
> 	.fwdsc	: { KEEP(*(.fwdsc)) } > bogus
>+
>+	/DISCARD/ : { *(.note*) }
> }
>diff --git a/minifw/miniboot.lds b/minifw/miniboot.lds
>index 51e5ac4..a9d492a 100644
>--- a/minifw/miniboot.lds
>+++ b/minifw/miniboot.lds
>@@ -17,4 +17,6 @@ SECTIONS
> 	.rodata	: { *(.rodata*) } > pram
> 	.bss	: { *(.bss) } > pram
> 	.data	: { *(.data*) } > pram
>+
>+	/DISCARD/ : { *(.note*) }
> }
>-- 
>1.7.7.6
>
>
>From e6bd400d01cfc3f38c10ad5d4b5005a9e6a6d1e0 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
>Date: Tue, 27 Nov 2012 12:58:16 +0100
>Subject: [PATCH 4/5] -flto/-fwhole-program doesn't work currently in out
> toolchain
>
>---
> carlfw/CMakeLists.txt |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/carlfw/CMakeLists.txt b/carlfw/CMakeLists.txt
>index fe68572..913027b 100644
>--- a/carlfw/CMakeLists.txt
>+++ b/carlfw/CMakeLists.txt
>@@ -10,7 +10,7 @@ set(CARLFW_CFLAGS_WARNING "-W -Wall -Wextra -Wunreachable-code -Winline -Wlogica
> set(CARLFW_CFLAGS_EXTRA "-mbitops -std=gnu99 -ffunction-sections -Wframe-larger-than=128 -Werror")
> set(CARLFW_CFLAGS_DEF "-D__CARL9170FW__")
> if (CONFIG_CARL9170FW_AGGRESSIVE_CFLAGS)
>-	set(CARLFW_CFLAGS_AGGRESSIVE "-fomit-frame-pointer -fsee -frename-registers -ftree-vectorize -flto -fstrict-volatile-bitfields -fmodulo-sched -fwhole-program")
>+	set(CARLFW_CFLAGS_AGGRESSIVE "-fomit-frame-pointer -fsee -frename-registers -ftree-vectorize -fstrict-volatile-bitfields -fmodulo-sched")
> endif (CONFIG_CARL9170FW_AGGRESSIVE_CFLAGS)
> set(CARLFW_CFLAGS "${CARLFW_CFLAGS_DEF} ${CARLFW_CFLAGS_EXTRA} ${CARLFW_CFLAGS_AGGRESSIVE} ${CARLFW_CFLAGS_WARNING}")
> 
>-- 
>1.7.7.6
>
>
>From f281ecc449e34f3506d5d336dd1b2935bc6274b3 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
>Date: Tue, 27 Nov 2012 12:59:37 +0100
>Subject: [PATCH 5/5] set options to work without libc
>
>---
> extra/sh-elf-linux.cmake |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/extra/sh-elf-linux.cmake b/extra/sh-elf-linux.cmake
>index 82aca93..77e1575 100644
>--- a/extra/sh-elf-linux.cmake
>+++ b/extra/sh-elf-linux.cmake
>@@ -5,8 +5,8 @@ set_property(DIRECTORY PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
> 
> set(CMAKE_FIND_ROOT_PATH ${CMAKE_SOURCE_DIR}/toolchain/inst/)
> 
>-set(CMAKE_C_FLAGS "-m2 -ml -Os -ffreestanding -fleading-underscore -nostartfiles")
>-set(CMAKE_C_LINK_FLAGS "-Wl,-static,-EL,-x,--gc-sections")
>+set(CMAKE_C_FLAGS "-m2 -ml -Os -ffreestanding -fleading-underscore")
>+set(CMAKE_C_LINK_FLAGS "-Wl,-static,-EL,-x,--gc-sections -nostartfiles -nostdlib")
> 
> set(OBJCOPY sh-linux-gnu-objcopy)
> set(CMAKE_C_COMPILER sh-linux-gnu-gcc)
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 866051: 652642