diff options
32 files changed, 318 insertions, 1681 deletions
diff --git a/jtools/Makefile b/jtools/Makefile index 7ddaf23eb..728d46dac 100644 --- a/jtools/Makefile +++ b/jtools/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk TARGETS:= ifneq ($(ADK_PACKAGE_OPENJDK),) # jikes is for ant -TARGETS+=fastjar gcj ecj jikes classpath jamvm ant openjdk +TARGETS+=fastjar gcj ecj jikes classpath jamvm ant openjdk qemu endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile index 07da1f1a0..537668a21 100644 --- a/jtools/ant/Makefile +++ b/jtools/ant/Makefile @@ -20,7 +20,6 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar cp $(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ - BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ JAVA_HOME=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm ; \ $(BASH) build.sh diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index c9e4559a7..af051f9b9 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -21,7 +21,6 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \ --main=org.eclipse.jdt.internal.compiler.batch.Main \ $(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/ecj.jar - #$(CP) $(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj @@ -33,9 +32,5 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ ${STAGING_JAVA_HOST_DIR}/usr/bin/gij chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/gij - rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java - rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java - cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java - cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java include $(TOPDIR)/mk/tools.mk diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile index defdbd713..a85b2d6c8 100644 --- a/jtools/jamvm/Makefile +++ b/jtools/jamvm/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} @@ -23,7 +23,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared CC='${CC_FOR_BUILD}' \ CXX='${CXX_FOR_BUILD}' \ ./configure \ - --prefix=/usr \ + --prefix=$(STAGING_JAVA_HOST_DIR)/usr \ --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr touch $@ @@ -32,8 +32,8 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured touch $@ ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java + ${MAKE} -C ${WRKBUILD} install $(MAKE_TRACE) + ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java + ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java include $(TOPDIR)/mk/tools.mk diff --git a/jtools/openjdk/files/sizes.32 b/jtools/openjdk/files/sizes.32 deleted file mode 100644 index 2277d4039..000000000 --- a/jtools/openjdk/files/sizes.32 +++ /dev/null @@ -1,790 +0,0 @@ -long 4 -int 4 -short 2 -ptr 4 -Bool 4 -Atom 4 -Window 4 -Screen.ext_data 0 -Screen.display 4 -Screen.root 8 -Screen.width 12 -Screen.height 16 -Screen.mwidth 20 -Screen.mheight 24 -Screen.ndepths 28 -Screen.depths 32 -Screen.root_depth 36 -Screen.root_visual 40 -Screen.default_gc 44 -Screen.cmap 48 -Screen.white_pixel 52 -Screen.black_pixel 56 -Screen.max_maps 60 -Screen.min_maps 64 -Screen.backing_store 68 -Screen.save_unders 72 -Screen.root_input_mask 76 -Screen 80 -XMapRequestEvent.type 0 -XMapRequestEvent.serial 4 -XMapRequestEvent.send_event 8 -XMapRequestEvent.display 12 -XMapRequestEvent.parent 16 -XMapRequestEvent.window 20 -XMapRequestEvent 24 -AwtScreenData.numConfigs 0 -AwtScreenData.root 4 -AwtScreenData.whitepixel 8 -AwtScreenData.blackpixel 12 -AwtScreenData.defaultConfig 16 -AwtScreenData.configs 20 -AwtScreenData 24 -XIMPreeditCaretCallbackStruct.position 0 -XIMPreeditCaretCallbackStruct.direction 4 -XIMPreeditCaretCallbackStruct.style 8 -XIMPreeditCaretCallbackStruct 12 -XTimeCoord.time 0 -XTimeCoord.x 4 -XTimeCoord.y 6 -XTimeCoord 8 -XWindowChanges.x 0 -XWindowChanges.y 4 -XWindowChanges.width 8 -XWindowChanges.height 12 -XWindowChanges.border_width 16 -XWindowChanges.sibling 20 -XWindowChanges.stack_mode 24 -XWindowChanges 28 -XSelectionClearEvent.type 0 -XSelectionClearEvent.serial 4 -XSelectionClearEvent.send_event 8 -XSelectionClearEvent.display 12 -XSelectionClearEvent.window 16 -XSelectionClearEvent.selection 20 -XSelectionClearEvent.time 24 -XSelectionClearEvent 28 -XKeyboardControl.key_click_percent 0 -XKeyboardControl.bell_percent 4 -XKeyboardControl.bell_pitch 8 -XKeyboardControl.bell_duration 12 -XKeyboardControl.led 16 -XKeyboardControl.led_mode 20 -XKeyboardControl.key 24 -XKeyboardControl.auto_repeat_mode 28 -XKeyboardControl 32 -XIMStatusDrawCallbackStruct.type 0 -XIMStatusDrawCallbackStruct.data 4 -XIMStatusDrawCallbackStruct 8 -XOMCharSetList.charset_count 0 -XOMCharSetList.charset_list 4 -XOMCharSetList 8 -XOMFontInfo.num_font 0 -XOMFontInfo.font_struct_list 4 -XOMFontInfo.font_name_list 8 -XOMFontInfo 12 -XIMStringConversionCallbackStruct.position 0 -XIMStringConversionCallbackStruct.direction 4 -XIMStringConversionCallbackStruct.operation 8 -XIMStringConversionCallbackStruct.factor 10 -XIMStringConversionCallbackStruct.text 12 -XIMStringConversionCallbackStruct 16 -XCirculateEvent.type 0 -XCirculateEvent.serial 4 -XCirculateEvent.send_event 8 -XCirculateEvent.display 12 -XCirculateEvent.event 16 -XCirculateEvent.window 20 -XCirculateEvent.place 24 -XCirculateEvent 28 -XIMHotKeyTrigger.keysym 0 -XIMHotKeyTrigger.modifier 4 -XIMHotKeyTrigger.modifier_mask 8 -XIMHotKeyTrigger 12 -XExtData.number 0 -XExtData.next 4 -XExtData.free_private 8 -XExtData.private_data 12 -XExtData 16 -XTextProperty.value 0 -XTextProperty.encoding 4 -XTextProperty.format 8 -XTextProperty.nitems 12 -XTextProperty 16 -XColor.pixel 0 -XColor.red 4 -XColor.green 6 -XColor.blue 8 -XColor.flags 10 -XColor.pad 11 -XColor 12 -XGraphicsExposeEvent.type 0 -XGraphicsExposeEvent.serial 4 -XGraphicsExposeEvent.send_event 8 -XGraphicsExposeEvent.display 12 -XGraphicsExposeEvent.drawable 16 -XGraphicsExposeEvent.x 20 -XGraphicsExposeEvent.y 24 -XGraphicsExposeEvent.width 28 -XGraphicsExposeEvent.height 32 -XGraphicsExposeEvent.count 36 -XGraphicsExposeEvent.major_code 40 -XGraphicsExposeEvent.minor_code 44 -XGraphicsExposeEvent 48 -XStandardColormap.colormap 0 -XStandardColormap.red_max 4 -XStandardColormap.red_mult 8 -XStandardColormap.green_max 12 -XStandardColormap.green_mult 16 -XStandardColormap.blue_max 20 -XStandardColormap.blue_mult 24 -XStandardColormap.base_pixel 28 -XStandardColormap.visualid 32 -XStandardColormap.killid 36 -XStandardColormap 40 -XPropertyEvent.type 0 -XPropertyEvent.serial 4 -XPropertyEvent.send_event 8 -XPropertyEvent.display 12 -XPropertyEvent.window 16 -XPropertyEvent.atom 20 -XPropertyEvent.time 24 -XPropertyEvent.state 28 -XPropertyEvent 32 -ColorEntry.r 0 -ColorEntry.g 1 -ColorEntry.b 2 -ColorEntry.flags 3 -ColorEntry 4 -XResizeRequestEvent.type 0 -XResizeRequestEvent.serial 4 -XResizeRequestEvent.send_event 8 -XResizeRequestEvent.display 12 -XResizeRequestEvent.window 16 -XResizeRequestEvent.width 20 -XResizeRequestEvent.height 24 -XResizeRequestEvent 28 -XFontStruct.ext_data 0 -XFontStruct.fid 4 -XFontStruct.direction 8 -XFontStruct.min_char_or_byte2 12 -XFontStruct.max_char_or_byte2 16 -XFontStruct.min_byte1 20 -XFontStruct.max_byte1 24 -XFontStruct.all_chars_exist 28 -XFontStruct.n_properties 36 -XFontStruct.properties 40 -XFontStruct.min_bounds 44 -XFontStruct.max_bounds 56 -XFontStruct.per_char 68 -XFontStruct.ascent 72 -XFontStruct.descent 76 -XFontStruct 80 -XNoExposeEvent.type 0 -XNoExposeEvent.serial 4 -XNoExposeEvent.send_event 8 -XNoExposeEvent.display 12 -XNoExposeEvent.drawable 16 -XNoExposeEvent.major_code 20 -XNoExposeEvent.minor_code 24 -XNoExposeEvent 28 -XErrorEvent.type 0 -XErrorEvent.display 4 -XErrorEvent.resourceid 8 -XErrorEvent.serial 12 -XErrorEvent.error_code 16 -XErrorEvent.request_code 17 -XErrorEvent.minor_code 18 -XErrorEvent 20 -XArc.x 0 -XArc.y 2 -XArc.width 4 -XArc.height 6 -XArc.angle1 8 -XArc.angle2 10 -XArc 12 -XSelectionEvent.type 0 -XSelectionEvent.serial 4 -XSelectionEvent.send_event 8 -XSelectionEvent.display 12 -XSelectionEvent.requestor 16 -XSelectionEvent.selection 20 -XSelectionEvent.target 24 -XSelectionEvent.property 28 -XSelectionEvent.time 32 -XSelectionEvent 36 -XVisibilityEvent.type 0 -XVisibilityEvent.serial 4 -XVisibilityEvent.send_event 8 -XVisibilityEvent.display 12 -XVisibilityEvent.window 16 -XVisibilityEvent.state 20 -XVisibilityEvent 24 -XFontProp.name 0 -XFontProp.card32 4 -XFontProp 8 -XTextItem16.chars 0 -XTextItem16.nchars 4 -XTextItem16.delta 8 -XTextItem16.font 12 -XTextItem16 16 -XIMPreeditDrawCallbackStruct.caret 0 -XIMPreeditDrawCallbackStruct.chg_first 4 -XIMPreeditDrawCallbackStruct.chg_length 8 -XIMPreeditDrawCallbackStruct.text 12 -XIMPreeditDrawCallbackStruct 16 -XRectangle.x 0 -XRectangle.y 2 -XRectangle.width 4 -XRectangle.height 6 -XRectangle 8 -PropMwmHints.flags 0 -PropMwmHints.functions 4 -PropMwmHints.decorations 8 -PropMwmHints.inputMode 12 -PropMwmHints.status 16 -PropMwmHints 20 -XConfigureEvent.type 0 -XConfigureEvent.serial 4 -XConfigureEvent.send_event 8 -XConfigureEvent.display 12 -XConfigureEvent.event 16 -XConfigureEvent.window 20 -XConfigureEvent.x 24 -XConfigureEvent.y 28 -XConfigureEvent.width 32 -XConfigureEvent.height 36 -XConfigureEvent.border_width 40 -XConfigureEvent.above 44 -XConfigureEvent.override_redirect 48 -XConfigureEvent 52 -XClientMessageEvent.type 0 -XClientMessageEvent.serial 4 -XClientMessageEvent.send_event 8 -XClientMessageEvent.display 12 -XClientMessageEvent.window 16 -XClientMessageEvent.message_type 20 -XClientMessageEvent.format 24 -XClientMessageEvent.data 28 -XClientMessageEvent 48 -XIconSize.min_width 0 -XIconSize.min_height 4 -XIconSize.max_width 8 -XIconSize.max_height 12 -XIconSize.width_inc 16 -XIconSize.height_inc 20 -XIconSize 24 -XSegment.x1 0 -XSegment.y1 2 -XSegment.x2 4 -XSegment.y2 6 -XSegment 8 -XPoint.x 0 -XPoint.y 2 -XPoint 4 -XIMStringConversionText.length 0 -XIMStringConversionText.feedback 4 -XIMStringConversionText.encoding_is_wchar 8 -XIMStringConversionText.string 12 -XIMStringConversionText 16 -XPixmapFormatValues.depth 0 -XPixmapFormatValues.bits_per_pixel 4 -XPixmapFormatValues.scanline_pad 8 -XPixmapFormatValues 12 -XExposeEvent.type 0 -XExposeEvent.serial 4 -XExposeEvent.send_event 8 -XExposeEvent.display 12 -XExposeEvent.window 16 -XExposeEvent.x 20 -XExposeEvent.y 24 -XExposeEvent.width 28 -XExposeEvent.height 32 -XExposeEvent.count 36 -XExposeEvent 40 -XIMStyles.count_styles 0 -XIMStyles.supported_styles 4 -XIMStyles 8 -XSizeHints.flags 0 -XSizeHints.x 4 -XSizeHints.y 8 -XSizeHints.width 12 -XSizeHints.height 16 -XSizeHints.min_width 20 -XSizeHints.min_height 24 -XSizeHints.max_width 28 -XSizeHints.max_height 32 -XSizeHints.width_inc 36 -XSizeHints.height_inc 40 -XSizeHints.min_aspect.x 44 -XSizeHints.min_aspect.y 48 -XSizeHints.max_aspect.x 52 -XSizeHints.max_aspect.y 56 -XSizeHints.base_width 60 -XSizeHints.base_height 64 -XSizeHints.win_gravity 68 -XSizeHints 72 -XMappingEvent.type 0 -XMappingEvent.serial 4 -XMappingEvent.send_event 8 -XMappingEvent.display 12 -XMappingEvent.window 16 -XMappingEvent.request 20 -XMappingEvent.first_keycode 24 -XMappingEvent.count 28 -XMappingEvent 32 -XClassHint.res_name 0 -XClassHint.res_class 4 -XClassHint 8 -XmbTextItem.chars 0 -XmbTextItem.nchars 4 -XmbTextItem.delta 8 -XmbTextItem.font_set 12 -XmbTextItem 16 -XWindowAttributes.x 0 -XWindowAttributes.y 4 -XWindowAttributes.width 8 -XWindowAttributes.height 12 -XWindowAttributes.border_width 16 -XWindowAttributes.depth 20 -XWindowAttributes.visual 24 -XWindowAttributes.root 28 -XWindowAttributes.class 32 -XWindowAttributes.bit_gravity 36 -XWindowAttributes.win_gravity 40 -XWindowAttributes.backing_store 44 -XWindowAttributes.backing_planes 48 -XWindowAttributes.backing_pixel 52 -XWindowAttributes.save_under 56 -XWindowAttributes.colormap 60 -XWindowAttributes.map_installed 64 -XWindowAttributes.map_state 68 -XWindowAttributes.all_event_masks 72 -XWindowAttributes.your_event_mask 76 -XWindowAttributes.do_not_propagate_mask 80 -XWindowAttributes.override_redirect 84 -XWindowAttributes.screen 88 -XWindowAttributes 92 -XSetWindowAttributes.background_pixmap 0 -XSetWindowAttributes.background_pixel 4 -XSetWindowAttributes.border_pixmap 8 -XSetWindowAttributes.border_pixel 12 -XSetWindowAttributes.bit_gravity 16 -XSetWindowAttributes.win_gravity 20 -XSetWindowAttributes.backing_store 24 -XSetWindowAttributes.backing_planes 28 -XSetWindowAttributes.backing_pixel 32 -XSetWindowAttributes.save_under 36 -XSetWindowAttributes.event_mask 40 -XSetWindowAttributes.do_not_propagate_mask 44 -XSetWindowAttributes.override_redirect 48 -XSetWindowAttributes.colormap 52 -XSetWindowAttributes.cursor 56 -XSetWindowAttributes 60 -XOMOrientation.num_orientation 0 -XOMOrientation.orientation 4 -XOMOrientation 8 -Visual.ext_data 0 -Visual.visualid 4 -Visual.class 8 -Visual.red_mask 12 -Visual.green_mask 16 -Visual.blue_mask 20 -Visual.bits_per_rgb 24 -Visual.map_entries 28 -Visual 32 -XGravityEvent.type 0 -XGravityEvent.serial 4 -XGravityEvent.send_event 8 -XGravityEvent.display 12 -XGravityEvent.event 16 -XGravityEvent.window 20 -XGravityEvent.x 24 -XGravityEvent.y 28 -XGravityEvent 32 -XReparentEvent.type 0 -XReparentEvent.serial 4 -XReparentEvent.send_event 8 -XReparentEvent.display 12 -XReparentEvent.event 16 -XReparentEvent.window 20 -XReparentEvent.parent 24 -XReparentEvent.x 28 -XReparentEvent.y 32 -XReparentEvent.override_redirect 36 -XReparentEvent 40 -XCirculateRequestEvent.type 0 -XCirculateRequestEvent.serial 4 -XCirculateRequestEvent.send_event 8 -XCirculateRequestEvent.display 12 -XCirculateRequestEvent.parent 16 -XCirculateRequestEvent.window 20 -XCirculateRequestEvent.place 24 -XCirculateRequestEvent 28 -XKeyEvent.type 0 -XKeyEvent.serial 4 -XKeyEvent.send_event 8 -XKeyEvent.display 12 -XKeyEvent.window 16 -XKeyEvent.root 20 -XKeyEvent.subwindow 24 -XKeyEvent.time 28 -XKeyEvent.x 32 -XKeyEvent.y 36 -XKeyEvent.x_root 40 -XKeyEvent.y_root 44 -XKeyEvent.state 48 -XKeyEvent.keycode 52 -XKeyEvent.same_screen 56 -XKeyEvent 60 -XCharStruct.lbearing 0 -XCharStruct.rbearing 2 -XCharStruct.width 4 -XCharStruct.ascent 6 -XCharStruct.descent 8 -XCharStruct.attributes 10 -XCharStruct 12 -XModifierKeymap.max_keypermod 0 -XModifierKeymap.modifiermap 4 -XModifierKeymap 8 -XTextItem.chars 0 -XTextItem.nchars 4 -XTextItem.delta 8 -XTextItem.font 12 -XTextItem 16 -XdbeSwapInfo.swap_window 0 -XdbeSwapInfo.swap_action 4 -XdbeSwapInfo 8 -XImage.width 0 -XImage.height 4 -XImage.xoffset 8 -XImage.format 12 -XImage.data 16 -XImage.byte_order 20 -XImage.bitmap_unit 24 -XImage.bitmap_bit_order 28 -XImage.bitmap_pad 32 -XImage.depth 36 -XImage.bytes_per_line 40 -XImage.bits_per_pixel 44 -XImage.red_mask 48 -XImage.green_mask 52 -XImage.blue_mask 56 -XImage.obdata 60 -XImage.f.create_image 64 -XImage.f.destroy_image 68 -XImage.f.get_pixel 72 -XImage.f.put_pixel 76 -XImage.f.sub_image 80 -XImage.f.add_pixel 84 -XImage 88 -XChar2b.byte1 0 -XChar2b.byte2 1 -XChar2b 2 -XwcTextItem.chars 0 -XwcTextItem.nchars 4 -XwcTextItem.delta 8 -XwcTextItem.font_set 12 -XwcTextItem 16 -XUnmapEvent.type 0 -XUnmapEvent.serial 4 -XUnmapEvent.send_event 8 -XUnmapEvent.display 12 -XUnmapEvent.event 16 -XUnmapEvent.window 20 -XUnmapEvent.from_configure 24 -XUnmapEvent 28 -awtImageData.Depth 0 -awtImageData.wsImageFormat 4 -awtImageData.clrdata 16 -awtImageData.convert 48 -awtImageData 304 -XGCValues.function 0 -XGCValues.plane_mask 4 -XGCValues.foreground 8 -XGCValues.background 12 -XGCValues.line_width 16 -XGCValues.line_style 20 -XGCValues.cap_style 24 -XGCValues.join_style 28 -XGCValues.fill_style 32 -XGCValues.fill_rule 36 -XGCValues.arc_mode 40 -XGCValues.tile 44 -XGCValues.stipple 48 -XGCValues.ts_x_origin 52 -XGCValues.ts_y_origin 56 -XGCValues.font 60 -XGCValues.subwindow_mode 64 -XGCValues.graphics_exposures 68 -XGCValues.clip_x_origin 72 -XGCValues.clip_y_origin 76 -XGCValues.clip_mask 80 -XGCValues.dash_offset 84 -XGCValues.dashes 88 -XGCValues 92 -XFocusChangeEvent.type 0 -XFocusChangeEvent.serial 4 -XFocusChangeEvent.send_event 8 -XFocusChangeEvent.display 12 -XFocusChangeEvent.window 16 -XFocusChangeEvent.mode 20 -XFocusChangeEvent.detail 24 -XFocusChangeEvent 28 -XMapEvent.type 0 -XMapEvent.serial 4 -XMapEvent.send_event 8 -XMapEvent.display 12 -XMapEvent.event 16 -XMapEvent.window 20 -XMapEvent.override_redirect 24 -XMapEvent 28 -XIMHotKeyTriggers.num_hot_key 0 -XIMHotKeyTriggers.key 4 -XIMHotKeyTriggers 8 -XKeyboardState.key_click_percent 0 -XKeyboardState.bell_percent 4 -XKeyboardState.bell_pitch 8 -XKeyboardState.bell_duration 12 -XKeyboardState.led_mask 16 -XKeyboardState.global_auto_repeat 20 -XKeyboardState.auto_repeats 24 -XKeyboardState 56 -XMotionEvent.type 0 -XMotionEvent.serial 4 -XMotionEvent.send_event 8 -XMotionEvent.display 12 -XMotionEvent.window 16 -XMotionEvent.root 20 -XMotionEvent.subwindow 24 -XMotionEvent.time 28 -XMotionEvent.x 32 -XMotionEvent.y 36 -XMotionEvent.x_root 40 -XMotionEvent.y_root 44 -XMotionEvent.state 48 -XMotionEvent.is_hint 52 -XMotionEvent.same_screen 56 -XMotionEvent 60 -XIMPreeditStateNotifyCallbackStruct.state 0 -XIMPreeditStateNotifyCallbackStruct 4 -XAnyEvent.type 0 -XAnyEvent.serial 4 -XAnyEvent.send_event 8 -XAnyEvent.display 12 -XAnyEvent.window 16 -XAnyEvent 20 -XIMCallback.client_data 0 -XIMCallback.callback 4 -XIMCallback 8 -XVisualInfo.visual 0 -XVisualInfo.visualid 4 -XVisualInfo.screen 8 -XVisualInfo.depth 12 -XVisualInfo.class 16 -XVisualInfo.red_mask 20 -XVisualInfo.green_mask 24 -XVisualInfo.blue_mask 28 -XVisualInfo.colormap_size 32 -XVisualInfo.bits_per_rgb 36 -XVisualInfo 40 -XCreateWindowEvent.type 0 -XCreateWindowEvent.serial 4 -XCreateWindowEvent.send_event 8 -XCreateWindowEvent.display 12 -XCreateWindowEvent.parent 16 -XCreateWindowEvent.window 20 -XCreateWindowEvent.x 24 -XCreateWindowEvent.y 28 -XCreateWindowEvent.width 32 -XCreateWindowEvent.height 36 -XCreateWindowEvent.border_width 40 -XCreateWindowEvent.override_redirect 44 -XCreateWindowEvent 48 -XIMValuesList.count_values 0 -XIMValuesList.supported_values 4 -XIMValuesList 8 -XKeymapEvent.type 0 -XKeymapEvent.serial 4 -XKeymapEvent.send_event 8 -XKeymapEvent.display 12 -XKeymapEvent.window 16 -XKeymapEvent.key_vector 20 -XKeymapEvent 52 -XButtonEvent.type 0 -XButtonEvent.serial 4 -XButtonEvent.send_event 8 -XButtonEvent.display 12 -XButtonEvent.window 16 -XButtonEvent.root 20 -XButtonEvent.subwindow 24 -XButtonEvent.time 28 -XButtonEvent.x 32 -XButtonEvent.y 36 -XButtonEvent.x_root 40 -XButtonEvent.y_root 44 -XButtonEvent.state 48 -XButtonEvent.button 52 -XButtonEvent.same_screen 56 -XButtonEvent 60 -XWMHints.flags 0 -XWMHints.initial_state 8 -XWMHints.icon_pixmap 12 -XWMHints.icon_window 16 -XWMHints.icon_x 20 -XWMHints.icon_y 24 -XWMHints.icon_mask 28 -XWMHints.input 4 -XWMHints.window_group 32 -XWMHints 36 -ScreenFormat.ext_data 0 -ScreenFormat.depth 4 -ScreenFormat.bits_per_pixel 8 -ScreenFormat.scanline_pad 12 -ScreenFormat 16 -XCrossingEvent.type 0 -XCrossingEvent.serial 4 -XCrossingEvent.send_event 8 -XCrossingEvent.display 12 -XCrossingEvent.window 16 -XCrossingEvent.root 20 -XCrossingEvent.subwindow 24 -XCrossingEvent.time 28 -XCrossingEvent.x 32 -XCrossingEvent.y 36 -XCrossingEvent.x_root 40 -XCrossingEvent.y_root 44 -XCrossingEvent.mode 48 -XCrossingEvent.detail 52 -XCrossingEvent.same_screen 56 -XCrossingEvent.focus 60 -XCrossingEvent.state 64 -XCrossingEvent 68 -XConfigureRequestEvent.type 0 -XConfigureRequestEvent.serial 4 -XConfigureRequestEvent.send_event 8 -XConfigureRequestEvent.display 12 -XConfigureRequestEvent.parent 16 -XConfigureRequestEvent.window 20 -XConfigureRequestEvent.x 24 -XConfigureRequestEvent.y 28 -XConfigureRequestEvent.width 32 -XConfigureRequestEvent.height 36 -XConfigureRequestEvent.border_width 40 -XConfigureRequestEvent.above 44 -XConfigureRequestEvent.detail 48 -XConfigureRequestEvent.value_mask 52 -XConfigureRequestEvent 56 -XSelectionRequestEvent.type 0 -XSelectionRequestEvent.serial 4 -XSelectionRequestEvent.send_event 8 -XSelectionRequestEvent.display 12 -XSelectionRequestEvent.owner 16 -XSelectionRequestEvent.requestor 20 -XSelectionRequestEvent.selection 24 -XSelectionRequestEvent.target 28 -XSelectionRequestEvent.property 32 -XSelectionRequestEvent.time 36 -XSelectionRequestEvent 40 -XFontSetExtents.max_ink_extent 0 -XFontSetExtents.max_logical_extent 8 -XFontSetExtents 16 -XExtCodes.extension 0 -XExtCodes.major_opcode 4 -XExtCodes.first_event 8 -XExtCodes.first_error 12 -XExtCodes 16 -XHostAddress.family 0 -XHostAddress.length 4 -XHostAddress.address 8 -XHostAddress 12 -ColorData.awt_Colors 0 -ColorData.awt_numICMcolors 4 -ColorData.awt_icmLUT 8 -ColorData.awt_icmLUT2Colors 12 -ColorData.img_grays 16 -ColorData.img_clr_tbl 20 -ColorData.img_oda_red 24 -ColorData.img_oda_green 28 -ColorData.img_oda_blue 32 -ColorData.pGrayInverseLutData 36 -ColorData.screendata 40 -ColorData 44 -XColormapEvent.type 0 -XColormapEvent.serial 4 -XColormapEvent.send_event 8 -XColormapEvent.display 12 -XColormapEvent.window 16 -XColormapEvent.colormap 20 -XColormapEvent.new 24 -XColormapEvent.state 28 -XColormapEvent 32 -Depth.depth 0 -Depth.nvisuals 4 -Depth.visuals 8 -Depth 12 -XEvent.type 0 -XEvent.xany 0 -XEvent.xkey 0 -XEvent.xbutton 0 -XEvent.xmotion 0 -XEvent.xcrossing 0 -XEvent.xfocus 0 -XEvent.xexpose 0 -XEvent.xgraphicsexpose 0 -XEvent.xnoexpose 0 -XEvent.xvisibility 0 -XEvent.xcreatewindow 0 -XEvent.xdestroywindow 0 -XEvent.xunmap 0 -XEvent.xmap 0 -XEvent.xmaprequest 0 -XEvent.xreparent 0 -XEvent.xconfigure 0 -XEvent.xgravity 0 -XEvent.xresizerequest 0 -XEvent.xconfigurerequest 0 -XEvent.xcirculate 0 -XEvent.xcirculaterequest 0 -XEvent.xproperty 0 -XEvent.xselectionclear 0 -XEvent.xselectionrequest 0 -XEvent.xselection 0 -XEvent.xcolormap 0 -XEvent.xclient 0 -XEvent.xmapping 0 -XEvent.xerror 0 -XEvent.xkeymap 0 -XEvent.pad 0 -XEvent 96 -XDestroyWindowEvent.type 0 -XDestroyWindowEvent.serial 4 -XDestroyWindowEvent.send_event 8 -XDestroyWindowEvent.display 12 -XDestroyWindowEvent.event 16 -XDestroyWindowEvent.window 20 -XDestroyWindowEvent 24 -XComposeStatus.compose_ptr 0 -XComposeStatus.chars_matched 4 -XComposeStatus 8 -AwtGraphicsConfigData.awt_depth 0 -AwtGraphicsConfigData.awt_cmap 4 -AwtGraphicsConfigData.awt_visInfo 8 -AwtGraphicsConfigData.awt_num_colors 48 -AwtGraphicsConfigData.awtImage 52 -AwtGraphicsConfigData.AwtColorMatch 56 -AwtGraphicsConfigData.monoImage 60 -AwtGraphicsConfigData.monoPixmap 64 -AwtGraphicsConfigData.monoPixmapWidth 68 -AwtGraphicsConfigData.monoPixmapHeight 72 -AwtGraphicsConfigData.monoPixmapGC 76 -AwtGraphicsConfigData.pixelStride 80 -AwtGraphicsConfigData.color_data 84 -AwtGraphicsConfigData.glxInfo 88 -AwtGraphicsConfigData.isTranslucencySupported 92 -AwtGraphicsConfigData 96 -XIMText.length 0 -XIMText.feedback 4 -XIMText.encoding_is_wchar 8 -XIMText.string 12 -XIMText 16 diff --git a/jtools/openjdk/files/sizes.64 b/jtools/openjdk/files/sizes.64 deleted file mode 100644 index 9661f857f..000000000 --- a/jtools/openjdk/files/sizes.64 +++ /dev/null @@ -1,790 +0,0 @@ -long 8 -int 4 -short 2 -ptr 8 -Bool 4 -Atom 8 -Window 8 -Screen.ext_data 0 -Screen.display 8 -Screen.root 16 -Screen.width 24 -Screen.height 28 -Screen.mwidth 32 -Screen.mheight 36 -Screen.ndepths 40 -Screen.depths 48 -Screen.root_depth 56 -Screen.root_visual 64 -Screen.default_gc 72 -Screen.cmap 80 -Screen.white_pixel 88 -Screen.black_pixel 96 -Screen.max_maps 104 -Screen.min_maps 108 -Screen.backing_store 112 -Screen.save_unders 116 -Screen.root_input_mask 120 -Screen 128 -XMapRequestEvent.type 0 -XMapRequestEvent.serial 8 -XMapRequestEvent.send_event 16 -XMapRequestEvent.display 24 -XMapRequestEvent.parent 32 -XMapRequestEvent.window 40 -XMapRequestEvent 48 -AwtScreenData.numConfigs 0 -AwtScreenData.root 8 -AwtScreenData.whitepixel 16 -AwtScreenData.blackpixel 24 -AwtScreenData.defaultConfig 32 -AwtScreenData.configs 40 -AwtScreenData 48 -XIMPreeditCaretCallbackStruct.position 0 -XIMPreeditCaretCallbackStruct.direction 4 -XIMPreeditCaretCallbackStruct.style 8 -XIMPreeditCaretCallbackStruct 12 -XTimeCoord.time 0 -XTimeCoord.x 8 -XTimeCoord.y 10 -XTimeCoord 16 -XWindowChanges.x 0 -XWindowChanges.y 4 -XWindowChanges.width 8 -XWindowChanges.height 12 -XWindowChanges.border_width 16 -XWindowChanges.sibling 24 -XWindowChanges.stack_mode 32 -XWindowChanges 40 -XSelectionClearEvent.type 0 -XSelectionClearEvent.serial 8 -XSelectionClearEvent.send_event 16 -XSelectionClearEvent.display 24 -XSelectionClearEvent.window 32 -XSelectionClearEvent.selection 40 -XSelectionClearEvent.time 48 -XSelectionClearEvent 56 -XKeyboardControl.key_click_percent 0 -XKeyboardControl.bell_percent 4 -XKeyboardControl.bell_pitch 8 -XKeyboardControl.bell_duration 12 -XKeyboardControl.led 16 -XKeyboardControl.led_mode 20 -XKeyboardControl.key 24 -XKeyboardControl.auto_repeat_mode 28 -XKeyboardControl 32 -XIMStatusDrawCallbackStruct.type 0 -XIMStatusDrawCallbackStruct.data 8 -XIMStatusDrawCallbackStruct 16 -XOMCharSetList.charset_count 0 -XOMCharSetList.charset_list 8 -XOMCharSetList 16 -XOMFontInfo.num_font 0 -XOMFontInfo.font_struct_list 8 -XOMFontInfo.font_name_list 16 -XOMFontInfo 24 -XIMStringConversionCallbackStruct.position 0 -XIMStringConversionCallbackStruct.direction 4 -XIMStringConversionCallbackStruct.operation 8 -XIMStringConversionCallbackStruct.factor 10 -XIMStringConversionCallbackStruct.text 16 -XIMStringConversionCallbackStruct 24 -XCirculateEvent.type 0 -XCirculateEvent.serial 8 -XCirculateEvent.send_event 16 -XCirculateEvent.display 24 -XCirculateEvent.event 32 -XCirculateEvent.window 40 -XCirculateEvent.place 48 -XCirculateEvent 56 -XIMHotKeyTrigger.keysym 0 -XIMHotKeyTrigger.modifier 8 -XIMHotKeyTrigger.modifier_mask 12 -XIMHotKeyTrigger 16 -XExtData.number 0 -XExtData.next 8 -XExtData.free_private 16 -XExtData.private_data 24 -XExtData 32 -XTextProperty.value 0 -XTextProperty.encoding 8 -XTextProperty.format 16 -XTextProperty.nitems 24 -XTextProperty 32 -XColor.pixel 0 -XColor.red 8 -XColor.green 10 -XColor.blue 12 -XColor.flags 14 -XColor.pad 15 -XColor 16 -XGraphicsExposeEvent.type 0 -XGraphicsExposeEvent.serial 8 -XGraphicsExposeEvent.send_event 16 -XGraphicsExposeEvent.display 24 -XGraphicsExposeEvent.drawable 32 -XGraphicsExposeEvent.x 40 -XGraphicsExposeEvent.y 44 -XGraphicsExposeEvent.width 48 -XGraphicsExposeEvent.height 52 -XGraphicsExposeEvent.count 56 -XGraphicsExposeEvent.major_code 60 -XGraphicsExposeEvent.minor_code 64 -XGraphicsExposeEvent 72 -XStandardColormap.colormap 0 -XStandardColormap.red_max 8 -XStandardColormap.red_mult 16 -XStandardColormap.green_max 24 -XStandardColormap.green_mult 32 -XStandardColormap.blue_max 40 -XStandardColormap.blue_mult 48 -XStandardColormap.base_pixel 56 -XStandardColormap.visualid 64 -XStandardColormap.killid 72 -XStandardColormap 80 -XPropertyEvent.type 0 -XPropertyEvent.serial 8 -XPropertyEvent.send_event 16 -XPropertyEvent.display 24 -XPropertyEvent.window 32 -XPropertyEvent.atom 40 -XPropertyEvent.time 48 -XPropertyEvent.state 56 -XPropertyEvent 64 -ColorEntry.r 0 -ColorEntry.g 1 -ColorEntry.b 2 -ColorEntry.flags 3 -ColorEntry 4 -XResizeRequestEvent.type 0 -XResizeRequestEvent.serial 8 -XResizeRequestEvent.send_event 16 -XResizeRequestEvent.display 24 -XResizeRequestEvent.window 32 -XResizeRequestEvent.width 40 -XResizeRequestEvent.height 44 -XResizeRequestEvent 48 -XFontStruct.ext_data 0 -XFontStruct.fid 8 -XFontStruct.direction 16 -XFontStruct.min_char_or_byte2 20 -XFontStruct.max_char_or_byte2 24 -XFontStruct.min_byte1 28 -XFontStruct.max_byte1 32 -XFontStruct.all_chars_exist 36 -XFontStruct.n_properties 44 -XFontStruct.properties 48 -XFontStruct.min_bounds 56 -XFontStruct.max_bounds 68 -XFontStruct.per_char 80 -XFontStruct.ascent 88 -XFontStruct.descent 92 -XFontStruct 96 -XNoExposeEvent.type 0 -XNoExposeEvent.serial 8 -XNoExposeEvent.send_event 16 -XNoExposeEvent.display 24 -XNoExposeEvent.drawable 32 -XNoExposeEvent.major_code 40 -XNoExposeEvent.minor_code 44 -XNoExposeEvent 48 -XErrorEvent.type 0 -XErrorEvent.display 8 -XErrorEvent.resourceid 16 -XErrorEvent.serial 24 -XErrorEvent.error_code 32 -XErrorEvent.request_code 33 -XErrorEvent.minor_code 34 -XErrorEvent 40 -XArc.x 0 -XArc.y 2 -XArc.width 4 -XArc.height 6 -XArc.angle1 8 -XArc.angle2 10 -XArc 12 -XSelectionEvent.type 0 -XSelectionEvent.serial 8 -XSelectionEvent.send_event 16 -XSelectionEvent.display 24 -XSelectionEvent.requestor 32 -XSelectionEvent.selection 40 -XSelectionEvent.target 48 -XSelectionEvent.property 56 -XSelectionEvent.time 64 -XSelectionEvent 72 -XVisibilityEvent.type 0 -XVisibilityEvent.serial 8 -XVisibilityEvent.send_event 16 -XVisibilityEvent.display 24 -XVisibilityEvent.window 32 -XVisibilityEvent.state 40 -XVisibilityEvent 48 -XFontProp.name 0 -XFontProp.card32 8 -XFontProp 16 -XTextItem16.chars 0 -XTextItem16.nchars 8 -XTextItem16.delta 12 -XTextItem16.font 16 -XTextItem16 24 -XIMPreeditDrawCallbackStruct.caret 0 -XIMPreeditDrawCallbackStruct.chg_first 4 -XIMPreeditDrawCallbackStruct.chg_length 8 -XIMPreeditDrawCallbackStruct.text 16 -XIMPreeditDrawCallbackStruct 24 -XRectangle.x 0 -XRectangle.y 2 -XRectangle.width 4 -XRectangle.height 6 -XRectangle 8 -PropMwmHints.flags 0 -PropMwmHints.functions 8 -PropMwmHints.decorations 16 -PropMwmHints.inputMode 24 -PropMwmHints.status 32 -PropMwmHints 40 -XConfigureEvent.type 0 -XConfigureEvent.serial 8 -XConfigureEvent.send_event 16 -XConfigureEvent.display 24 -XConfigureEvent.event 32 -XConfigureEvent.window 40 -XConfigureEvent.x 48 -XConfigureEvent.y 52 -XConfigureEvent.width 56 -XConfigureEvent.height 60 -XConfigureEvent.border_width 64 -XConfigureEvent.above 72 -XConfigureEvent.override_redirect 80 -XConfigureEvent 88 -XClientMessageEvent.type 0 -XClientMessageEvent.serial 8 -XClientMessageEvent.send_event 16 -XClientMessageEvent.display 24 -XClientMessageEvent.window 32 -XClientMessageEvent.message_type 40 -XClientMessageEvent.format 48 -XClientMessageEvent.data 56 -XClientMessageEvent 96 -XIconSize.min_width 0 -XIconSize.min_height 4 -XIconSize.max_width 8 -XIconSize.max_height 12 -XIconSize.width_inc 16 -XIconSize.height_inc 20 -XIconSize 24 -XSegment.x1 0 -XSegment.y1 2 -XSegment.x2 4 -XSegment.y2 6 -XSegment 8 -XPoint.x 0 -XPoint.y 2 -XPoint 4 -XIMStringConversionText.length 0 -XIMStringConversionText.feedback 8 -XIMStringConversionText.encoding_is_wchar 16 -XIMStringConversionText.string 24 -XIMStringConversionText 32 -XPixmapFormatValues.depth 0 -XPixmapFormatValues.bits_per_pixel 4 -XPixmapFormatValues.scanline_pad 8 -XPixmapFormatValues 12 -XExposeEvent.type 0 -XExposeEvent.serial 8 -XExposeEvent.send_event 16 -XExposeEvent.display 24 -XExposeEvent.window 32 -XExposeEvent.x 40 -XExposeEvent.y 44 -XExposeEvent.width 48 -XExposeEvent.height 52 -XExposeEvent.count 56 -XExposeEvent 64 -XIMStyles.count_styles 0 -XIMStyles.supported_styles 8 -XIMStyles 16 -XSizeHints.flags 0 -XSizeHints.x 8 -XSizeHints.y 12 -XSizeHints.width 16 -XSizeHints.height 20 -XSizeHints.min_width 24 -XSizeHints.min_height 28 -XSizeHints.max_width 32 -XSizeHints.max_height 36 -XSizeHints.width_inc 40 -XSizeHints.height_inc 44 -XSizeHints.min_aspect.x 48 -XSizeHints.min_aspect.y 52 -XSizeHints.max_aspect.x 56 -XSizeHints.max_aspect.y 60 -XSizeHints.base_width 64 -XSizeHints.base_height 68 -XSizeHints.win_gravity 72 -XSizeHints 80 -XMappingEvent.type 0 -XMappingEvent.serial 8 -XMappingEvent.send_event 16 -XMappingEvent.display 24 -XMappingEvent.window 32 -XMappingEvent.request 40 -XMappingEvent.first_keycode 44 -XMappingEvent.count 48 -XMappingEvent 56 -XClassHint.res_name 0 -XClassHint.res_class 8 -XClassHint 16 -XmbTextItem.chars 0 -XmbTextItem.nchars 8 -XmbTextItem.delta 12 -XmbTextItem.font_set 16 -XmbTextItem 24 -XWindowAttributes.x 0 -XWindowAttributes.y 4 -XWindowAttributes.width 8 -XWindowAttributes.height 12 -XWindowAttributes.border_width 16 -XWindowAttributes.depth 20 -XWindowAttributes.visual 24 -XWindowAttributes.root 32 -XWindowAttributes.class 40 -XWindowAttributes.bit_gravity 44 -XWindowAttributes.win_gravity 48 -XWindowAttributes.backing_store 52 -XWindowAttributes.backing_planes 56 -XWindowAttributes.backing_pixel 64 -XWindowAttributes.save_under 72 -XWindowAttributes.colormap 80 -XWindowAttributes.map_installed 88 -XWindowAttributes.map_state 92 -XWindowAttributes.all_event_masks 96 -XWindowAttributes.your_event_mask 104 -XWindowAttributes.do_not_propagate_mask 112 -XWindowAttributes.override_redirect 120 -XWindowAttributes.screen 128 -XWindowAttributes 136 -XSetWindowAttributes.background_pixmap 0 -XSetWindowAttributes.background_pixel 8 -XSetWindowAttributes.border_pixmap 16 -XSetWindowAttributes.border_pixel 24 -XSetWindowAttributes.bit_gravity 32 -XSetWindowAttributes.win_gravity 36 -XSetWindowAttributes.backing_store 40 -XSetWindowAttributes.backing_planes 48 -XSetWindowAttributes.backing_pixel 56 -XSetWindowAttributes.save_under 64 -XSetWindowAttributes.event_mask 72 -XSetWindowAttributes.do_not_propagate_mask 80 -XSetWindowAttributes.override_redirect 88 -XSetWindowAttributes.colormap 96 -XSetWindowAttributes.cursor 104 -XSetWindowAttributes 112 -XOMOrientation.num_orientation 0 -XOMOrientation.orientation 8 -XOMOrientation 16 -Visual.ext_data 0 -Visual.visualid 8 -Visual.class 16 -Visual.red_mask 24 -Visual.green_mask 32 -Visual.blue_mask 40 -Visual.bits_per_rgb 48 -Visual.map_entries 52 -Visual 56 -XGravityEvent.type 0 -XGravityEvent.serial 8 -XGravityEvent.send_event 16 -XGravityEvent.display 24 -XGravityEvent.event 32 -XGravityEvent.window 40 -XGravityEvent.x 48 -XGravityEvent.y 52 -XGravityEvent 56 -XReparentEvent.type 0 -XReparentEvent.serial 8 -XReparentEvent.send_event 16 -XReparentEvent.display 24 -XReparentEvent.event 32 -XReparentEvent.window 40 -XReparentEvent.parent 48 -XReparentEvent.x 56 -XReparentEvent.y 60 -XReparentEvent.override_redirect 64 -XReparentEvent 72 -XCirculateRequestEvent.type 0 -XCirculateRequestEvent.serial 8 -XCirculateRequestEvent.send_event 16 -XCirculateRequestEvent.display 24 -XCirculateRequestEvent.parent 32 -XCirculateRequestEvent.window 40 -XCirculateRequestEvent.place 48 -XCirculateRequestEvent 56 -XKeyEvent.type 0 -XKeyEvent.serial 8 -XKeyEvent.send_event 16 -XKeyEvent.display 24 -XKeyEvent.window 32 -XKeyEvent.root 40 -XKeyEvent.subwindow 48 -XKeyEvent.time 56 -XKeyEvent.x 64 -XKeyEvent.y 68 -XKeyEvent.x_root 72 -XKeyEvent.y_root 76 -XKeyEvent.state 80 -XKeyEvent.keycode 84 -XKeyEvent.same_screen 88 -XKeyEvent 96 -XCharStruct.lbearing 0 -XCharStruct.rbearing 2 -XCharStruct.width 4 -XCharStruct.ascent 6 -XCharStruct.descent 8 -XCharStruct.attributes 10 -XCharStruct 12 -XModifierKeymap.max_keypermod 0 -XModifierKeymap.modifiermap 8 -XModifierKeymap 16 -XTextItem.chars 0 -XTextItem.nchars 8 -XTextItem.delta 12 -XTextItem.font 16 -XTextItem 24 -XdbeSwapInfo.swap_window 0 -XdbeSwapInfo.swap_action 8 -XdbeSwapInfo 16 -XImage.width 0 -XImage.height 4 -XImage.xoffset 8 -XImage.format 12 -XImage.data 16 -XImage.byte_order 24 -XImage.bitmap_unit 28 -XImage.bitmap_bit_order 32 -XImage.bitmap_pad 36 -XImage.depth 40 -XImage.bytes_per_line 44 -XImage.bits_per_pixel 48 -XImage.red_mask 56 -XImage.green_mask 64 -XImage.blue_mask 72 -XImage.obdata 80 -XImage.f.create_image 88 -XImage.f.destroy_image 96 -XImage.f.get_pixel 104 -XImage.f.put_pixel 112 -XImage.f.sub_image 120 -XImage.f.add_pixel 128 -XImage 136 -XChar2b.byte1 0 -XChar2b.byte2 1 -XChar2b 2 -XwcTextItem.chars 0 -XwcTextItem.nchars 8 -XwcTextItem.delta 12 -XwcTextItem.font_set 16 -XwcTextItem 24 -XUnmapEvent.type 0 -XUnmapEvent.serial 8 -XUnmapEvent.send_event 16 -XUnmapEvent.display 24 -XUnmapEvent.event 32 -XUnmapEvent.window 40 -XUnmapEvent.from_configure 48 -XUnmapEvent 56 -awtImageData.Depth 0 -awtImageData.wsImageFormat 4 -awtImageData.clrdata 16 -awtImageData.convert 48 -awtImageData 560 -XGCValues.function 0 -XGCValues.plane_mask 8 -XGCValues.foreground 16 -XGCValues.background 24 -XGCValues.line_width 32 -XGCValues.line_style 36 -XGCValues.cap_style 40 -XGCValues.join_style 44 -XGCValues.fill_style 48 -XGCValues.fill_rule 52 -XGCValues.arc_mode 56 -XGCValues.tile 64 -XGCValues.stipple 72 -XGCValues.ts_x_origin 80 -XGCValues.ts_y_origin 84 -XGCValues.font 88 -XGCValues.subwindow_mode 96 -XGCValues.graphics_exposures 100 -XGCValues.clip_x_origin 104 -XGCValues.clip_y_origin 108 -XGCValues.clip_mask 112 -XGCValues.dash_offset 120 -XGCValues.dashes 124 -XGCValues 128 -XFocusChangeEvent.type 0 -XFocusChangeEvent.serial 8 -XFocusChangeEvent.send_event 16 -XFocusChangeEvent.display 24 -XFocusChangeEvent.window 32 -XFocusChangeEvent.mode 40 -XFocusChangeEvent.detail 44 -XFocusChangeEvent 48 -XMapEvent.type 0 -XMapEvent.serial 8 -XMapEvent.send_event 16 -XMapEvent.display 24 -XMapEvent.event 32 -XMapEvent.window 40 -XMapEvent.override_redirect 48 -XMapEvent 56 -XIMHotKeyTriggers.num_hot_key 0 -XIMHotKeyTriggers.key 8 -XIMHotKeyTriggers 16 -XKeyboardState.key_click_percent 0 -XKeyboardState.bell_percent 4 -XKeyboardState.bell_pitch 8 -XKeyboardState.bell_duration 12 -XKeyboardState.led_mask 16 -XKeyboardState.global_auto_repeat 24 -XKeyboardState.auto_repeats 28 -XKeyboardState 64 -XMotionEvent.type 0 -XMotionEvent.serial 8 -XMotionEvent.send_event 16 -XMotionEvent.display 24 -XMotionEvent.window 32 -XMotionEvent.root 40 -XMotionEvent.subwindow 48 -XMotionEvent.time 56 -XMotionEvent.x 64 -XMotionEvent.y 68 -XMotionEvent.x_root 72 -XMotionEvent.y_root 76 -XMotionEvent.state 80 -XMotionEvent.is_hint 84 -XMotionEvent.same_screen 88 -XMotionEvent 96 -XIMPreeditStateNotifyCallbackStruct.state 0 -XIMPreeditStateNotifyCallbackStruct 8 -XAnyEvent.type 0 -XAnyEvent.serial 8 -XAnyEvent.send_event 16 -XAnyEvent.display 24 -XAnyEvent.window 32 -XAnyEvent 40 -XIMCallback.client_data 0 -XIMCallback.callback 8 -XIMCallback 16 -XVisualInfo.visual 0 -XVisualInfo.visualid 8 -XVisualInfo.screen 16 -XVisualInfo.depth 20 -XVisualInfo.class 24 -XVisualInfo.red_mask 32 -XVisualInfo.green_mask 40 -XVisualInfo.blue_mask 48 -XVisualInfo.colormap_size 56 -XVisualInfo.bits_per_rgb 60 -XVisualInfo 64 -XCreateWindowEvent.type 0 -XCreateWindowEvent.serial 8 -XCreateWindowEvent.send_event 16 -XCreateWindowEvent.display 24 -XCreateWindowEvent.parent 32 -XCreateWindowEvent.window 40 -XCreateWindowEvent.x 48 -XCreateWindowEvent.y 52 -XCreateWindowEvent.width 56 -XCreateWindowEvent.height 60 -XCreateWindowEvent.border_width 64 -XCreateWindowEvent.override_redirect 68 -XCreateWindowEvent 72 -XIMValuesList.count_values 0 -XIMValuesList.supported_values 8 -XIMValuesList 16 -XKeymapEvent.type 0 -XKeymapEvent.serial 8 -XKeymapEvent.send_event 16 -XKeymapEvent.display 24 -XKeymapEvent.window 32 -XKeymapEvent.key_vector 40 -XKeymapEvent 72 -XButtonEvent.type 0 -XButtonEvent.serial 8 -XButtonEvent.send_event 16 -XButtonEvent.display 24 -XButtonEvent.window 32 -XButtonEvent.root 40 -XButtonEvent.subwindow 48 -XButtonEvent.time 56 -XButtonEvent.x 64 -XButtonEvent.y 68 -XButtonEvent.x_root 72 -XButtonEvent.y_root 76 -XButtonEvent.state 80 -XButtonEvent.button 84 -XButtonEvent.same_screen 88 -XButtonEvent 96 -XWMHints.flags 0 -XWMHints.initial_state 12 -XWMHints.icon_pixmap 16 -XWMHints.icon_window 24 -XWMHints.icon_x 32 -XWMHints.icon_y 36 -XWMHints.icon_mask 40 -XWMHints.input 8 -XWMHints.window_group 48 -XWMHints 56 -ScreenFormat.ext_data 0 -ScreenFormat.depth 8 -ScreenFormat.bits_per_pixel 12 -ScreenFormat.scanline_pad 16 -ScreenFormat 24 -XCrossingEvent.type 0 -XCrossingEvent.serial 8 -XCrossingEvent.send_event 16 -XCrossingEvent.display 24 -XCrossingEvent.window 32 -XCrossingEvent.root 40 -XCrossingEvent.subwindow 48 -XCrossingEvent.time 56 -XCrossingEvent.x 64 -XCrossingEvent.y 68 -XCrossingEvent.x_root 72 -XCrossingEvent.y_root 76 -XCrossingEvent.mode 80 -XCrossingEvent.detail 84 -XCrossingEvent.same_screen 88 -XCrossingEvent.focus 92 -XCrossingEvent.state 96 -XCrossingEvent 104 -XConfigureRequestEvent.type 0 -XConfigureRequestEvent.serial 8 -XConfigureRequestEvent.send_event 16 -XConfigureRequestEvent.display 24 -XConfigureRequestEvent.parent 32 -XConfigureRequestEvent.window 40 -XConfigureRequestEvent.x 48 -XConfigureRequestEvent.y 52 -XConfigureRequestEvent.width 56 -XConfigureRequestEvent.height 60 -XConfigureRequestEvent.border_width 64 -XConfigureRequestEvent.above 72 -XConfigureRequestEvent.detail 80 -XConfigureRequestEvent.value_mask 88 -XConfigureRequestEvent 96 -XSelectionRequestEvent.type 0 -XSelectionRequestEvent.serial 8 -XSelectionRequestEvent.send_event 16 -XSelectionRequestEvent.display 24 -XSelectionRequestEvent.owner 32 -XSelectionRequestEvent.requestor 40 -XSelectionRequestEvent.selection 48 -XSelectionRequestEvent.target 56 -XSelectionRequestEvent.property 64 -XSelectionRequestEvent.time 72 -XSelectionRequestEvent 80 -XFontSetExtents.max_ink_extent 0 -XFontSetExtents.max_logical_extent 8 -XFontSetExtents 16 -XExtCodes.extension 0 -XExtCodes.major_opcode 4 -XExtCodes.first_event 8 -XExtCodes.first_error 12 -XExtCodes 16 -XHostAddress.family 0 -XHostAddress.length 4 -XHostAddress.address 8 -XHostAddress 16 -ColorData.awt_Colors 0 -ColorData.awt_numICMcolors 8 -ColorData.awt_icmLUT 16 -ColorData.awt_icmLUT2Colors 24 -ColorData.img_grays 32 -ColorData.img_clr_tbl 40 -ColorData.img_oda_red 48 -ColorData.img_oda_green 56 -ColorData.img_oda_blue 64 -ColorData.pGrayInverseLutData 72 -ColorData.screendata 80 -ColorData 88 -XColormapEvent.type 0 -XColormapEvent.serial 8 -XColormapEvent.send_event 16 -XColormapEvent.display 24 -XColormapEvent.window 32 -XColormapEvent.colormap 40 -XColormapEvent.new 48 -XColormapEvent.state 52 -XColormapEvent 56 -Depth.depth 0 -Depth.nvisuals 4 -Depth.visuals 8 -Depth 16 -XEvent.type 0 -XEvent.xany 0 -XEvent.xkey 0 -XEvent.xbutton 0 -XEvent.xmotion 0 -XEvent.xcrossing 0 -XEvent.xfocus 0 -XEvent.xexpose 0 -XEvent.xgraphicsexpose 0 -XEvent.xnoexpose 0 -XEvent.xvisibility 0 -XEvent.xcreatewindow 0 -XEvent.xdestroywindow 0 -XEvent.xunmap 0 -XEvent.xmap 0 -XEvent.xmaprequest 0 -XEvent.xreparent 0 -XEvent.xconfigure 0 -XEvent.xgravity 0 -XEvent.xresizerequest 0 -XEvent.xconfigurerequest 0 -XEvent.xcirculate 0 -XEvent.xcirculaterequest 0 -XEvent.xproperty 0 -XEvent.xselectionclear 0 -XEvent.xselectionrequest 0 -XEvent.xselection 0 -XEvent.xcolormap 0 -XEvent.xclient 0 -XEvent.xmapping 0 -XEvent.xerror 0 -XEvent.xkeymap 0 -XEvent.pad 0 -XEvent 192 -XDestroyWindowEvent.type 0 -XDestroyWindowEvent.serial 8 -XDestroyWindowEvent.send_event 16 -XDestroyWindowEvent.display 24 -XDestroyWindowEvent.event 32 -XDestroyWindowEvent.window 40 -XDestroyWindowEvent 48 -XComposeStatus.compose_ptr 0 -XComposeStatus.chars_matched 8 -XComposeStatus 16 -AwtGraphicsConfigData.awt_depth 0 -AwtGraphicsConfigData.awt_cmap 8 -AwtGraphicsConfigData.awt_visInfo 16 -AwtGraphicsConfigData.awt_num_colors 80 -AwtGraphicsConfigData.awtImage 88 -AwtGraphicsConfigData.AwtColorMatch 96 -AwtGraphicsConfigData.monoImage 104 -AwtGraphicsConfigData.monoPixmap 112 -AwtGraphicsConfigData.monoPixmapWidth 120 -AwtGraphicsConfigData.monoPixmapHeight 124 -AwtGraphicsConfigData.monoPixmapGC 128 -AwtGraphicsConfigData.pixelStride 136 -AwtGraphicsConfigData.color_data 144 -AwtGraphicsConfigData.glxInfo 152 -AwtGraphicsConfigData.isTranslucencySupported 160 -AwtGraphicsConfigData 168 -XIMText.length 0 -XIMText.feedback 8 -XIMText.encoding_is_wchar 16 -XIMText.string 24 -XIMText 32 diff --git a/jtools/qemu/Makefile b/jtools/qemu/Makefile new file mode 100644 index 000000000..c83a6d987 --- /dev/null +++ b/jtools/qemu/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= qemu +PKG_VERSION:= 0.14.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b6c713a8db638e173af53a62d5178640 +PKG_SITES:= http://download.savannah.gnu.org/releases/qemu/ + +include ../rules.mk + +install: ${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm + +$(WRKBUILD)/.configured: ${WRKDIST}/.prepared + (cd $(WRKBUILD); ./configure --prefix=/usr \ + --host-cc=$(CC_FOR_BUILD) \ + --disable-system \ + --disable-sdl \ + --target-list=arm-linux-user,i386-linux-user,mipsel-linux-user \ + ) + touch $@ + +$(WRKBUILD)/.compiled: ${WRKDIST}/.configured + ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) + touch $@ + +${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm: $(WRKBUILD)/.compiled + ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) + +include $(TOPDIR)/mk/tools.mk diff --git a/mk/build.mk b/mk/build.mk index cd50be90f..854fdb19d 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -266,7 +266,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),) include ${TOPDIR}/mk/vars.mk else include $(TOPDIR)/prereq.mk -export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD +export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU endif all: menuconfig diff --git a/mk/image.mk b/mk/image.mk index 24e31aa0b..8053ba43d 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -65,12 +65,12 @@ kernel-package: $(KERNEL) $(TRACE) target/$(ADK_TARGET_ARCH)-install-kernel-package $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE) -TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${CPU_ARCH}-${ADK_TARGET_FS}-kernel -INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} -ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img -ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz -ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz -INITRAMFS_PIGGYBACK= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.cpio +TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel +INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} +ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img +ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz +ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz +INITRAMFS_PIGGYBACK= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.cpio ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ diff --git a/mk/vars.mk b/mk/vars.mk index 3776b57b4..d4f64d068 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -47,6 +47,19 @@ TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_ REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux +ifeq ($(CPU_ARCH),arm) +QEMU:= qemu-arm +endif +ifeq ($(CPU_ARCH),mipsel) +QEMU:= qemu-mipsel +endif +ifeq ($(CPU_ARCH),i586) +QEMU:= qemu-i386 +endif +ifeq ($(CPU_ARCH),i686) +QEMU:= qemu-i386 +endif + ifeq ($(ADK_NATIVE),y) TARGET_CROSS:= TARGET_COMPILER_PREFIX?= @@ -138,7 +151,8 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \ - LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' + LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \ + QEMU='$(QEMU)' PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX))) diff --git a/package/nss/Makefile b/package/nss/Makefile index 0c777b09b..7dcf8217d 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -29,7 +29,9 @@ $(eval $(call PKG_template,NSS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_D CONFIG_STYLE:= manual ifneq ($(ADK_LINUX_64),) -TARGET_CFLAGS+= -DUSE_64 -DNS_PTR_LE_32 +ifeq ($(ADK_LINUX_MIPS),y) +TARGET_CFLAGS+= -DNS_PTR_LE_32 +endif XAKE_FLAGS+= USE_64=1 endif diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 45194d4d9..1f8264f67 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -26,6 +26,8 @@ PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ #PKG_CFLINE_OPENJDK:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG PKG_HOST_DEPENDS:= !darwin !cygwin !openbsd !netbsd !freebsd +PKG_ARCH_DEPENDS:= arm mips x86 x86_64 +PKG_SYSTEM_DEPENDS:= !lemote-yeelong !linksys-ag241 !fon-fon2100 # autotools infrastructure for OpenJDK ICEDTEA_NAME:= icedtea6 @@ -50,7 +52,7 @@ WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION} PKG_SUBPKGS:= OPENJDK PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO PKGCD_ZERO:= zero-assembly backend -PKGCD_SHARK:= JIT backend +PKGCD_SHARK:= Shark JIT backend (needs eglibc/glibc) PKGCB_SHARK:= llvm PKGCD_CACAO:= Cacao JIT backend PKGCD_JAMVM:= JamVM backend @@ -59,6 +61,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS)) BOOTSTRAPJDK:= ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk @@ -96,11 +99,13 @@ CONFIGURE_ARGS+= --disable-docs \ CONFIGURE_ENV+= PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ + ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \ GCC_HONOUR_COPTS=s \ TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME) OPENJDK_NATIVE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ + ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \ GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \ TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME) @@ -108,6 +113,9 @@ ALL_TARGET:= icedtea # add include path for Xrender.h from staging directory post-patch: +ifeq ($(QEMU),) + $(error Fatal error: $$QEMU not set!) +endif $(SED) "s#@ADK_TARGETDIR@#$(STAGING_TARGET_DIR)#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/sun/xawt/Makefile do-extract: @@ -146,10 +154,6 @@ pre-configure: --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \ --with-ecj-jar=$(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar \ --without-rhino ;\ - mkdir -p $(WRKBUILD)/generated/sun/awt/X11/generator/ ; \ - mkdir -p $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/ ; \ - cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/generated/sun/awt/X11/generator/; \ - cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/; \ env ${OPENJDK_NATIVE_ENV} $(MAKE) icedtea-ecj # fixup symlinks to bootstrap jdk ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java diff --git a/package/openjdk/patches/cross-compile.patch b/package/openjdk/patches/cross-compile.patch index afc00b032..604b5d6cb 100644 --- a/package/openjdk/patches/cross-compile.patch +++ b/package/openjdk/patches/cross-compile.patch @@ -1,3 +1,6 @@ + + disable wrong pathes to /usr, fix cross-compile + --- w-openjdk-6-1.orig/openjdk-6/jdk/make/sun/awt/Makefile 2011-02-28 17:06:11.000000000 +0100 +++ w-openjdk-6-1/openjdk-6/jdk/make/sun/awt/Makefile 2011-08-07 17:00:37.676468717 +0200 @@ -509,10 +509,7 @@ diff --git a/package/openjdk/patches/disable-backtrace.patch b/package/openjdk/patches/disable-backtrace.patch index b54c95741..f3d1424c1 100644 --- a/package/openjdk/patches/disable-backtrace.patch +++ b/package/openjdk/patches/disable-backtrace.patch @@ -1,3 +1,6 @@ + + uClibc does not have backtrace support right now. Disable it for now. + --- w-openjdk-6-1.orig/openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-02-28 17:06:50.000000000 +0100 +++ w-openjdk-6-1/openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-08-08 10:45:01.445330729 +0200 @@ -27,9 +27,6 @@ diff --git a/package/openjdk/patches/disable-freetype-check.patch b/package/openjdk/patches/disable-freetype-check.patch index 5f5f6cf83..cde23910d 100644 --- a/package/openjdk/patches/disable-freetype-check.patch +++ b/package/openjdk/patches/disable-freetype-check.patch @@ -1,4 +1,7 @@ ---- w-openjdk-6-1.orig/openjdk-6.orig/jdk/make/common/shared/Sanity.gmk 2011-02-28 17:06:10.000000000 +0100 + + disable freetype sanity check, not cross-compile safe. + +--- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/shared/Sanity.gmk 2011-02-28 17:06:10.000000000 +0100 +++ w-openjdk-6-1/openjdk-6/jdk/make/common/shared/Sanity.gmk 2011-04-05 14:05:29.691807661 +0200 @@ -793,7 +793,7 @@ # Check for availability of FreeType (OpenJDK specific) diff --git a/package/openjdk/patches/disable-gamma.patch b/package/openjdk/patches/disable-gamma.patch index 92a80b3be..5dc1b2723 100644 --- a/package/openjdk/patches/disable-gamma.patch +++ b/package/openjdk/patches/disable-gamma.patch @@ -1,3 +1,6 @@ + + Fails when cross-compilation is done, disable it. + --- w-openjdk-6-1.orig/openjdk-6/hotspot/make/linux/makefiles/buildtree.make 2011-02-28 17:03:13.000000000 +0100 +++ w-openjdk-6-1/openjdk-6/hotspot/make/linux/makefiles/buildtree.make 2011-04-11 12:47:31.000000000 +0200 @@ -352,12 +352,8 @@ diff --git a/package/openjdk/patches/disable-sizers.patch b/package/openjdk/patches/disable-sizers.patch deleted file mode 100644 index 46325008c..000000000 --- a/package/openjdk/patches/disable-sizers.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- w-openjdk-6.orig/openjdk-6/jdk/make/sun/xawt/Makefile 2011-02-28 17:06:12.000000000 +0100 -+++ w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile 2011-04-13 12:00:18.618922673 +0200 -@@ -237,7 +237,8 @@ - $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ - $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) - --$(SIZES): $(SIZERS) -+$(SIZES): -+ $(prep-target) - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ diff --git a/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch b/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch new file mode 100644 index 000000000..cd228391b --- /dev/null +++ b/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch @@ -0,0 +1,15 @@ + + the option RTLOD_NOLOAD is not portable. (not available in uClibc) + https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-RTLD_NOLOAD.patch?revision=840&view=markup&pathrev=867 + +--- w-openjdk-6.orig/openjdk-6/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-02-28 17:06:50.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-08-10 14:41:26.700571862 +0200 +@@ -51,7 +51,7 @@ + { + const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL); + // look up existing handle only, do not load +- void *hModule = dlopen(libName, RTLD_NOLOAD); ++ void *hModule = dlopen(libName, RTLD_LAZY); + dprintf2("-handle for %s: %u\n", libName, hModule); + (*env)->ReleaseStringUTFChars(env, jLibName, libName); + return (jlong)hModule; diff --git a/package/openjdk/patches/icedtea-arm-mkbc.patch b/package/openjdk/patches/icedtea-arm-mkbc.patch new file mode 100644 index 000000000..9df3ebbf4 --- /dev/null +++ b/package/openjdk/patches/icedtea-arm-mkbc.patch @@ -0,0 +1,29 @@ + + execute mkoffsets via Qemu and build mkbc with the host compiler. + +--- w-openjdk-6-1.orig/icedtea6-1.10/patches/arm.patch 2011-02-23 23:32:32.909601440 +0100 ++++ w-openjdk-6-1/icedtea6-1.10/patches/arm.patch 2011-08-09 20:05:56.721765260 +0200 +@@ -25,7 +25,7 @@ + + + +offsets_arm.s: mkoffsets + + @echo Generating assembler offsets +-+ ./mkoffsets > $@ +++ $(QEMU) ./mkoffsets > $@ + + + +bytecodes_arm.s: bytecodes_arm.def mkbc + + @echo Generatine ARM assembler bytecode sequences +@@ -33,12 +33,12 @@ + + + +mkbc: $(GAMMADIR)/tools/mkbc.c + + @echo Compiling mkbc tool +-+ $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) +++ $(CC_FOR_BUILD) -o $@ $< $(COMPILE_DONE) + + + +mkoffsets: asm_helper.cpp + + @echo Compiling offset generator + + $(QUIETLY) $(REMOVE_TARGET) +-+ $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) +++ $(CC_COMPILE) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) + + + +endif + + diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/icedtea6-Makefile_in.patch index 193e008aa..193e008aa 100644 --- a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in +++ b/package/openjdk/patches/icedtea6-Makefile_in.patch diff --git a/package/openjdk/patches/iconv.patch b/package/openjdk/patches/iconv.patch index 16a6946f6..b79971930 100644 --- a/package/openjdk/patches/iconv.patch +++ b/package/openjdk/patches/iconv.patch @@ -1,17 +1,6 @@ -diff -Nur w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make ---- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-02-28 17:03:13.000000000 +0100 -+++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-04-11 18:36:16.837665258 +0200 -@@ -108,9 +108,6 @@ - CFLAGS += -pipe - endif - --# Compiler warnings are treated as errors --WARNINGS_ARE_ERRORS = -Werror -- - # Except for a few acceptable ones - # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit - # conversions which might affect the values. To avoid that, we need to turn -diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile + + add required linker flags. + --- w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile 2011-02-28 17:06:10.000000000 +0100 +++ w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile 2011-04-11 23:14:27.571411016 +0200 @@ -123,6 +123,8 @@ @@ -23,7 +12,6 @@ diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile w-openjdk # # Add to ambient vpath so we pick up the library files # -diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile --- w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile 2011-02-28 17:06:11.000000000 +0100 +++ w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile 2011-04-11 23:14:07.017670197 +0200 @@ -65,6 +65,8 @@ @@ -35,7 +23,6 @@ diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile w-openjdk-6/open # Add -export options to explicitly spell exported symbols ifeq ($(PLATFORM), windows) OTHER_LCF += -export:nptInitialize -export:nptTerminate -diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile --- w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-02-28 17:06:12.000000000 +0100 +++ w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-04-11 23:15:07.221411030 +0200 @@ -55,6 +55,8 @@ diff --git a/package/openjdk/patches/inc-path.patch b/package/openjdk/patches/inc-path.patch index 32aaa919e..4a195f03e 100644 --- a/package/openjdk/patches/inc-path.patch +++ b/package/openjdk/patches/inc-path.patch @@ -1,14 +1,6 @@ ---- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/Defs.gmk 2011-02-28 17:06:10.000000000 +0100 -+++ w-openjdk-6-1/openjdk-6/jdk/make/common/Defs.gmk 2011-08-07 21:21:49.335286149 +0200 -@@ -173,7 +173,7 @@ - ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true) - FREETYPE_HEADERS_PATH = $(DEVTOOLS_FT_DIR)/include - else -- FREETYPE_HEADERS_PATH = /usr/include -+ FREETYPE_HEADERS_PATH = /usr/include/disabled - endif - endif - endif + + disable wrong pathes for cross-compilation + --- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/shared/Defs-linux.gmk 2011-02-28 17:06:10.000000000 +0100 +++ w-openjdk-6-1/openjdk-6/jdk/make/common/shared/Defs-linux.gmk 2011-08-08 10:07:58.975256728 +0200 @@ -170,7 +170,7 @@ @@ -20,3 +12,23 @@ # Import JDK images allow for partial builds, components not built are # imported (or copied from) these import areas when needed. +--- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/Defs.gmk 2011-02-28 17:06:10.000000000 +0100 ++++ w-openjdk-6-1/openjdk-6/jdk/make/common/Defs.gmk 2011-08-10 18:50:53.248017538 +0200 +@@ -156,7 +156,7 @@ + ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true) + FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib + else +- FREETYPE_LIB_PATH = /usr/lib ++ FREETYPE_LIB_PATH = /usr/lib/disabled + USING_SYSTEM_FT_LIB=true + endif + endif +@@ -173,7 +173,7 @@ + ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true) + FREETYPE_HEADERS_PATH = $(DEVTOOLS_FT_DIR)/include + else +- FREETYPE_HEADERS_PATH = /usr/include ++ FREETYPE_HEADERS_PATH = /usr/include/disabled + endif + endif + endif diff --git a/package/openjdk/patches/llvm-headers.patch b/package/openjdk/patches/llvm-headers.patch index d0f42146d..25dd137d9 100644 --- a/package/openjdk/patches/llvm-headers.patch +++ b/package/openjdk/patches/llvm-headers.patch @@ -1,3 +1,6 @@ + + fix wrong header path + --- w-openjdk-6.orig/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-02-28 17:03:21.000000000 +0100 +++ w-openjdk-6/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-04-29 18:07:20.171550601 +0200 @@ -43,7 +43,7 @@ diff --git a/package/openjdk/patches/patch-openjdk-6_Makefile b/package/openjdk/patches/openjdk-6_Makefile.patch index 2364d7ec0..4425eff7c 100644 --- a/package/openjdk/patches/patch-openjdk-6_Makefile +++ b/package/openjdk/patches/openjdk-6_Makefile.patch @@ -1,3 +1,6 @@ + + TOPDIR is already used by build system, so always set it. + --- w-openjdk-6-1.orig/openjdk-6/Makefile 2011-02-28 17:02:07.000000000 +0100 +++ w-openjdk-6-1/openjdk-6/Makefile 2011-03-28 20:06:13.751809044 +0200 @@ -25,9 +25,7 @@ diff --git a/package/openjdk/patches/qemu-sizer.patch b/package/openjdk/patches/qemu-sizer.patch new file mode 100644 index 000000000..b0049e852 --- /dev/null +++ b/package/openjdk/patches/qemu-sizer.patch @@ -0,0 +1,22 @@ +--- w-openjdk-6.orig/openjdk-6/jdk/make/sun/xawt/Makefile 2011-02-28 17:06:12.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile 2011-08-20 18:45:28.499240773 +0200 +@@ -225,7 +225,7 @@ + + $(SIZERS): $(SIZERS_C) + $(prep-target) +- $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c ++ $(CC) -static $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c + + $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) + $(prep-target) +@@ -243,8 +243,8 @@ + $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ + $(CHMOD) +w $@;\ + else \ +- $(ECHO) GENERATING $@; \ +- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++ $(ECHO) GENERATING $@ via $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer..; \ ++ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ + fi + @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ + $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ diff --git a/package/openjdk/patches/remove-Werror.patch b/package/openjdk/patches/remove-Werror.patch new file mode 100644 index 000000000..445165781 --- /dev/null +++ b/package/openjdk/patches/remove-Werror.patch @@ -0,0 +1,15 @@ + + disable -Werror + +--- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-02-28 17:03:13.000000000 +0100 ++++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-08-19 18:18:55.997423368 +0200 +@@ -108,9 +108,6 @@ + CFLAGS += -pipe + endif + +-# Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror +- + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit + # conversions which might affect the values. To avoid that, we need to turn diff --git a/package/openjdk/patches/remove-libnsl.patch b/package/openjdk/patches/remove-libnsl.patch index 9c086843e..965829fd6 100644 --- a/package/openjdk/patches/remove-libnsl.patch +++ b/package/openjdk/patches/remove-libnsl.patch @@ -1,3 +1,6 @@ + + remove libnsl from linking. + --- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/hpi/hpi_common.gmk 2011-02-28 17:06:10.000000000 +0100 +++ w-openjdk-6-1/openjdk-6/jdk/make/java/hpi/hpi_common.gmk 2011-04-10 20:05:01.417672476 +0200 @@ -86,5 +86,5 @@ diff --git a/package/openjdk/patches/shark-adlc-cross-compile.patch b/package/openjdk/patches/shark-adlc-cross-compile.patch new file mode 100644 index 000000000..fc3b804ea --- /dev/null +++ b/package/openjdk/patches/shark-adlc-cross-compile.patch @@ -0,0 +1,23 @@ + + Execute adlc via Qemu. + +--- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/adlc.make 2011-02-28 17:03:13.000000000 +0100 ++++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/adlc.make 2011-08-17 13:05:55.317470977 +0200 +@@ -103,7 +103,7 @@ + + $(EXEC) : $(OBJECTS) + @echo Making adlc +- $(QUIETLY) $(LINK_NOPROF.CC) -o $(EXEC) $(OBJECTS) ++ $(QUIETLY) $(LINK_NOPROF.CC) -static -o $(EXEC) $(OBJECTS) + + # Random dependencies: + $(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp +@@ -170,7 +170,7 @@ + # + refresh_adfiles: $(EXEC) $(SOURCE.AD) $(ADLC_UPDATER) + @rm -rf $(TEMPDIR); mkdir $(TEMPDIR) +- $(QUIETLY) $(EXEC) $(ADLCFLAGS) $(SOURCE.AD) \ ++ $(QEMU) $(EXEC) $(ADLCFLAGS) $(SOURCE.AD) \ + -c$(TEMPDIR)/ad_$(Platform_arch_model).cpp -h$(TEMPDIR)/ad_$(Platform_arch_model).hpp -a$(TEMPDIR)/dfa_$(Platform_arch_model).cpp -v$(TEMPDIR)/adGlobals_$(Platform_arch_model).hpp \ + || { rm -rf $(TEMPDIR); exit 1; } + $(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model).cpp $(TEMPDIR) $(OUTDIR) diff --git a/package/openjdk/patches/uClibc-compat.patch b/package/openjdk/patches/uClibc-compat.patch index 1bdf56b5b..1cc16cbb1 100644 --- a/package/openjdk/patches/uClibc-compat.patch +++ b/package/openjdk/patches/uClibc-compat.patch @@ -1,3 +1,7 @@ + + some uClibc compatibility hacks. + Partly from https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/ + --- w-openjdk-6-1.orig/openjdk-6/hotspot/src/os/linux/vm/os_linux.cpp 2011-02-28 17:03:14.000000000 +0100 +++ w-openjdk-6-1/openjdk-6/hotspot/src/os/linux/vm/os_linux.cpp 2011-08-07 14:30:00.195403776 +0200 @@ -53,7 +53,6 @@ diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 8834940c7..4ffe44649 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -112,8 +112,14 @@ if ! which gzip >/dev/null 2>&1; then out=1 fi -if ! which lzma >/dev/null 2>&1 && ! which xz >/dev/null 2>&1; then - echo You must install lzma or xz-utils to continue. +if ! which lzma >/dev/null 2>&1; then + echo You must install lzma to continue. + echo + out=1 +fi + +if ! which xz >/dev/null 2>&1; then + echo You must install xz-utils to continue. echo out=1 fi diff --git a/scripts/update-sys b/scripts/update-sys index bcfbfa84e..268184428 100755 --- a/scripts/update-sys +++ b/scripts/update-sys @@ -50,7 +50,7 @@ config $archsym EOF if [ "${system}" = "toolchain" -o "${system}" = "qemu" ];then - sys=${system}-$cpuarch + sys=${system}-$arch else sys=$system fi diff --git a/target/arm/kernel.config b/target/arm/kernel.config index c602fdffa..d107d697a 100644 --- a/target/arm/kernel.config +++ b/target/arm/kernel.config @@ -1,15 +1,15 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.36 -# Sat Dec 25 17:40:46 2010 +# Linux/arm 2.6.39 Kernel Configuration +# Fri Aug 19 17:47:30 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y # CONFIG_ARCH_USES_GETTIMEOFFSET is not set CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_KTIME_SCALAR=y CONFIG_HAVE_PROC_CPU=y -CONFIG_GENERIC_HARDIRQS=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_LOCKDEP_SUPPORT=y @@ -17,13 +17,15 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_VECTORS_BASE=0xffff0000 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y +CONFIG_HAVE_IRQ_WORK=y # # General setup @@ -35,40 +37,47 @@ CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set -# CONFIG_KERNEL_BZIP2 is not set CONFIG_KERNEL_LZMA=y # CONFIG_KERNEL_LZO is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_FHANDLE is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HAVE_SPARSE_IRQ=y +CONFIG_GENERIC_IRQ_SHOW=y +# CONFIG_SPARSE_IRQ is not set # # RCU Subsystem # -CONFIG_TREE_RCU=y -# CONFIG_TINY_RCU is not set +CONFIG_TINY_RCU=y +# CONFIG_PREEMPT_RCU is not set # CONFIG_RCU_TRACE is not set -CONFIG_RCU_FANOUT=32 -# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set -# CONFIG_SYSFS_DEPRECATED_V2 is not set -# CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set +# CONFIG_SCHED_AUTOGROUP is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set # CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -CONFIG_EMBEDDED=y +CONFIG_EXPERT=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y # CONFIG_KALLSYMS is not set @@ -84,6 +93,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_USE_VMALLOC=y @@ -104,6 +114,7 @@ CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y # # GCOV-based kernel profiling @@ -119,8 +130,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_BLOCK is not set -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set # CONFIG_INLINE_SPIN_TRYLOCK is not set # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK is not set @@ -150,13 +159,12 @@ CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y # # System Type # CONFIG_MMU=y -# CONFIG_ARCH_AAEC2000 is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VERSATILE is not set @@ -170,6 +178,7 @@ CONFIG_ARCH_AT91=y # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_MXS is not set # CONFIG_ARCH_STMP3XXX is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set @@ -199,19 +208,20 @@ CONFIG_ARCH_AT91=y # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_S3C64XX is not set -# CONFIG_ARCH_S5P6440 is not set +# CONFIG_ARCH_S5P64X0 is not set # CONFIG_ARCH_S5P6442 is not set # CONFIG_ARCH_S5PC100 is not set # CONFIG_ARCH_S5PV210 is not set -# CONFIG_ARCH_S5PV310 is not set +# CONFIG_ARCH_EXYNOS4 is not set # CONFIG_ARCH_SHARK is not set -# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_TCC_926 is not set # CONFIG_ARCH_U300 is not set # CONFIG_ARCH_U8500 is not set # CONFIG_ARCH_NOMADIK is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set # CONFIG_PLAT_SPEAR is not set +# CONFIG_ARCH_VT8500 is not set CONFIG_HAVE_AT91_USART3=y # @@ -256,6 +266,7 @@ CONFIG_AT91_PMC_UNIT=y # AT91 Feature Selections # # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set +# CONFIG_AT91_SLOW_CLOCK is not set CONFIG_AT91_TIMER_HZ=128 CONFIG_AT91_EARLY_DBGU=y # CONFIG_AT91_EARLY_USART0 is not set @@ -264,6 +275,10 @@ CONFIG_AT91_EARLY_DBGU=y # CONFIG_AT91_EARLY_USART3 is not set # +# System MMU +# + +# # Processor Type # CONFIG_CPU_ARM920T=y @@ -276,6 +291,7 @@ CONFIG_CPU_COPY_V4WB=y CONFIG_CPU_TLB_V4WBI=y CONFIG_CPU_CP15=y CONFIG_CPU_CP15_MMU=y +CONFIG_CPU_USE_DOMAINS=y # # Processor Features @@ -312,7 +328,6 @@ CONFIG_AEABI=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_HIGHMEM is not set -# CONFIG_SPARSE_IRQ is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y @@ -320,15 +335,18 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=999999 +# CONFIG_COMPACTION is not set # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y CONFIG_FORCE_MAX_ZONEORDER=11 # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set +# CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set @@ -340,6 +358,7 @@ CONFIG_ZBOOT_ROM_BSS=0 CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set # CONFIG_AUTO_ZRELADDR is not set # @@ -366,7 +385,13 @@ CONFIG_HAVE_AOUT=y # # Power management options # -# CONFIG_PM is not set +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_PM_SLEEP=y +# CONFIG_PM_RUNTIME is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +# CONFIG_APM_EMULATION is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y @@ -379,10 +404,9 @@ CONFIG_UNIX=y CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_FIB_HASH=y # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set +# CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set @@ -423,6 +447,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set +# CONFIG_BATMAN_ADV is not set # # Network testing @@ -438,6 +463,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set # # Device Drivers @@ -484,9 +510,12 @@ CONFIG_SCSI_MOD=y # Character devices # # CONFIG_VT is not set -# CONFIG_DEVKMEM is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_N_GSM is not set +# CONFIG_DEVKMEM is not set # # Serial drivers @@ -505,9 +534,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set -CONFIG_UNIX98_PTYS=y -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -# CONFIG_LEGACY_PTYS is not set +# CONFIG_TTY_PRINTK is not set +# CONFIG_HVC_DCC is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set # CONFIG_R3964 is not set @@ -521,6 +549,10 @@ CONFIG_UNIX98_PTYS=y # PPS support # # CONFIG_PPS is not set + +# +# PPS generators support +# CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_GPIO_SYSFS is not set @@ -528,6 +560,7 @@ CONFIG_GPIOLIB=y # # Memory mapped GPIO expanders: # +# CONFIG_GPIO_BASIC_MMIO is not set # CONFIG_GPIO_IT8761E is not set # @@ -582,6 +615,7 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set +# CONFIG_NFC_DEVICES is not set # CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set @@ -593,12 +627,15 @@ CONFIG_RTC_LIB=y # # File systems # +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y -# CONFIG_FSNOTIFY is not set +CONFIG_FSNOTIFY=y # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set +# CONFIG_FANOTIFY is not set # CONFIG_QUOTA is not set -# CONFIG_AUTOFS_FS is not set +# CONFIG_QUOTACTL is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set @@ -621,12 +658,12 @@ CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_NLS is not set -# CONFIG_DLM is not set # # Kernel hacking # CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 @@ -635,18 +672,26 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set # CONFIG_DEBUG_KERNEL is not set # CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_FRAME_POINTER=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_TEST_KSTRTOX is not set +# CONFIG_STRICT_DEVMEM is not set # CONFIG_ARM_UNWIND is not set # CONFIG_DEBUG_USER is not set # CONFIG_OC_ETM is not set @@ -655,6 +700,7 @@ CONFIG_HAVE_ARCH_KGDB=y # Security options # # CONFIG_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set CONFIG_DEFAULT_SECURITY_DAC=y @@ -679,8 +725,11 @@ CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC32=y # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set +# CONFIG_XZ_DEC is not set +# CONFIG_XZ_DEC_BCJ is not set CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_NLATTR=y CONFIG_GENERIC_ATOMIC64=y +# CONFIG_AVERAGE is not set |