Commit 5e5948e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hexagon-5.13-0' of git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux 

Pull Hexagon updates from Brian Cain:
 "Hexagon architecture build fixes + builtins

  Small build fixes applied:

   - use -mlong-calls to build

   - extend jumps in futex_atomic_*

   - etc

  Also, for convenience and portability, the hexagon compiler builtin
  functions like memcpy etc have been added to the kernel -- following
  the idiom used by other architectures"

* tag 'hexagon-5.13-0' of git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux:
  Hexagon: add target builtins to kernel
  Hexagon: remove DEBUG from comet config
  Hexagon: change jumps to must-extend in futex_atomic_*
  Hexagon: fix build errors
parents a3f53e8a f1f99adf

arch/hexagon/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ LDFLAGS_vmlinux += -G0 
# Do not use single-byte enums; these will overflow.

KBUILD_CFLAGS += -fno-short-enums



# We must use long-calls:

KBUILD_CFLAGS += -mlong-calls



# Modules must use either long-calls, or use pic/plt.

# Use long-calls for now, it's easier.  And faster.

# KBUILD_CFLAGS_MODULE += -fPIC
@@ -30,9 +33,6 @@ TIR_NAME := r19 
KBUILD_CFLAGS += -ffixed-$(TIR_NAME) -DTHREADINFO_REG=$(TIR_NAME) -D__linux__

KBUILD_AFLAGS += -DTHREADINFO_REG=$(TIR_NAME)



LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name 2>/dev/null)

libs-y += $(LIBGCC)



head-y := arch/hexagon/kernel/head.o



core-y += arch/hexagon/kernel/ \

arch/hexagon/configs/comet_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -81,4 +81,3 @@ CONFIG_FRAME_WARN=0 
CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

# CONFIG_SCHED_DEBUG is not set
 
CONFIG_DEBUG_INFO=y

arch/hexagon/include/asm/futex.h

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
	"3:\n" \

	".section .fixup,\"ax\"\n" \

	"4: %1 = #%5;\n" \

	"   jump 3b\n" \

	"   jump ##3b\n" \

	".previous\n" \

	".section __ex_table,\"a\"\n" \

	".long 1b,4b,2b,4b\n" \
@@ -90,7 +90,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, 
	"3:\n"

	".section .fixup,\"ax\"\n"

	"4: %0 = #%6\n"

	"   jump 3b\n"

	"   jump ##3b\n"

	".previous\n"

	".section __ex_table,\"a\"\n"

	".long 1b,4b,2b,4b\n"

arch/hexagon/include/asm/timex.h

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <asm-generic/timex.h>

#include <asm/timer-regs.h>

#include <asm/hexagon_vm.h>



/* Using TCX0 as our clock.  CLOCK_TICK_RATE scheduled to be removed. */

#define CLOCK_TICK_RATE              TCX0_CLK_RATE
@@ -16,7 +17,7 @@ 


static inline int read_current_timer(unsigned long *timer_val)

{

	*timer_val = (unsigned long) __vmgettime();

	*timer_val = __vmgettime();

	return 0;

}

arch/hexagon/kernel/hexagon_ksyms.c

+4 −4
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ EXPORT_SYMBOL(_dflt_cache_att); 
DECLARE_EXPORT(__hexagon_memcpy_likely_aligned_min32bytes_mult8bytes);



/* Additional functions */

DECLARE_EXPORT(__divsi3);

DECLARE_EXPORT(__modsi3);

DECLARE_EXPORT(__udivsi3);

DECLARE_EXPORT(__umodsi3);

DECLARE_EXPORT(__hexagon_divsi3);

DECLARE_EXPORT(__hexagon_modsi3);

DECLARE_EXPORT(__hexagon_udivsi3);

DECLARE_EXPORT(__hexagon_umodsi3);

DECLARE_EXPORT(csum_tcpudp_magic);