[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [microblaze-uclinux] patch for uClinux-dist-20040218

To: microblaze-uclinux@xxxxxxxxxxxxxx
Subject: Re: [microblaze-uclinux] patch for uClinux-dist-20040218
From: John Williams <jwilliams@xxxxxxxxxxxxxx>
Date: Fri, 05 Mar 2004 07:52:25 +1000
In-reply-to: <Law10-F126C0eOtiFUy00029333@hotmail.com>
Organization: ITEE, University of Queensland
References: <Law10-F126C0eOtiFUy00029333@hotmail.com>
Reply-to: microblaze-uclinux@xxxxxxxxxxxxxx
Sender: owner-microblaze-uclinux@xxxxxxxxxxxxxx
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030529

Hi Patrick,

Patrick Robin wrote:
> Hello,
> 
> When I apply this patch after checking out uClinux-dist , patch fails on
> 
> vendors/Insight/mbvanilla_net/config.uClibc
> 
> hunk #1 and #2 fail.
> 
> I also get a failure with the second patch for common-config.arch
> 
> Am I doing something wrong?

No I don't think so - someone else reported this to me as well.  I'll 
look into it, but for now, attached are these two files - copy them into 
vendors/Insight/mbvanilla_net/config.uClibc and 
vendors/Xilinx/common/common-config.arch

Regards,

John

#
# Automatically generated make config: don't edit
#
# TARGET_alpha is not set
# TARGET_arm is not set
# TARGET_cris is not set
# TARGET_e1 is not set
# TARGET_h8300 is not set
# TARGET_i386 is not set
# TARGET_i960 is not set
# TARGET_m68k is not set
TARGET_microblaze=y
# TARGET_mips is not set
# TARGET_powerpc is not set
# TARGET_sh is not set
# TARGET_sparc is not set
# TARGET_v850 is not set

#
# Target Architecture Features and Options
#
HAVE_ELF=y
TARGET_ARCH="microblaze"
# ARCH_LITTLE_ENDIAN is not set
ARCH_BIG_ENDIAN=y
ARCH_HAS_NO_MMU=y
UCLIBC_HAS_FLOATS=y
# HAS_FPU is not set
UCLIBC_HAS_SOFT_FLOAT=y
DO_C99_MATH=y
WARNINGS="-Wall"
KERNEL_SOURCE="$(ROOTDIR)/$(LINUXDIR)/."
UCLIBC_UCLINUX_BROKEN_MUNMAP=y
EXCLUDE_BRK=y
C_SYMBOL_PREFIX=""
HAVE_DOT_CONFIG=y

#
# General Library Settings
#
# HAVE_NO_PIC is not set
# DOPIC is not set
HAVE_NO_SHARED=y
ARCH_HAS_NO_LDSO=y
# UCLIBC_PIE_SUPPORT is not set
UCLIBC_CTOR_DTOR=y
# UCLIBC_PROPOLICE is not set
# UCLIBC_PROFILING is not set
# HAS_NO_THREADS is not set
# UCLIBC_HAS_THREADS is not set
UCLIBC_HAS_LFS=y
# MALLOC is not set
MALLOC_SIMPLE=y
# MALLOC_STANDARD is not set
# MALLOC_GLIBC_COMPAT is not set
UCLIBC_DYNAMIC_ATEXIT=y
# HAS_SHADOW is not set
UNIX98PTY_ONLY=y
ASSUME_DEVPTS=y
UCLIBC_HAS_TM_EXTENSIONS=y
# UCLIBC_HAS_TZ_CACHING is not set
UCLIBC_HAS_TZ_FILE=y
UCLIBC_HAS_TZ_FILE_READ_MANY=y
UCLIBC_TZ_FILE_PATH="/etc/TZ"

#
# Networking Support
#
# UCLIBC_HAS_IPV6 is not set
UCLIBC_HAS_RPC=y
UCLIBC_HAS_FULL_RPC=y

#
# String and Stdio Support
#
UCLIBC_HAS_CTYPE_TABLES=y
UCLIBC_HAS_CTYPE_SIGNED=y
UCLIBC_HAS_CTYPE_UNSAFE=y
# UCLIBC_HAS_CTYPE_CHECKED is not set
# UCLIBC_HAS_CTYPE_ENFORCED is not set
# UCLIBC_HAS_WCHAR is not set
# UCLIBC_HAS_LOCALE is not set
# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
# USE_OLD_VFPRINTF is not set
UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
UCLIBC_HAS_STDIO_BUFSIZ_256=y
# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
UCLIBC_HAS_STDIO_GETC_MACRO=y
UCLIBC_HAS_STDIO_PUTC_MACRO=y
UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
UCLIBC_HAS_PRINTF_M_SPEC=y
UCLIBC_HAS_ERRNO_MESSAGES=y
UCLIBC_HAS_SYS_ERRLIST=y
UCLIBC_HAS_SIGNUM_MESSAGES=y
# UCLIBC_HAS_SYS_SIGLIST is not set
UCLIBC_HAS_GNU_GETOPT=y

#
# Big and Tall
#
UCLIBC_HAS_REGEX=y
# UCLIBC_HAS_WORDEXP is not set
# UCLIBC_HAS_FTW is not set
UCLIBC_HAS_GLOB=y

#
# Library Installation Options
#
RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/"
DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"

#
# uClibc development/debugging options
#
# DODEBUG is not set
# DOASSERTS is not set
# UCLIBC_MJN3_ONLY is not set

.EXPORT_ALL_VARIABLES:
############################################################################
#
#  A Generic Microblaze config.arch that can be included by other platforms
#  to reduce the number of places that need to be edited when something
#  common changes.  If you include this file you may provide:
#
#  CPUFLAGS            - cpu specific flags to pass to the compiler
#  VENDOR_CFLAGS       - vendor specific flags to pass to the compiler
#  DISABLE_XIP         - set this to 1 to disable XIP code
#  DISABLE_SHARED_LIBS - set this to 1 to disable shared libraries
#  DISABLE_MOVE_RODATA - set this to 1 to disable moving rodata to text
#  LOPT                - library optimisation flags
#  UOPT                - user optimisation flags
#
#  Note:  Many of these are still unsupported on Microblaze!
#
#  John Williams    <jwilliams@itee.uq.edu.au>
#  	based upon m68k version by 
#  David McCullough <davidm@snapgear.com>
#
############################################################################
#
# Generic settings
#

ifndef CONSOLE_BAUD_RATE
CONSOLE_BAUD_RATE = 9600
endif

XILINX_COMMON= $(ROOTDIR)/vendors/Xilinx/common

ifeq ($(ROOTDIR)/modules,$(wildcard $(ROOTDIR)/modules))
EXTRA_MODULE_DIRS = $(ROOTDIR)/modules
endif

ifndef VERSIONPKG
#define VERSIONPKG 1.0.0
endif

ifndef VERSIONSTR
VERSIONSTR = $(CONFIG_VENDOR)/$(CONFIG_PRODUCT) Version $(VERSIONPKG)
endif

############################################################################
#
# The makefiles need to know how to do things in different contexts
# To save some pain we put it all here
#
# First settings we always want for all builds
#

# ARCH = kernel,  TARGET_ARCH = uClibc

MACHINE       = microblaze
ARCH          = microblaze
CROSS_COMPILE = mb-
CROSS         = $(CROSS_COMPILE)

CC        = $(CROSS_COMPILE)gcc $(CPUFLAGS)
AS        = $(CROSS_COMPILE)as $(CPUFLAGS)
CXX       = $(CROSS_COMPILE)g++ $(CPUFLAGS)
AR        = $(CROSS_COMPILE)ar
LD        = $(CROSS_COMPILE)ld
OBJCOPY   = $(CROSS_COMPILE)objcopy
RANLIB    = $(CROSS_COMPILE)ranlib
ELF2FLT   = mb-elf2flt
STRIPTOOL = $(CROSS_COMPILE)strip
STRIP     = $(STRIPTOOL)

UCLINUX_BUILD_SET = 0			# have we set a special config below

ifndef DISABLE_SHARED_LIBS
  ifeq ($(CONFIG_BINFMT_SHARED_FLAT),y)
	BUILD_SHARED = 1
  endif
endif

############################################################################
#
# General purpose lib building rules,  uClibc.config uses these when
# possible
#

ifdef UCLINUX_BUILD_LIB

	# find where $(CROSS)gcc is living
	GCCDIR = $(shell $(CC) -v 2>&1|grep specs|sed -e 's/.* \(.*\)specs/\1\./')

  ifdef CONFIG_LIB_DEBUG
	CFLAGS  :=  $(if $(LOPT),$(LOPT),-O1) -g
  else
	CFLAGS  :=  $(if $(LOPT),$(LOPT),-O2) -g -fomit-frame-pointer
  endif
	CFLAGS  += $(CPUFLAGS)
	CFLAGS  += $(VENDOR_CFLAGS)
	CFLAGS  += -DEMBED

	CFLAGS  += -fno-builtin

	# Use the various processor config options to determine special
	# compiler flags
	ifdef CONFIG_MICROBLAZE_HARD_MULT
		CFLAGS += -mno-xl-soft-mul
	endif

	ifdef CONFIG_MICROBLAZE_HARD_DIV
		CFLAGS += -mno-xl-soft-div
	endif

	ifdef CONFIG_MICROBLAZE_HARD_BARREL
		CFLAGS += -mxl-barrel-shift
	endif

  ifdef BUILD_SHARED
	CFLAGS  += -mid-shared-library
  else
	ifndef DISABLE_XIP
	  CFLAGS  += -msep-data
	endif
  endif

	# don't want all the CFLAGS for uClibc/Config
	ARCH_CFLAGS = $(CFLAGS)
	CFLAGS  += -I$(ROOTDIR)/lib/$(CONFIG_LIBCDIR)/include -I$(ROOTDIR)
	CFLAGS  += -Dlinux -D__linux__ -D__uClinux__ -Dunix

	# the following is needed for uClinux-2.4
	CFLAGS  += -I$(ROOTDIR)/$(LINUXDIR)/include

	CFLAGS += -I$(GCCDIR)/include

	LDFLAGS  = $(CFLAGS) -Wl,-elf2flt 

  ifndef DISABLE_MOVE_RODATA
  	LDFLAGS += -Wl,-move-rodata
  endif

	UCLINUX_BUILD_SET=1
endif

############################################################################
#
# Settings for building user apps
#

ifdef UCLINUX_BUILD_USER

	# find where $(CROSS)gcc is living
	GCC_DIR = $(shell $(CC) -v 2>&1|grep specs|sed -e 's/.* \(.*\)specs/\1\./')

	# find the compiler's libc.a  Note that for microblaze there are four 
	# different versions, depending on the combination of hardware barrel
	# shift and multiplier.  Config options are used top pick out the right one

	ifdef CONFIG_MICROBLAZE_HARD_MULT
		LIBC_SUFFIX := hard
	else
		LIBC_SUFFIX := soft
	endif

	ifdef CONFIG_MICROBLAZE_HARD_BARREL
		LIBC_SUFFIX := $(LIBC_SUFFIX)_shift
	endif

	# GCC_LIB = $(GCC_DIR)/../../../../microblaze/lib/libc_hard_shift.a $(GCC_DIR)/libgcc.a
	GCC_LIB = $(GCC_DIR)/libgcc.a $(GCC_DIR)/../../../../microblaze/lib/libc_$(LIBC_SUFFIX).a 

	# use -lc (from uClibc) and also the compiler's libc.a as well
	# I know this is hideous, but we need to relink against libc
	# after the $GCC_LIB, to avoid some dependency issues
	# Don't hate me, just fix it! :-) JW
	
	SLIBC	     = -lc $(GCC_LIB) -lc
	SLIBM        = -lm
	SLIBNET      = -lnet
	SLIBDES      = -ldes
	SLIBAES      = -laes
	SLIBPCAP     = -lpcap
	SLIBSSL      = -lssl
	SLIBCRYPTO   = -lcrypto
	SLIBCRYPT    = -lcrypt_old
	SLIBPTHREAD  = -lpthread

  ifdef BUILD_SHARED
	LIBC          = -Wl,-R,$(ROOTDIR)/lib/$(LIBCDIR)/libc.gdb $(SLIBC)
  else
	LIBC          = $(SLIBC) 
	LIBSNAPGEAR   = $(SLIBSNAPGEAR)
  endif
	LIBM        = $(SLIBM)
	LIBNET      = $(SLIBNET)
	LIBDES      = $(SLIBDES)
	LIBAES      = $(SLIBAES)
	LIBPCAP     = $(SLIBPCAP)
	LIBSSL      = $(SLIBSSL)
	LIBCRYPTO   = $(SLIBCRYPTO)
	LIBCRYPT    = $(SLIBCRYPT)
	LIBPTHREAD  = $(SLIBPTHREAD)
	LIBSNAPGEARPP = $(SLIBSNAPGEARPP)
	LIBCONFIGDD = $(SLIBCONFIGDD)

	LIBGCC      = 
	LIBIBERTY   = -liberty
	LIBIO       = -lio
	LIBIOSTREAM = -liostream
	LIBSTDCPP   = -lstdc++

	LDPATH = \
			-L$(ROOTDIR)/lib/$(LIBCDIR)/. \
			-L$(ROOTDIR)/lib/$(LIBCDIR)/lib \
			-L$(ROOTDIR)/lib/libm \
			-L$(ROOTDIR)/lib/libnet \
			-L$(ROOTDIR)/lib/libdes \
			-L$(ROOTDIR)/lib/libaes \
			-L$(ROOTDIR)/lib/libpcap \
			-L$(ROOTDIR)/lib/libssl \
			-L$(ROOTDIR)/lib/libcrypt_old \
			-L$(ROOTDIR)/lib/zlib

	INCLIBC = -I$(ROOTDIR)/lib/$(CONFIG_LIBCDIR)/include
	INCLIBM = -I$(ROOTDIR)/lib/libm
	INCNET  = -I$(ROOTDIR)/lib/libnet
	INCDES  = -I$(ROOTDIR)/freeswan/libdes
	INCAES  = -I$(ROOTDIR)/freeswan/libcrypto/libaes
	INCGMP  = -I$(ROOTDIR)/lib/libgmp
	INCPCAP = -I$(ROOTDIR)/lib/libpcap
	INCSSL  = -I$(ROOTDIR)/lib/libssl/include
	INCZ    = -I$(ROOTDIR)/lib/zlib
	INCVEND = -I$(ROOTDIR)/vendors/include
	INCCRYPTOLD	= -I$(ROOTDIR)/lib/libcrypt_old

  ifdef CONFIG_USER_DEBUG
	CFLAGS  :=  $(if $(UOPT),$(UOPT),-O1) -g
  else
	CFLAGS  :=  $(if $(UOPT),$(UOPT),-Os) -g -fomit-frame-pointer
  endif

	# CFLAGS  += -v
	CFLAGS  += $(CPUFLAGS)
	CFLAGS  += $(VENDOR_CFLAGS)
	CFLAGS  += -Dlinux -D__linux__ -Dunix -D__uClinux__ -DEMBED
	CFLAGS  += $(INCLIBC) $(INCLIBM) $(INCCRYPTOLD)
	CFLAGS  += -I$(ROOTDIR)

	CFLAGS  += -fno-builtin

	# Use the various processor config options to determine special
	# compiler flags
	ifdef CONFIG_MICROBLAZE_HARD_MULT
		CFLAGS += -mno-xl-soft-mul
	endif

	ifdef CONFIG_MICROBLAZE_HARD_DIV
		CFLAGS += -mno-xl-soft-div
	endif

	ifdef CONFIG_MICROBLAZE_HARD_BARREL
		CFLAGS += -mxl-barrel-shift
	endif

  ifdef BUILD_SHARED
	CFLAGS  += -mid-shared-library -mshared-library-id=0
  else
	ifndef DISABLE_XIP
	  CFLAGS  += -msep-data
	endif
  endif

	#
	# the following is needed for 2.4
	#
	CFLAGS  += -I$(ROOTDIR)/$(LINUXDIR)/include

	CXXFLAGS = $(CFLAGS) $(INCCXX)

	# let elf2flt work out where the link script is.
	LDFLAGS  = $(CFLAGS) -Wl,-elf2flt

  ifndef DISABLE_MOVE_RODATA
  	LDFLAGS += -Wl,-move-rodata
  endif

  ifdef BUILD_SHARED
	LDFLAGS += -Wl,-shared-lib-id,0
  endif

  ifneq ($(LIBCDIR),libc)
	LDFLAGS += -nostartfiles $(ROOTDIR)/lib/$(LIBCDIR)/lib/crt0.o -nostdlib
	# LDFLAGS += -nostartfiles $(ROOTDIR)/lib/$(LIBCDIR)/lib/crt0.o
  endif
  	LDFLAGS += $(LDPATH) 

	LDLIBS         = $(LIBC) 
	LDLIBS-static  = $(SLIBC)
	CXXLIBS        = $(LIBSTDCPP) $(LIBIOSTREAM) $(LIBIO) $(LIBIBERTY) \
					 $(LIBC) $(LIBGCC)
	
  ifndef FLTFLAGS
	FLTFLAGS :=
  endif
	export FLTFLAGS

	# for anyone still using it
	CONVERT = /bin/true

	UCLINUX_BUILD_SET=1
endif

############################################################################
#
# fall through,  do other config options perhaps
#

ifeq ($(UCLINUX_BUILD_SET),1)
endif

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

References:
- RE: [microblaze-uclinux] patch for uClinux-dist-20040218
  - From: Patrick Robin

Prev by Date: RE: [microblaze-uclinux] patch for uClinux-dist-20040218
Next by Date: Re: [microblaze-uclinux] uClinux finally works
Previous by thread: RE: [microblaze-uclinux] patch for uClinux-dist-20040218
Next by thread: Re: [microblaze-uclinux] patch for uClinux-dist-20040218
Index(es):
- Date
- Thread