Browse Source

Provide option to avoid defining a custom version of uintptr_t.

There's a definition in stdint.h (provided by gcc) which will be more correct
if available.

Define CONFIG_USE_STDINT to use this feature, or USE_STDINT=1 on the 'make'
commmand.

This adjusts the settings for x86 and sandbox, with both have 64-bit options.

Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@google.com>
Rewritten to be an option, since stdint.h is often available only in glibc.
Changed to preserve a clear boundary between stdint and non-stdint
Signed-off-by: Simon Glass <sjg@chromium.org>
tags/2020-06-01
Gabe Black 6 years ago
committed by Tom Rini
parent
commit
0d296cc2d3
6 changed files with 36 additions and 4 deletions
  1. +5
    -0
      README
  2. +5
    -0
      arch/sandbox/include/asm/types.h
  3. +5
    -0
      arch/x86/include/asm/types.h
  4. +5
    -0
      config.mk
  5. +8
    -3
      include/compiler.h
  6. +8
    -1
      include/linux/types.h

+ 5
- 0
README View File

@@ -4054,6 +4054,11 @@ Configuration Settings:
be asserted. See doc/README.omap-reset-time for details on how
the value can be calulated on a given board.

- CONFIG_USE_STDINT
If stdint.h is available with your toolchain you can define this
option to enable it. You can provide option 'USE_STDINT=1' when
building U-Boot to enable this.

The following definitions that deal with the placement and management
of environment data (variable area); in general, we support the
following configurations:


+ 5
- 0
arch/sandbox/include/asm/types.h View File

@@ -42,8 +42,13 @@ typedef unsigned short u16;
typedef signed int s32;
typedef unsigned int u32;

#if !defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__)
typedef signed long long s64;
typedef unsigned long long u64;
#else
typedef __INT64_TYPE__ s64;
typedef __UINT64_TYPE__ u64;
#endif

#define BITS_PER_LONG CONFIG_SANDBOX_BITS_PER_LONG



+ 5
- 0
arch/x86/include/asm/types.h View File

@@ -36,8 +36,13 @@ typedef unsigned short u16;
typedef signed int s32;
typedef unsigned int u32;

#if !defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__)
typedef signed long long s64;
typedef unsigned long long u64;
#else
typedef __INT64_TYPE__ s64;
typedef __UINT64_TYPE__ u64;
#endif

#define BITS_PER_LONG 32



+ 5
- 0
config.mk View File

@@ -59,6 +59,11 @@ ifdef FTRACE
PLATFORM_CPPFLAGS += -finstrument-functions -DFTRACE
endif

# Allow use of stdint.h if available
ifneq ($(USE_STDINT),)
PLATFORM_CPPFLAGS += -DCONFIG_USE_STDINT
endif

#########################################################################

RELFLAGS := $(PLATFORM_RELFLAGS)


+ 8
- 3
include/compiler.h View File

@@ -112,6 +112,14 @@ typedef unsigned int uint;

#else /* !USE_HOSTCC */

#ifdef CONFIG_USE_STDINT
/* Provided by gcc. */
#include <stdint.h>
#else
/* Type for `void *' pointers. */
typedef unsigned long int uintptr_t;
#endif

#include <linux/string.h>
#include <linux/types.h>
#include <asm/byteorder.h>
@@ -128,9 +136,6 @@ typedef unsigned int uint;
#define __WORDSIZE 32
#endif

/* Type for `void *' pointers. */
typedef unsigned long int uintptr_t;

#endif /* USE_HOSTCC */

#define likely(x) __builtin_expect(!!(x), 1)


+ 8
- 1
include/linux/types.h View File

@@ -104,7 +104,8 @@ typedef __u8 uint8_t;
typedef __u16 uint16_t;
typedef __u32 uint32_t;

#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && \
(!defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__))
typedef __u64 uint64_t;
typedef __u64 u_int64_t;
typedef __s64 int64_t;
@@ -112,6 +113,12 @@ typedef __s64 int64_t;

#endif /* __KERNEL_STRICT_NAMES */

#if defined(CONFIG_USE_STDINT) && defined(__INT64_TYPE__)
typedef __UINT64_TYPE__ uint64_t;
typedef __UINT64_TYPE__ u_int64_t;
typedef __INT64_TYPE__ int64_t;
#endif

/*
* Below are truly Linux-specific types that should never collide with
* any application/library that wants linux/types.h.


Loading…
Cancel
Save